Fixed up Windows regen.bat script to use environment variables instead of conditional...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 0572505ca5610023da667f58f2c9b6eda53c775d..4a90d389103015eea98b6e98681a6c41a97dd658 100644 (file)
--- 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 f9d17a8c27ebdce8246abdbd933ebca769121e67..6250d8672796881769da78e47f66fce151804996 100644 (file)
--- 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\r
 REM custom aliases\r
 copy images\generic\*.png out\html\generic 2>&1 >NUL\r
-copy wxwidgets.js out\html 2>&1 >NUL\r
-\r
-REM set cfgfile variable to the right doxyfile to use,\r
-REM using MS broken batch scripting\r
-setlocal enableextensions\r
-set arg=%1\r
-if "%arg%" EQU "" set cfgfile=Doxyfile_all\r
-if "%arg%" NEQ "" set cfgfile=Doxyfile_%1\r
 \r
 pushd ..\..\r
 set WXWIDGETS=%CD%\r
 popd\r
 \r
+REM Defaults for settings controlled by this script\r
+set GENERATE_DOCSET=NO\r
+set GENERATE_HTML=NO\r
+set GENERATE_HTMLHELP=NO\r
+set GENERATE_LATEX=NO\r
+set GENERATE_QHP=NO\r
+set GENERATE_XML=NO\r
+set SEARCHENGINE=NO\r
+set SERVER_BASED_SEARCH=NO\r
+\r
+IF "%1" == "all" (\r
+  set GENERATE_HTML=YES\r
+  set GENERATE_HTMLHELP=YES\r
+  set GENERATE_XML=YES\r
+) ELSE (\r
+  IF "%1" == "chm" (\r
+    set GENERATE_HTML=YES\r
+    set GENERATE_HTMLHELP=YES\r
+  ) ELSE (\r
+    IF "%1" == "docset" (\r
+      set GENERATE_DOCSET=YES\r
+      set GENERATE_HTML=YES\r
+    ) ELSE (\r
+      IF "%1" == "latex" (\r
+        set GENERATE_LATEX=YES\r
+      ) ELSE (\r
+        IF "%1" == "php" (\r
+          set GENERATE_HTML=YES\r
+          set SEARCHENGINE=YES\r
+          set SERVER_BASED_SEARCH=YES\r
+        ) ELSE (\r
+          IF "%1" == "qch" (\r
+            set GENERATE_HTML=YES\r
+            set GENERATE_QHP=YES\r
+          ) ELSE (\r
+            IF "%1" == "xml" (\r
+              set GENERATE_XML=YES\r
+            ) ELSE (\r
+              REM Default to HTML format.\r
+              set GENERATE_HTML=YES\r
+              set SEARCHENGINE=YES\r
+            )\r
+          )\r
+        )\r
+      )\r
+    )\r
+  )\r
+)\r
+\r
 REM\r
 REM NOW RUN DOXYGEN\r
 REM\r
@@ -34,4 +75,4 @@ REM     otherwise when generating the CHM file with Doxygen, those files are
 REM     not included!\r
 REM\r
 set PATH=%PATH%;%HHC_PATH%\r
-doxygen %cfgfile%\r
+doxygen Doxyfile\r