Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArc...

[wxWidgets.git] / docs / doxygen / regen.bat

diff --git a/docs/doxygen/regen.bat b/docs/doxygen/regen.bat
old mode 100755 (executable)
new mode 100644 (file)
index 7e4b481..8852f69
--- a/docs/doxygen/regen.bat
+++ b/docs/doxygen/regen.bat
@@ -1,19 +1,44 @@
+@echo off\r

 REM $Id$\r
 \r
 REM This bash script regenerates the HTML doxygen version of the\r
 REM wxWidgets manual and adjusts the doxygen log to make it more\r
 REM readable.\r
 \r
 REM $Id$\r
 \r
 REM This bash script regenerates the HTML doxygen version of the\r
 REM wxWidgets manual and adjusts the doxygen log to make it more\r
 REM readable.\r
 \r

-mkdir out\r
-mkdir out\html\r
+mkdir out 2>&1 >NUL\r
+mkdir out\html 2>&1 >NUL\r
+mkdir out\html\generic 2>&1 >NUL\r
+mkdir out\html\wxgtk 2>&1 >NUL\r
+mkdir out\html\wxmsw 2>&1 >NUL\r
+mkdir out\html\wxmac 2>&1 >NUL\r

 \r
 \r

-REM this image is not automatically copied by Doxygen because it's not\r
-REM used in doxygen documentation but only in our html footer...\r
-copy images\powered-by-wxwidgets.png out\html\r
+REM These not automatically copied by Doxygen because they're not\r
+REM used in doxygen documentation, only in our html footer and by our\r
+REM custom aliases\r
+copy images\powered-by-wxwidgets.png out\html 2>&1 >NUL\r
+copy images\logo_*.png out\html 2>&1 >NUL\r
+copy images\tab_*.gif out\html 2>&1 >NUL\r
+copy images\generic\*.png out\html\generic 2>&1 >NUL\r
+copy images\wxgtk\*.png out\html\wxgtk 2>&1 >NUL\r
+copy images\wxmsw\*.png out\html\wxmsw 2>&1 >NUL\r
+copy images\wxmac\*.png out\html\wxmac 2>&1 >NUL\r
+copy wxwidgets.js out\html 2>&1 >NUL\r

 \r
 \r

-REM this CSS is automatically copied by Doxygen because it's\r
+REM these CSS are not automatically copied by Doxygen because they're\r

 REM included by our custom html header...\r
 REM included by our custom html header...\r

-copy wxwidgets.css out\html\r
+copy wxwidgets.css out\html 2>&1 >NUL\r
+copy wxtabs.css 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\r
 REM NOW RUN DOXYGEN\r
 \r
 REM\r
 REM NOW RUN DOXYGEN\r


@@ -22,4 +47,5 @@ REM NB: we do this _after_ copying the required files to the output folders
 REM     otherwise when generating the CHM file with Doxygen, those files are\r
 REM     not included!\r
 REM\r
 REM     otherwise when generating the CHM file with Doxygen, those files are\r
 REM     not included!\r
 REM\r

-doxygen Doxyfile.all\r
+set PATH=%PATH%;%HHC_PATH%\r
+doxygen %cfgfile%\r