X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/520711e6de6ea534a9e8d16333629958f0aa558b..43087da71bb21d2e9945695d6a8f5ff82844550c:/build/script/win_docs.bat

diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index 9c04be8c7c..3e68c8ac0c 100644
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,12 +1,12 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-rem SET WXW_VER=2.8.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%
 
 rem  This builds the docs in %WXWIN% in a number of formats 
 rem  and a clean inno setup in a second tree
-rem  it uses a number of tools nmake, gnuwin32 zip, ghostscript, MS word, cvsNT
+rem  it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript, MS word, cvsNT
 rem  cvs is in the path already from CVSNT install
 rem  writes a log file in c:\
 
@@ -14,85 +14,78 @@ 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
-echo %PATH% >> c:\temp.log
+set INNO=c:\wx\inno\wxWidgets
 
-rem update wxwidgets (holds docs) and inno (cvs wxMSW module only)
-c:
-cd %WXWIN%
-cvs up -P -d
-cd \wx\inno\wxWidgets
-cvs up -P
-echo CVS update  >>  c:\temp.log
+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...
-rem just build the formats not in the CVS to keep down the .#makefile...
-set PATH=%PATH%;C:\wx\Bakefile\src
-cd \wx\inno\wxWidgets\build\bakefiles
-del .bakefile_gen.state
-bakefile_gen -f dmars,dmars,msevc4prj,dmars_smake >> c:\temp.log
-
+set PATH=%PATH%;C:\wx\Bakefile
 
-rem add nmake to the path and build the docs
-call  \vc6
-echo %PATH% >>  c:\temp.log
 SET >>  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 update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
+c:
+cd %WXWIN%
+svn cleanup >>  c:\temp.log
+svn up >>  c:\temp.log
+
+rem now inno
+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
+
+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 SVN update  >>  c:\temp.log
+
+rem just build the formats not in the SVN to keep down the .#makefile...
+cd %INNO%\build\bakefiles
+del .bakefile_gen.state
+bakefile_gen -k -f dmars,dmars_smake,msevc4prj >> c:\temp.log
 
-echo cvs doc up part 2 >>  c:\temp.log
 
-rem use ghostscript ps2pdf - add extra path first
-rem set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
-rem set PATH=%PATH%;C:\wx\GnuWin32\bin;C:\PROGRA~1\INNOSE~1
 
-cd %DAILY%\in
-call ps2pdf wx.ps >>  c:\temp.log
-call ps2pdf fl.ps >> c:\temp.log
-call ps2pdf gizmos.ps >> c:\temp.log
-call ps2pdf mmedia.ps >> c:\temp.log
-call ps2pdf ogl.ps >> c:\temp.log
-call ps2pdf svg.ps >> c:\temp.log
-call ps2pdf tex2rtf.ps >> c:\temp.log
+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 Zipping
-cd %WXWIN%
-del %DAILY%\*.zip
-zip %DAILY%\wxWidgets-%WXW_VER%-CHM.zip docs\htmlhelp\wx.chm utils/tex2rtf/docs/*.chm docs/htmlhelp/*.chm
-zip %DAILY%\wxWidgets-%WXW_VER%-HLP.zip docs\winhelp\wx.hlp docs\winhelp\wx.cnt utils/tex2rtf/docs/*.HLP utils/tex2rtf/docs/*.cnt docs/winhelp/*.hlp docs/winhelp/*.cnt
-
-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
-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
+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%
+
 
-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
+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
 
 echo docs built for %WXW_VER%
 echo docs built for %WXW_VER% >> c:\temp.log