Corrected points to pixels calculation

[wxWidgets.git] / distrib / msw / tardist

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 346b4340b555376209f7d807a61f724a8130b0e5..d9735b4200fe09f1c4a51aea6e21efe05979c339 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -64,6 +64,7 @@ rm -f $2/stc-*.tgz
 rm -f $2/canvas-*.tgz
 rm -f $2/contrib-*.tgz
 rm -f $2/applet-*.tgz
 rm -f $2/canvas-*.tgz
 rm -f $2/contrib-*.tgz
 rm -f $2/applet-*.tgz

+rm -f $2/wxxrc-*.tgz

 
 echo Tarring...
 
 
 echo Tarring...
 


@@ -80,11 +81,17 @@ gzip $2/wxGTK-${WXVER}.tar
 mv $2/wxGTK-${WXVER}.tar.gz $2/wxGTK-${WXVER}.tgz
 
 ### wxMotif
 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/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmotif.txt
+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
 
 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
 

+### wxX: combined wxMotif and wxX11 distributions
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/x11.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` | uniq > /tmp/wxx.txt
+tar cvf $2/wxWindows-X-${WXVER}.tar -T /tmp/wxx.txt
+gzip $2/wxWindows-X-${WXVER}.tar
+mv $2/wxWindows-X-${WXVER}.tar.gz $2/wxWindows-X-${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
 ### 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