From: Julian Smart Date: Sun, 30 May 2004 16:54:08 +0000 (+0000) Subject: Script tweaks X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0157e579ec97555ea4cf07f2a9683fcb3a6b5065?ds=inline Script tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 82219bc6f9..355786cc4e 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -176,6 +176,7 @@ samples/samples.bkl samples/*.txt samples/makefile* +samples/*.xpm samples/access/*.cpp samples/access/*.h diff --git a/distrib/msw/makefile.vc b/distrib/msw/makefile.vc index 63a97a1d79..45289df237 100644 --- a/distrib/msw/makefile.vc +++ b/distrib/msw/makefile.vc @@ -25,7 +25,7 @@ rtf: $(DOCDIR)/winhelp/wx.rtf pdfrtf: $(DOCDIR)/pdf/wx.rtf html: wxhtml htb: $(DOCDIR)\htb\wx.htb -wxhtml: $(DOCDIR)\html\wx\wx.htm +wxhtml: $(DOCDIR)\html\wx\wx_contents.html htmlhelp: $(DOCDIR)\htmlhelp\wx.chm ps: wxps wxps: $(WXDIR)\docs\ps\wx.ps @@ -111,7 +111,7 @@ $(DOCDIR)/pdf/wx.rtf: $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/ # This target does two sets of HTML: one using a style sheet, for # the purposes of the CHM file, and one without. -$(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex +$(DOCDIR)\html\wx\wx_contents.html: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex\wx\body.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)\latex\wx\manual.tex cd $(DOCDIR)\latex\wx -mkdir $(DOCDIR)\html\wx copy *.gif $(DOCDIR)\html\wx @@ -126,7 +126,7 @@ $(DOCDIR)\html\wx\wx.htm: $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex -erase $(DOCDIR)\latex\wx\*.ref cd $(THISDIR) -$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.htm $(DOCDIR)\mshtml\wx\wx.hhp +$(DOCDIR)\htmlhelp\wx.chm : $(DOCDIR)\html\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx_contents.html $(DOCDIR)\mshtml\wx\wx.hhp cd $(DOCDIR)\mshtml\wx copy $(DOCDIR)\latex\wx\wx.css . -hhc wx.hhp @@ -171,10 +171,10 @@ $(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi # files, renamed to htb. # This can then be used with e.g. helpview. # Optionally, a cached version of the .hhp file can be generated with hhp2cached. -$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm +$(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx_contents.html cd $(WXDIR)\docs\html\wx -erase wx.zip wx.htb - zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk + zip wx.zip *.html *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move wx.zip $(DOCDIR)\htb\wx.htb cd $(THISDIR) @@ -188,7 +188,7 @@ updatedocs: touchmanual alldocs cleandocs: -erase $(DOCDIR)\winhelp\wx.hlp -erase $(DOCDIR)\winhelp\wx.cnt - -erase $(DOCDIR)\html\wx\*.htm + -erase $(DOCDIR)\html\wx\*.html -erase $(DOCDIR)\pdf\wx.rtf -erase $(DOCDIR)\latex\wx\wx.rtf -erase $(DOCDIR)\latex\wx\WX.PH diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh index 3919009de5..a9db4dc09a 100644 --- a/distrib/msw/makesetup.sh +++ b/distrib/msw/makesetup.sh @@ -15,6 +15,7 @@ SPINMAC=0 SPINOS2=0 SPINDOCS=1 SPINALL=1 +SPINWXALL=1 VERBOSE=0 ZIPFLAGS= @@ -220,6 +221,7 @@ dospinmsw() zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp # rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR @@ -248,6 +250,58 @@ dospinmsw() zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/* } +dospinwxall() +{ + cd $APPDIR + + # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW + echo Zipping individual components + zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp + + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/x11.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/motif.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mac.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mgl.rsp + zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/os2.rsp + +# rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR + + if [ -d $DESTDIR/wxWidgets-$VERSION ]; then + rm -f -r $DESTDIR/wxWidgets-$VERSION + fi + + mkdir $DESTDIR/wxWidgets-$VERSION + cd $DESTDIR/wxWidgets-$VERSION + unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip + + echo Copying readme files... + cp $APPDIR/docs/licence.txt LICENCE.txt + cp $APPDIR/docs/lgpl.txt COPYING.LIB + cp $APPDIR/docs/changes.txt CHANGES.txt + cp $APPDIR/docs/readme.txt README.txt + + cd $DESTDIR + + rm -f wxWidgets-$VERSION-win.zip + zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/* +} + dospindocs() { cd $APPDIR @@ -307,6 +361,11 @@ dospinmisc() zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp # rearchive wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION $DESTDIR + # eVC++ project files + echo Creating $DESTDIR/wxWidgets-$VERSION-eVC.zip + zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-eVC.zip < $APPDIR/distrib/msw/wince.rsp + # rearchive wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION $DESTDIR + # BC++ project files echo Creating $DESTDIR/wxWidgets-$VERSION-BC.zip zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp @@ -325,7 +384,7 @@ dospinsetup() # Put all archives for transit to Linux in a zip file echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip - zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-CW-Mac.zip + zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-eVC.zip wxWidgets-$VERSION-CW-Mac.zip echo Unzipping the Windows files into wxWidgets-$VERSION @@ -550,6 +609,11 @@ makesetup() dospinmsw fi + # Do wxAll spin + if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then + dospinwxall + fi + # Do docs spin if [ "$SPINDOCS" = "1" ] || [ "$SPINALL" = "1" ]; then dospindocs @@ -634,6 +698,7 @@ usage() echo " --wxmac Build wxMac distribution" echo " --wxmsw Build wxMSW distribution" echo " --wxos2 Build wxOS2 distribution" + echo " --wxall Build wxAll zip distribution" echo " --docs Build docs archives" echo " --all Build all distributions (the default)" echo " --verbose Verbose zip operation" @@ -653,6 +718,7 @@ for i in "$@"; do --wxmac) SPINMAC=1; SPINALL=0 ;; --wxmsw) SPINMSW=1; SPINALL=0 ;; --wxos2) SPINOS2=1; SPINALL=0 ;; + --wxall) SPINWXALL=1; SPINALL=0 ;; --docs) SPINDOCS=1; SPINALL=0 ;; --all) SPINALL=1 ;; --verbose) VERBOSE=1 ;; diff --git a/distrib/msw/tardist b/distrib/msw/tardist index 5085d7db33..c185d92fa4 100644 --- a/distrib/msw/tardist +++ b/distrib/msw/tardist @@ -233,7 +233,7 @@ echo Tarring wxAll... ### wxAll: all distributions in one giant archive cd $WXSRC -cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt +cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/wince.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/cw.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/os2.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/mgl.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/utilmake.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/mmedia.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp $WXSRC/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt expandlines /tmp/wxall_in.txt /tmp/wxall.txt $TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt diff --git a/distrib/msw/tarwxall b/distrib/msw/tarwxall index 799c18f6f4..723c95a494 100755 --- a/distrib/msw/tarwxall +++ b/distrib/msw/tarwxall @@ -66,7 +66,7 @@ rm -f $2/wxAll-${WXVER}*.tar.gz ### wxAll: all distributions in one giant archive cd $1 -cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/cocoa.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt +cat $1/distrib/msw/generic.rsp $1/distrib/msw/msw.rsp $1/distrib/msw/wince.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/cw_mac.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/mac.rsp $1/distrib/msw/cocoa.rsp $1/distrib/msw/os2.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/mgl.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/deprecated.rsp $1/distrib/msw/utilmake.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/mmedia.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/stc.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp $1/distrib/msw/docsrc.rsp | uniq > /tmp/wxall_in.txt expandlines /tmp/wxall_in.txt /tmp/wxall.txt $TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt