diff --git a/build/script/makedocs.vc b/build/script/makedocs.vc index 33200ee9e2..c9062f2a73 100644 --- a/build/script/makedocs.vc +++ b/build/script/makedocs.vc @@ -47,6 +47,23 @@ allhlp: wxhlp allpdfrtf: pdfrtf + cd $(WXDIR)\utils\tex2rtf\docs + nmake -f makefile.vc pdfrtf + cd $(WXDIR)\contrib\src\fl + nmake -f makedocs.vc pdfrtf + cd $(THISDIR) + cd $(WXDIR)\contrib\src\ogl + nmake -f makedocs.vc pdfrtf + cd $(THISDIR) + cd $(WXDIR)\contrib\src\svg + nmake -f makedocs.vc pdfrtf + cd $(THISDIR) + cd $(WXDIR)\contrib\src\gizmos + nmake -f makedocs.vc pdfrtf + cd $(THISDIR) + cd $(WXDIR)\contrib\src\mmedia + nmake -f makedocs.vc pdfrtf + cd $(THISDIR) allhtb: htb # cd $(WXDIR)\utils\dialoged\src @@ -54,6 +71,7 @@ allhtb: htb cd $(WXDIR)\utils\tex2rtf\docs nmake -f makefile.vc htb cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc htb cd $(THISDIR) cd $(WXDIR)\contrib\src\ogl nmake -f makedocs.vc htb @@ -74,6 +92,7 @@ allhtml: wxhtml cd $(WXDIR)\utils\tex2rtf\docs nmake -f makefile.vc html cd $(WXDIR)\contrib\src\fl + nmake -f makefile.vc html cd $(THISDIR) cd $(WXDIR)\contrib\src\ogl nmake -f makedocs.vc html diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat index 1db554e095..5ff9012006 100644 --- a/build/script/win_docs.bat +++ b/build/script/win_docs.bat @@ -77,7 +77,7 @@ 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 +call ps2pdf tex2rtf_rtf.ps >> c:\temp.log echo Zipping cd %WXWIN% @@ -97,6 +97,7 @@ zip wxWidgets-%WXW_VER%-PDF.zip docs\pdf\*.pdf rem copy chm to inno cd %WXWIN% mkdir c:\wx\inno\wxw28b\docs\htmlhelp +del \wx\inno\wxw28b\docs\htmlhelp\wx.chm copy docs\htmlhelp\wx.chm \wx\inno\wxw28b\docs\htmlhelp\wx.chm cd %WXWIN%\build\script iscc wxwidgets.iss >> c:\temp.log diff --git a/contrib/src/svg/makedocs.vc b/contrib/src/svg/makedocs.vc index 3b55a265fe..cdb6fd8ebb 100644 --- a/contrib/src/svg/makedocs.vc +++ b/contrib/src/svg/makedocs.vc @@ -6,7 +6,7 @@ NAME=svg DOCSOURCEDIR=$(WXDIR)\contrib\docs\latex\$(NAME) DOCDIR=$(WXDIR)\docs THISDIR = $(WXDIR)\contrib\src\$(NAME) -DOCSOURCES=$(DOCSOURCEDIR)\dc$(NAME).tex \ +DOCSOURCES=$(DOCSOURCEDIR)\dc$(NAME).tex WAITFLAG=/WAIT alldocs: mkdirs html htmlhelp htb hlp pdfrtf