From 0bfa9ddf3ac4b43f6d885394a35bb517327e1291 Mon Sep 17 00:00:00 2001
From: Bryan Petty <bryan@ibaku.net>
Date: Sat, 3 Nov 2012 18:33:31 +0000
Subject: [PATCH] Fixed up Windows regen.bat script to use environment
 variables instead of conditional config file includes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/doxygen/Doxyfile  |  2 +-
 docs/doxygen/regen.bat | 59 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 0572505ca5..4a90d38910 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -376,7 +376,7 @@ DOCSET_PUBLISHER_NAME  = wxWidgets Team
 
 GENERATE_HTMLHELP      = $(GENERATE_HTMLHELP)
 CHM_FILE               = ..\wx.chm # Windows style separator is required.
-HHC_LOCATION           = hhc.exe # Don't modify, see Doxyfile_chm for info
+HHC_LOCATION           = hhc.exe
 GENERATE_CHI           = NO
 CHM_INDEX_ENCODING     =
 BINARY_TOC             = NO
diff --git a/docs/doxygen/regen.bat b/docs/doxygen/regen.bat
index f9d17a8c27..6250d86727 100644
--- a/docs/doxygen/regen.bat
+++ b/docs/doxygen/regen.bat
@@ -13,19 +13,60 @@ REM These not automatically copied by Doxygen because they're not
 REM used in doxygen documentation, only in our html footer and by our
 REM custom aliases
 copy images\generic\*.png out\html\generic 2>&1 >NUL
-copy wxwidgets.js out\html 2>&1 >NUL
-
-REM set cfgfile variable to the right doxyfile to use,
-REM using MS broken batch scripting
-setlocal enableextensions
-set arg=%1
-if "%arg%" EQU "" set cfgfile=Doxyfile_all
-if "%arg%" NEQ "" set cfgfile=Doxyfile_%1
 
 pushd ..\..
 set WXWIDGETS=%CD%
 popd
 
+REM Defaults for settings controlled by this script
+set GENERATE_DOCSET=NO
+set GENERATE_HTML=NO
+set GENERATE_HTMLHELP=NO
+set GENERATE_LATEX=NO
+set GENERATE_QHP=NO
+set GENERATE_XML=NO
+set SEARCHENGINE=NO
+set SERVER_BASED_SEARCH=NO
+
+IF "%1" == "all" (
+  set GENERATE_HTML=YES
+  set GENERATE_HTMLHELP=YES
+  set GENERATE_XML=YES
+) ELSE (
+  IF "%1" == "chm" (
+    set GENERATE_HTML=YES
+    set GENERATE_HTMLHELP=YES
+  ) ELSE (
+    IF "%1" == "docset" (
+      set GENERATE_DOCSET=YES
+      set GENERATE_HTML=YES
+    ) ELSE (
+      IF "%1" == "latex" (
+        set GENERATE_LATEX=YES
+      ) ELSE (
+        IF "%1" == "php" (
+          set GENERATE_HTML=YES
+          set SEARCHENGINE=YES
+          set SERVER_BASED_SEARCH=YES
+        ) ELSE (
+          IF "%1" == "qch" (
+            set GENERATE_HTML=YES
+            set GENERATE_QHP=YES
+          ) ELSE (
+            IF "%1" == "xml" (
+              set GENERATE_XML=YES
+            ) ELSE (
+              REM Default to HTML format.
+              set GENERATE_HTML=YES
+              set SEARCHENGINE=YES
+            )
+          )
+        )
+      )
+    )
+  )
+)
+
 REM
 REM NOW RUN DOXYGEN
 REM
@@ -34,4 +75,4 @@ REM     otherwise when generating the CHM file with Doxygen, those files are
 REM     not included!
 REM
 set PATH=%PATH%;%HHC_PATH%
-doxygen %cfgfile%
+doxygen Doxyfile
-- 
2.45.2