Changes to distribution scripts

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

diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp
new file mode 100644 (file)
index 0000000..12de2f9
--- /dev/null
+++ b/distrib/msw/contrib.rsp
@@ -0,0 +1,82 @@
+contrib/samples/canvas/simple/*.cpp
+contrib/samples/canvas/simple/*.h
+contrib/samples/canvas/simple/*.def
+contrib/samples/canvas/simple/makefile*
+contrib/samples/canvas/simple/*.xbm
+contrib/samples/canvas/simple/*.xpm
+contrib/samples/canvas/simple/*.txt
+contrib/samples/canvas/simple/*.ico
+contrib/samples/canvas/simple/*.bmp
+contrib/samples/canvas/simple/*.rc
+contrib/samples/canvas/simple/SimpleVC.dsp
+contrib/samples/canvas/simple/SimpleVC.dsw
+
+contrib/samples/canvas/test/*.cpp
+contrib/samples/canvas/test/*.h
+contrib/samples/canvas/test/*.def
+contrib/samples/canvas/test/makefile*
+contrib/samples/canvas/test/*.xbm
+contrib/samples/canvas/test/*.xpm
+contrib/samples/canvas/test/*.txt
+contrib/samples/canvas/test/*.ico
+contrib/samples/canvas/test/*.bmp
+contrib/samples/canvas/test/*.rc
+contrib/samples/canvas/test/TestVC.dsp
+contrib/samples/canvas/test/TestVC.dsw
+
+contrib/samples/plot/*.cpp
+contrib/samples/plot/*.h
+contrib/samples/plot/*.def
+contrib/samples/plot/makefile*
+contrib/samples/plot/*.xbm
+contrib/samples/plot/*.xpm
+contrib/samples/plot/*.txt
+contrib/samples/plot/*.ico
+contrib/samples/plot/*.bmp
+contrib/samples/plot/*.rc
+contrib/samples/plot/PlotVC.dsp
+contrib/samples/plot/PlotVC.dsw
+
+contrib/samples/gizmos/multicell/*.cpp
+contrib/samples/gizmos/multicell/*.h
+contrib/samples/gizmos/multicell/*.def
+contrib/samples/gizmos/multicell/makefile*
+contrib/samples/gizmos/multicell/*.xbm
+contrib/samples/gizmos/multicell/*.xpm
+contrib/samples/gizmos/multicell/*.txt
+contrib/samples/gizmos/multicell/*.ico
+contrib/samples/gizmos/multicell/*.bmp
+contrib/samples/gizmos/multicell/*.rc
+contrib/samples/gizmos/multicell/MulticellVC.dsp
+contrib/samples/gizmos/multicell/MulticellVC.dsw
+
+contrib/samples/gizmos/splittree/*.cpp
+contrib/samples/gizmos/splittree/*.h
+contrib/samples/gizmos/splittree/*.def
+contrib/samples/gizmos/splittree/makefile*
+contrib/samples/gizmos/splittree/*.xbm
+contrib/samples/gizmos/splittree/*.xpm
+contrib/samples/gizmos/splittree/*.txt
+contrib/samples/gizmos/splittree/*.ico
+contrib/samples/gizmos/splittree/*.bmp
+contrib/samples/gizmos/splittree/*.rc
+contrib/samples/gizmos/splittree/TreeVC.dsp
+contrib/samples/gizmos/splittree/TreeVC.dsw
+
+contrib/src/canvas/*.cpp
+contrib/src/canvas/*.h
+contrib/src/canvas/make*
+contrib/src/canvas/CanvasVC.dsp
+contrib/src/canvas/CanvasVC.dsw
+
+contrib/src/plot/*.cpp
+contrib/src/plot/*.h
+contrib/src/plot/make*
+contrib/src/plot/PlotVC.dsp
+contrib/src/plot/PlotVC.dsw
+
+contrib/src/gizmos/*.cpp
+contrib/src/gizmos/*.h
+contrib/src/gizmos/make*
+contrib/src/gizmos/GizmosVC.dsp
+contrib/src/gizmos/GizmosVC.dsw
\ No newline at end of file

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 667e6169a9efe2b08913d2c89d8c2369e528e2fe..cc368023b53d4aad3f55cd74e656b9229d0a797a 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -96,7 +96,11 @@ src/png/TODO
 src/png/*.1
 src/png/*.3
 src/png/*.5
-src/png/scripts/*
+src/png/scripts/*.ppc
+src/png/scripts/*.bat
+src/png/scripts/makefile*
+src/png/scripts/*.com
+src/png/scripts/*.def
 
 src/zlib/*.c
 src/zlib/*.h
@@ -1116,3 +1120,4 @@ demos/dbbrowse/help.std/*.htm
 demos/dbbrowse/help.std/*.hhc
 demos/dbbrowse/help.std/*.hhp
 demos/dbbrowse/help.std/*.hhk
+

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 843421b162c41d426155ec47d878b5a7eecaeba2..4328a09960398db918c87411e4e5d8a8ad9dfed0 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -83,11 +83,19 @@ contrib/src/Makefile.in
 contrib/src/ogl/Makefile.in
 contrib/src/mmedia/Makefile.in
 contrib/src/stc/Makefile.in
+contrib/src/plot/Makefile.in
+contrib/src/gizmos/Makefile.in
+
 contrib/samples/Makefile.in
+contrib/samples/canvas/test/Makefile.in
+contrib/samples/canvas/simple/Makefile.in
+contrib/samples/canvas/Makefile.in
+contrib/samples/gizmos/Makefile.in
 contrib/samples/ogl/Makefile.in
 contrib/samples/ogl/ogledit/Makefile.in
 contrib/samples/ogl/studio/Makefile.in
 contrib/samples/mmedia/Makefile.in
+contrib/samples/plot/Makefile.in
 contrib/samples/stc/Makefile.in
 
 descrip.mms

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index ee19851e3a0c4b5e96f0967a1676fc8a3e06959f..56af90477c244af90eef225a6fd71ef3b03e2ce5 100644 (file)
--- 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,7 +54,7 @@ cd $1
 echo Removing backup files...
 rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
 
-rm -f $2/wx${WXVER}*.tgz
+rm -f $2/wxWindows-${WXVER}*.tgz
 rm -f $2/tex2rtf2.tgz
 rm -f $2/ogl3.tgz
 rm -f $2/jpeg.tgz
@@ -54,46 +63,46 @@ rm -f $2/tiff.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/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` > /tmp/wxgtk.txt
+tar cvf $2/wxWindows-${WXVER}-gtk.tar -T /tmp/wxgtk.txt
+gzip $2/wxWindows-${WXVER}-gtk.tar
+mv $2/wxWindows-${WXVER}-gtk.tar.gz $2/wxWindows-${WXVER}-gtk.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/makefile.rsp` > /tmp/wxmotif.txt
+tar cvf $2/wxWindows-${WXVER}-mot.tar -T /tmp/wxmotif.txt
+gzip $2/wxWindows-${WXVER}-mot.tar
+mv $2/wxWindows-${WXVER}-mot.tar.gz $2/wxWindows-${WXVER}-mot.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
+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

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 4d578ce0aac76297cecbea709f860ea31c30952b..dbb8ad9e36846fa64246ee3beaf0148e732a8c8f 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -298,3 +298,21 @@ contrib/utils/convertrc/ConvertVC.dsw
 contrib/utils/wxrcedit/wxrceditVC.dsp
 contrib/utils/wxrcedit/wxrceditVC.dsw
 
+contrib/src/canvas/CanvasVC.dsp
+contrib/src/canvas/CanvasVC.dsw
+contrib/samples/canvas/simple/SimpleVC.dsp
+contrib/samples/canvas/simple/SimpleVC.dsw
+contrib/samples/canvas/test/TestVC.dsp
+contrib/samples/canvas/test/TestVC.dsw
+
+contrib/src/plot/PlotVC.dsp
+contrib/src/plot/PlotVC.dsw
+contrib/samples/plot/PlotVC.dsp
+contrib/samples/plot/PlotVC.dsw
+
+contrib/src/gizmos/GizmosVC.dsp
+contrib/src/gizmos/GizmosVC.dsw
+contrib/samples/gizmos/multicell/MulticellVC.dsp
+contrib/samples/gizmos/multicell/MulticellVC.dsw
+contrib/samples/gizmos/splittree/TreeVC.dsp
+contrib/samples/gizmos/splittree/TreeVC.dsw