remove contrib docs from daily builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/script/makedocs.vc b/build/script/makedocs.vc
index 5ffc7737c33cd8d1e5347efee8a052af1efb8853..f00e3947acff7d7803a66b250381dd457f4a674d 100644 (file)
--- a/build/script/makedocs.vc
+++ b/build/script/makedocs.vc
@@ -11,104 +11,18 @@ DOCDIR = $(WXDIR)\docs
 WAITFLAG=/w
 
 # Making documents
-docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp htmlhelp
+docs:   wxhlp rtf pdfrtf wxhtml htmlhelp htb
 alldocs: docs
 hlp:    wxhlp
 wxhlp:  $(DOCDIR)/winhelp/wx.hlp
-rtf:    $(DOCDIR)/winhelp/wx.rtf
+rtf:    $(DOCDIR)/latex/wx/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 html:  wxhtml
 htb:   $(DOCDIR)\htb\wx.htb
 wxhtml:        $(DOCDIR)\html\wx\wx_contents.html
 htmlhelp: $(DOCDIR)\htmlhelp\wx.chm
-#ps:     wxps
-#wxps: $(WXDIR)\docs\ps\wx.ps
-
-allhlp: wxhlp
-#        cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc hlp
-        cd $(WXDIR)\utils\tex2rtf\docs
-        nmake -f makefile.vc hlp
-        cd $(WXDIR)\contrib\src\fl
-        -nmake -f makedocs.vc hlp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\ogl
-        -nmake -f makedocs.vc hlp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\svg
-        -nmake -f makedocs.vc hlp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\gizmos
-        -nmake -f makedocs.vc hlp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\mmedia
-        -nmake -f makedocs.vc hlp
-        cd $(THISDIR)
-
-
-allpdfrtf: pdfrtf
-
-allhtb: htb
-#        cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc htb
-        cd $(WXDIR)\utils\tex2rtf\docs
-        nmake -f makefile.vc htb
-        cd $(WXDIR)\contrib\src\fl
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\ogl
-        nmake -f makedocs.vc htb
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\svg
-        nmake -f makedocs.vc htb
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\gizmos
-        nmake -f makedocs.vc htb
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\mmedia
-        nmake -f makedocs.vc htb
-        cd $(THISDIR)
-
-allhtml: wxhtml
-#        cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc html
-        cd $(WXDIR)\utils\tex2rtf\docs
-        nmake -f makefile.vc html
-        cd $(WXDIR)\contrib\src\fl
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\ogl
-        nmake -f makedocs.vc html
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\svg
-        nmake -f makedocs.vc html
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\gizmos
-        nmake -f makedocs.vc html
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\mmedia
-        nmake -f makedocs.vc html
-        cd $(THISDIR)
 
 
-allhtmlhelp: htmlhelp
-#       cd $(WXDIR)\utils\dialoged\src
-#        nmake -f makefile.vc htmlhelp
-        cd $(WXDIR)\utils\tex2rtf\docs
-        -nmake -f makefile.vc htmlhelp
-        cd $(WXDIR)\contrib\src\fl
-        -nmake -f makedocs.vc htmlhelp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\ogl
-        -nmake -f makedocs.vc htmlhelp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\svg
-        -nmake -f makedocs.vc htmlhelp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\gizmos
-        -nmake -f makedocs.vc htmlhelp
-        cd $(THISDIR)
-        cd $(WXDIR)\contrib\src\mmedia
-        -nmake -f makedocs.vc htmlhelp
-        cd $(THISDIR)
 
 
 $(DOCDIR)/winhelp/wx.hlp:         $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj

diff --git a/build/script/win_docs.bat b/build/script/win_docs.bat
index 06200138a9cd5a8de0727670da0204083ed43d24..10ae8b3f5ee5a693bf51d8bdb987b44ea6d0c49e 100644 (file)
--- a/build/script/win_docs.bat
+++ b/build/script/win_docs.bat
@@ -1,5 +1,5 @@
 rem Uncomment the next line to set the version; used also in wxWidgets.iss
-SET WXW_VER=2.8.2
+rem SET WXW_VER=2.9.0
 if (%WXW_VER%)==() SET WXW_VER=CVS
 
 echo docs building for %WXW_VER%
@@ -16,7 +16,14 @@ 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
+rem add nmake to the path to build the docs
+call  \vc6
+echo %PATH% >>  c:\temp.log
+rem add bakefile build...
+set PATH=%PATH%;C:\wx\Bakefile\src
+
+SET >>  c:\temp.log
+
 
 rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
 c:
@@ -36,18 +43,12 @@ 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
 
-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
 
 
-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
@@ -62,27 +63,22 @@ start /WAIT winword /mwx_ps
 
 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
 
 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%-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 docs/winhelp/*.hlp docs/winhelp/*.cnt
+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\* -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/*
+
 cd %DAILY%\
 mkdir docs
 mkdir docs\pdf