Link with liblzma when using built-in libtiff if it's available.

[wxWidgets.git] / build / tools / bld_chm_exe.bat

diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat
index b58a54d829fd41080f9a1b9985a1812450de73c9..6125edb63e6d37fd28d2f57dc9741a7ff6b5d050 100644 (file)
--- a/build/tools/bld_chm_exe.bat
+++ b/build/tools/bld_chm_exe.bat
@@ -1,12 +1,12 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss\r
 rem Uncomment the next line to set the version; used also in wxWidgets.iss\r

-SET WXW_VER=2.9.1\r
+SET WXW_VER=2.9.5

 if (%WXW_VER%)==() SET WXW_VER=SVN\r
 \r
 echo docs building for %WXW_VER%\r
 \r
 rem  This builds the docs in %WXWIN% in a number of formats \r
 rem  and a clean inno setup in a second tree\r
 if (%WXW_VER%)==() SET WXW_VER=SVN\r
 \r
 echo docs building for %WXW_VER%\r
 \r
 rem  This builds the docs in %WXWIN% in a number of formats \r
 rem  and a clean inno setup in a second tree\r

-rem  it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript\r
+rem  it uses a number of tools, gnuwin32 zip & dos2unix, \r

 rem  writes a log file in c:\\r
 \r
 echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log\r
 rem  writes a log file in c:\\r
 \r
 echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log\r


@@ -17,7 +17,7 @@ set INNO=c:\wx\inno\wxWidgets
 \r
 rem svn already in my path...\r
 set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1;c:\wx\doxygen\bin\r
 \r
 rem svn already in my path...\r
 set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1;c:\wx\doxygen\bin\r

-\r
+set PATH=%PATH%;C:\wx\Graphviz\bin\r

 echo %PATH% >>  c:\temp.log\r
 \r
 \r
 echo %PATH% >>  c:\temp.log\r
 \r
 \r


@@ -59,14 +59,15 @@ call regen chm
 \r
 \r
 cd %WXWIN%\docs\doxygen\out\r
 \r
 \r
 cd %WXWIN%\docs\doxygen\out\r

-zip wxWidgets-%WXW_VER%-chm.zip wx.chm\r
-copy wxWidgets-%WXW_VER%-chm.zip %DAILY%\r
+zip wxWidgets-%WXW_VER%-docs-chm.zip wx.chm\r
+copy wxWidgets-%WXW_VER%-docs-chm.zip %DAILY%\r

 cd html\r
 del *.dot\r
 del *.md5\r
 zip -r wx.htb *.*\r
 cd html\r
 del *.dot\r
 del *.md5\r
 zip -r wx.htb *.*\r

-zip wxWidgets-%WXW_VER%-htb.zip wx.htb\r
-copy wxWidgets-%WXW_VER%-htb.zip %DAILY%\r
+copy wx.htb %DAILY%\wxWidgets-%WXW_VER%-docs-html.zip\r
+zip wxWidgets-%WXW_VER%-docs-htb.zip wx.htb\r
+copy wxWidgets-%WXW_VER%-docs-htb.zip %DAILY%\r

 \r
 \r
 mkdir %INNO%\docs\htmlhelp\r
 \r
 \r
 mkdir %INNO%\docs\htmlhelp\r