diff --git a/build/script/makedocs.vc b/build/script/makedocs.vc index 2dcfb87816..31146cc127 100644 --- a/build/script/makedocs.vc +++ b/build/script/makedocs.vc @@ -30,19 +30,19 @@ allhlp: wxhlp cd $(WXDIR)\utils\tex2rtf\docs nmake -f makefile.vc hlp cd $(WXDIR)\contrib\src\fl - -nmake -f makefile.vc hlp + -nmake -f makedocs.vc hlp cd $(THISDIR) cd $(WXDIR)\contrib\src\ogl - -nmake -f makefile.vc hlp + -nmake -f makedocs.vc hlp cd $(THISDIR) cd $(WXDIR)\contrib\src\svg - -nmake -f makefile.vc hlp + -nmake -f makedocs.vc hlp cd $(THISDIR) cd $(WXDIR)\contrib\src\gizmos - -nmake -f makefile.vc hlp + -nmake -f makedocs.vc hlp cd $(THISDIR) cd $(WXDIR)\contrib\src\mmedia - -nmake -f makefile.vc hlp + -nmake -f makedocs.vc hlp cd $(THISDIR) @@ -58,16 +58,16 @@ allhtml: wxhtml cd $(WXDIR)\contrib\src\fl cd $(THISDIR) cd $(WXDIR)\contrib\src\ogl - nmake -f makefile.vc html + nmake -f makedocs.vc html cd $(THISDIR) cd $(WXDIR)\contrib\src\svg - nmake -f makefile.vc html + nmake -f makedocs.vc html cd $(THISDIR) cd $(WXDIR)\contrib\src\gizmos - nmake -f makefile.vc html + nmake -f makedocs.vc html cd $(THISDIR) cd $(WXDIR)\contrib\src\mmedia - nmake -f makefile.vc html + nmake -f makedocs.vc html cd $(THISDIR) allhtmlhelp: htmlhelp @@ -76,19 +76,19 @@ allhtmlhelp: htmlhelp cd $(WXDIR)\utils\tex2rtf\docs -nmake -f makefile.vc htmlhelp cd $(WXDIR)\contrib\src\fl - -nmake -f makefile.vc htmlhelp + -nmake -f makedocs.vc htmlhelp cd $(THISDIR) cd $(WXDIR)\contrib\src\ogl - -nmake -f makefile.vc htmlhelp + -nmake -f makedocs.vc htmlhelp cd $(THISDIR) cd $(WXDIR)\contrib\src\svg - -nmake -f makefile.vc htmlhelp + -nmake -f makedocs.vc htmlhelp cd $(THISDIR) cd $(WXDIR)\contrib\src\gizmos - -nmake -f makefile.vc htmlhelp + -nmake -f makedocs.vc htmlhelp cd $(THISDIR) cd $(WXDIR)\contrib\src\mmedia - -nmake -f makefile.vc htmlhelp + -nmake -f makedocs.vc htmlhelp cd $(THISDIR) diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat index 3e1fda9a55..1c5f2c5a44 100644 --- a/build/script/win_docs.bat +++ b/build/script/win_docs.bat @@ -9,7 +9,7 @@ echo Building wxWidgets docs... > c:\temp.log set WXWIN=c:\wx\wxWidgets set DAILY=c:\daily -set PATH=%PATH%;C:\wx\wxWidg~1.3\utils\tex2rtf\src\vc_based;C:\wx\GnuWin32\bin;c:\progra~1\htmlhe~1;C:\PROGRA~1\INNOSE~1 +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 @@ -31,6 +31,9 @@ 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 @@ -67,8 +70,8 @@ zip %DAILY%\wx-docs-extra-pdf.ZIP *.pdf -x wx.pdf echo setting S -rem echo yes > net use s: /delete -net use s: \\biolpc22\bake +rem echo yes > net use t: /delete +rem net use t: \\biolpc22\bake copy %DAILY%\*.ZIP s:\bkl-cronjob\archives\win copy %DAILY%\*.exe s:\bkl-cronjob\archives\win\*.EXE