compilation fix after last change

[wxWidgets.git] / build / script / win_docs.bat

diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index f5b7981c97a13b2f5d01e75a899bb4c13869eca1..3e68c8ac0c385726d488954807ed491ce7e31689 100644 (file)
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,6 +1,6 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-rem SET WXW_VER=2.9.0
-if (%WXW_VER%)==() SET WXW_VER=CVS
+rem SET WXW_VER=2.9.0-rc1
+if (%WXW_VER%)==() SET WXW_VER=SVN
 
 echo docs building for %WXW_VER%
 
@@ -14,13 +14,14 @@ echo Building wxWidgets-%WXW_VER% docs... > c:\temp.log
 
 set WXWIN=c:\wx\wxWidgets
 set DAILY=c:\daily
-set PATH=%PATH%;C:\wx\wxw26b\utils\tex2rtf\src\vc_based;C:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
-set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
-rem add nmake to the path to build the docs
-call  \vc6
+set INNO=c:\wx\inno\wxWidgets
+
+rem svn already in my path...
+set PATH=%PATH%;c:\wx\Gnu\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1
+
 echo %PATH% >>  c:\temp.log
 rem add bakefile build...
-set PATH=%PATH%;C:\wx\Bakefile\src
+set PATH=%PATH%;C:\wx\Bakefile
 
 SET >>  c:\temp.log
 
@@ -28,80 +29,64 @@ SET >>  c:\temp.log
 rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
 c:
 cd %WXWIN%
-cvs up -P -d
+svn cleanup >>  c:\temp.log
+svn up >>  c:\temp.log
 
 rem now inno
-cd \wx\inno\wxWidgets
-del c*.*
+cd %INNO% >>  c:\temp.log
+svn cleanup >>  c:\temp.log
+svn up >>  c:\temp.log
+
 if exist include\wx\msw\setup.h del include\wx\msw\setup.h
 if exist include\wx\univ\setup.h del include\wx\univ\setup.h
-cvs up -P
+
+rem for cygwin these need to be in unix format
+del configure
+del config.guess
+del config.sub
+svn up configure
+svn up config.guess
+svn up config.sub
 dos2unix configure
 dos2unix config.guess
 dos2unix config.sub
+
 copy include\wx\msw\setup0.h include\wx\msw\setup.h
 copy include\wx\univ\setup0.h include\wx\univ\setup.h
-echo CVS update  >>  c:\temp.log
+echo SVN update  >>  c:\temp.log
 
-rem just build the formats not in the CVS to keep down the .#makefile...
-cd \wx\inno\wxWidgets\build\bakefiles
+rem just build the formats not in the SVN to keep down the .#makefile...
+cd %INNO%\build\bakefiles
 del .bakefile_gen.state
-bakefile_gen -f dmars,dmars,msevc4prj,dmars_smake >> c:\temp.log
+bakefile_gen -k -f dmars,dmars_smake,msevc4prj >> c:\temp.log
 
 
-cd %WXWIN%\build\script
-nmake -f makedocs.vc cleandocs
-nmake -f makedocs.vc alldocs
 
-del %DAILY%\in\*.p*
-mkdir %WXWIN%\docs\pdf
-mkdir %WXWIN%\docs\htmlhelp
-mkdir %WXWIN%\docs\htb
-echo starting word >>  c:\temp.log
-start /WAIT winword /mwx_ps
+rem make and copy chm to inno
+rem Now create standalone copies of docs (chm and htb)
+cd %WXWIN%\docs\doxygen
+del out\html\*.html
+del out\html\*.htb
+del out\*.chm
+call regen chm
 
 
-echo cvs doc up part 2 >>  c:\temp.log
+cd %WXWIN%\docs\doxygen\out
+zip wxWidgets-%WXW_VER%-chm.zip wx.chm
+copy wxWidgets-%WXW_VER%-chm.zip %DAILY%
+cd html
+del *.dot
+del *.md5
+zip -r wx.htb *.*
+zip wxWidgets-%WXW_VER%-htb.zip wx.htb
+copy wxWidgets-%WXW_VER%-htb.zip %DAILY%
 
-cd %DAILY%\in
-call ps2pdf wx.ps >>  c:\temp.log
-call ps2pdf tex2rtf.ps >> c:\temp.log
 
-echo Zipping
-cd %WXWIN%
-del %DAILY%\*.zip
-zip %DAILY%\wxWidgets-%WXW_VER%-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm 
-zip %DAILY%\wxWidgets-%WXW_VER%-HTB.zip docs\htb\*.htb utils/tex2rtf/docs/*.htb 
-zip %DAILY%\wxWidgets-%WXW_VER%-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt 
-zip -r %DAILY%\wxWidgets-%WXW_VER%-HTML.zip docs\html\* utils\tex2rtf\docs\html\* -x CVS -x *.con -x *.hh* -x *.ref -x *.htx -x *.cn1 -x docs\html\CVS\*
-
-del %DAILY%\*.tar.gz
-bsdtar zcvf %DAILY%\wxWidgets-%WXW_VER%-HTB.tar.gz docs/htb/*.htb utils/tex2rtf/docs/*.htb 
-bsdtar zcvf %DAILY%\wxWidgets-%WXW_VER%-HTML.tar.gz  --exclude CVS --exclude *.con --exclude *.hh* --exclude *.ref --exclude *.htx --exclude *.cn1 --exclude docs/html/CVS/* docs/html/* utils/tex2rtf/docs/html/*
-
-cd %DAILY%\
-mkdir docs
-mkdir docs\pdf
-del docs\pdf\*.pdf
-move in\*.pdf docs\pdf
-zip wxWidgets-%WXW_VER%-PDF.zip docs\pdf\*.pdf
-
-rem copy chm to inno
-cd %WXWIN%
-mkdir c:\wx\inno\wxWidgets\docs\htmlhelp
-copy docs\htmlhelp\wx.chm \wx\inno\wxWidgets\docs\htmlhelp\wx.chm
+mkdir %INNO%\docs\htmlhelp
+copy %WXWIN%\docs\doxygen\out\wx.chm \wx\inno\wx29b\docs\htmlhelp\wx.chm
 cd %WXWIN%\build\script
 iscc wxwidgets.iss >> c:\temp.log
 
-rem echo setting S
-rem echo yes > net use s: /delete
-rem net use s: \\biolpc22\bake 
-rem net use >> c:\temp.log
-
-rem copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win
-rem copy %DAILY%\*.exe s:\bkl-cronjob\archives\win\*.exe
-rem dir s: /od >> c:\temp.log
-
 echo docs built for %WXW_VER%
 echo docs built for %WXW_VER% >> c:\temp.log