X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a5e62674f8c9e923956d67d95f5d0c97763ca1f..917afc7b81c6f806ea3d50b455f7c4e320ecd68f:/distrib/msw/tardist

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index ee19851e3a..536ceafa8f 100644
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -15,7 +15,7 @@ expandlines()
     rm -f $outputfile
     touch $outputfile
     for line in `cat $toexpand` ; do
-      if [ $line != "" ]; then
+      if [ "$line" != "" ]; then
         ls $line >> $outputfile
       fi
     done
@@ -23,17 +23,26 @@ expandlines()
 
 
 init=""
-WXVER=2.2.0
-if [ $1 = "" ]
+if [ "$1" = "" ]
 then
+  echo Usage: tardist wx-dir output-dir version
   exit
 fi
 
-if [ $2 = "" ]
+if [ "$2" = "" ]
 then
+  echo Usage: tardist wx-dir output-dir version
   exit
 fi
 
+if [ "$3" = "" ]
+then
+  echo Usage: tardist wx-dir output-dir version
+  exit
+fi
+
+WXVER=$3
+
 echo About to archive wxWindows:
 echo   From   $1
 echo   To     $2
@@ -45,78 +54,90 @@ cd $1
 echo Removing backup files...
 rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
-rm -f $2/wx${WXVER}*.tgz
-rm -f $2/tex2rtf2.tgz
-rm -f $2/ogl3.tgz
-rm -f $2/jpeg.tgz
-rm -f $2/tiff.tgz
+rm -f $2/wx*-${WXVER}*.tgz
+rm -f $2/tex2rtf2-*.tgz
+rm -f $2/dialoged-*.tgz
+rm -f $2/ogl3-*.tgz
+rm -f $2/jpeg-*.tgz
+rm -f $2/tiff-*.tgz
+rm -f $2/stc-*.tgz
+rm -f $2/canvas-*.tgz
+rm -f $2/contrib-*.tgz
+rm -f $2/applet-*.tgz
+rm -f $2/wxxrc-*.tgz
 
 echo Tarring...
 
 ### Generic
-ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
-tar cvf $2/wx${WXVER}gen.tar -T /tmp/wxgen.txt
-gzip $2/wx${WXVER}gen.tar
-mv $2/wx${WXVER}gen.tar.gz $2/wx${WXVER}gen.tgz
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt
+tar cvf $2/wxWindows-${WXVER}-gen.tar -T /tmp/wxgen.txt
+gzip $2/wxWindows-${WXVER}-gen.tar
+mv $2/wxWindows-${WXVER}-gen.tar.gz $2/wxWindows-${WXVER}-gen.tgz
 
 ### wxGTK
-ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt
-tar cvf $2/wx${WXVER}gtk.tar -T /tmp/wxgtk.txt
-gzip $2/wx${WXVER}gtk.tar
-mv $2/wx${WXVER}gtk.tar.gz $2/wx${WXVER}gtk.tgz
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxgtk.txt
+tar cvf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
+gzip $2/wxGTK-${WXVER}.tar
+mv $2/wxGTK-${WXVER}.tar.gz $2/wxGTK-${WXVER}.tgz
 
 ### wxMotif
-ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt
-tar cvf $2/wx${WXVER}mot.tar -T /tmp/wxmotif.txt
-gzip $2/wx${WXVER}mot.tar
-mv $2/wx${WXVER}mot.tar.gz $2/wx${WXVER}mot.tgz
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.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` > /tmp/wxmotif.txt
+tar cvf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
+gzip $2/wxMotif-${WXVER}.tar
+mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
+
+### wxMSW
+ls `cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/bc.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmsw.txt
+tar cvf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
+gzip $2/wxMSW-${WXVER}.tar
+mv $2/wxMSW-${WXVER}.tar.gz $2/wxMSW-${WXVER}.tgz
 
 ### Doc sources
 ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
-tar cvf $2/wx${WXVER}doc.tar -T /tmp/docsrc.txt
-gzip $2/wx${WXVER}doc.tar
-mv $2/wx${WXVER}doc.tar.gz $2/wx${WXVER}doc.tgz
+tar cvf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+gzip $2/wxWindows-${WXVER}-doc.tar
+mv $2/wxWindows-${WXVER}-doc.tar.gz $2/wxWindows-${WXVER}-doc.tgz
 
 ### HTML docs
 ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
-tar cvf $2/wx${WXVER}htm.tar -T /tmp/html.txt
-gzip $2/wx${WXVER}htm.tar
-mv $2/wx${WXVER}htm.tar.gz $2/wx${WXVER}htm.tgz
+tar cvf $2/wxWindows-${WXVER}-htm.tar -T /tmp/html.txt
+gzip $2/wxWindows-${WXVER}-htm.tar
+mv $2/wxWindows-${WXVER}-htm.tar.gz $2/wxWindows-${WXVER}-htm.tgz
 
 ### PDF docs
 ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
-tar cvf $2/wx${WXVER}pdf.tar -T /tmp/pdf.txt
-gzip $2/wx${WXVER}pdf.tar
-mv $2/wx${WXVER}pdf.tar.gz $2/wx${WXVER}pdf.tgz
+tar cvf $2/wxWindows-${WXVER}-pdf.tar -T /tmp/pdf.txt
+gzip $2/wxWindows-${WXVER}-pdf.tar
+mv $2/wxWindows-${WXVER}-pdf.tar.gz $2/wxWindows-${WXVER}-pdf.tgz
 
 ### Stubs files
-ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
-tar cvf $2/wx${WXVER}stubs.tar -T /tmp/stubs.txt
-gzip $2/wx${WXVER}stubs.tar
-mv $2/wx${WXVER}stubs.tar.gz $2/wx${WXVER}stubs.tgz
+#ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
+#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
+#gzip $2/wxWindows-${WXVER}-stubs.tar
+#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
 
 ### Tex2RTF
 ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
-tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
-gzip $2/tex2rtf2.tar
-mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
+tar cvf $2/tex2rtf2-${WXVER}.tar -T /tmp/tex2rtf.txt
+gzip $2/tex2rtf2-${WXVER}.tar
+mv $2/tex2rtf2-${WXVER}.tar.gz $2/tex2rtf2-${WXVER}.tgz
 
 ### OGL
 ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
-tar cvf $2/ogl3.tar -T /tmp/ogl.txt
-gzip $2/ogl3.tar
-mv $2/ogl3.tar.gz $2/ogl3.tgz
+tar cvf $2/ogl3-${WXVER}.tar -T /tmp/ogl.txt
+gzip $2/ogl3-${WXVER}.tar
+mv $2/ogl3-${WXVER}.tar.gz $2/ogl3-${WXVER}.tgz
 
 ### JPEG
 ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
-tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
-gzip $2/jpeg.tar
-mv $2/jpeg.tar.gz $2/jpeg.tgz
+tar cvf $2/jpeg-${WXVER}.tar -T /tmp/jpeg.txt
+gzip $2/jpeg-${WXVER}.tar
+mv $2/jpeg-${WXVER}.tar.gz $2/jpeg-${WXVER}.tgz
 
 ### TIFF
 ls `cat $1/distrib/msw/tiff.rsp` > /tmp/tiff.txt
-tar cvf $2/tiff.tar -T /tmp/tiff.txt
-gzip $2/tiff.tar
-mv $2/tiff.tar.gz $2/tiff.tgz
+tar cvf $2/tiff-${WXVER}.tar -T /tmp/tiff.txt
+gzip $2/tiff-${WXVER}.tar
+mv $2/tiff-${WXVER}.tar.gz $2/tiff-${WXVER}.tgz
 
 echo Done!