From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 16 Aug 2002 17:08:47 +0000 (+0000)
Subject: Script tweaks
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/332b8edbdc190fcb84512c2e462cb26ff5ff21cc?hp=bf89b538f24d96be1dbb5bfa4037397b5438c5e2

Script tweaks


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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 5d6a7e0736..4042e6ad63 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -79,6 +79,7 @@ src/common/unzip.h
 src/common/*.l
 src/common/*.y
 src/common/*.inc
+src/common/base.rc
 
 src/generic/*.cpp
 src/generic/*.c
@@ -709,6 +710,14 @@ samples/layout/*.rc
 samples/layout/*.bmp
 samples/layout/*.pro
 
+samples/listbox/*.cpp
+samples/listbox/*.h
+samples/listbox/*.def
+samples/listbox/*.rc
+samples/listbox/*.txt
+samples/listbox/makefile*
+samples/listbox/*.xpm
+
 samples/listctrl/*.cpp
 samples/listctrl/*.h
 samples/listctrl/*.def
@@ -788,6 +797,26 @@ samples/minifram/*.pro
 samples/minifram/bitmaps/*.bmp
 samples/minifram/bitmaps/*.xpm
 
+samples/mobile/styles/*.cpp
+samples/mobile/styles/*.h
+samples/mobile/styles/*.xpm
+samples/mobile/styles/*.jpg
+samples/mobile/wxedit/*.cpp
+samples/mobile/wxedit/*.h
+samples/mobile/wxedit/*.xpm
+
+samples/multimon/*.h
+samples/multimon/*.cpp
+samples/multimon/*.def
+samples/multimon/*.rc
+samples/multimon/makefile*
+samples/multimon/*.xbm
+samples/multimon/*.xpm
+samples/multimon/*.txt
+samples/multimon/*.ico
+samples/multimon/*.bmp
+samples/multimon/*.pro
+
 samples/newgrid/*.cpp
 samples/newgrid/*.h
 samples/newgrid/*.def
diff --git a/distrib/msw/mac.rsp b/distrib/msw/mac.rsp
index 221db6050c..642e12f84e 100644
--- a/distrib/msw/mac.rsp
+++ b/distrib/msw/mac.rsp
@@ -6,7 +6,7 @@ docs/mac/*.hqx
 
 distrib/msw/*.rsp
 distrib/msw/*.bat
-distrib/mac/*
+distrib/mac/*-sh
 
 src/*.mcp
 src/jpeg/*.mcp
@@ -25,6 +25,11 @@ src/mac/*.c
 src/mac/*.r
 src/mac/*.h
 src/mac/*.lst
+src/mac/morefile/*.c
+src/mac/morefile/*.h
+src/mac/Info.plist.in
+src/mac/wxmac.icns
+src/macsock/sock_PPC.lib
 
 src/mac/cdef/*.h
 src/mac/cdef/*.c
diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 4d6dea5213..11ed284728 100644
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -21,6 +21,7 @@ samples/erase/Makefile.in
 samples/exec/Makefile.in
 samples/event/Makefile.in
 samples/grid/Makefile.in
+samples/keyboard/Makefile.in
 samples/newgrid/Makefile.in
 samples/help/Makefile.in
 samples/internat/Makefile.in
@@ -40,14 +41,20 @@ samples/html/zip/Makefile.in
 samples/image/Makefile.in
 samples/joytest/Makefile.in
 samples/layout/Makefile.in
+samples/listbox/Makefile.in
 samples/listctrl/Makefile.in
 samples/mdi/Makefile.in
 samples/minifram/Makefile.in
 samples/minimal/Makefile.in
+samples/mobile/Makefile.in
+samples/mobile/wxedit/Makefile.in
+samples/mobile/styles/Makefile.in
+samples/multimon/Makefile.in
 samples/notebook/Makefile.in
 samples/printing/Makefile.in
 samples/proplist/Makefile.in
 samples/propsize/Makefile.in
+samples/richedit/Makefile.in
 samples/rotate/Makefile.in
 samples/sashtest/Makefile.in
 samples/scroll/Makefile.in
@@ -89,6 +96,8 @@ utils/Makefile.in
 utils/hhp2cached/Makefile.in
 utils/emulator/Makefile.in
 utils/emulator/src/Makefile.in
+utils/helpview/Makefile.in
+utils/helpview/src/Makefile.in
 
 contrib/Makefile.in
 contrib/src/Makefile.in
diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index c39fb954f6..2131137b55 100644
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -7,6 +7,12 @@
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
+TAR=tar
+ARCH=`arch`
+if [ "$ARCH" = "ppc" ]; then
+  TAR=gnutar
+fi
+
 expandlines()
 {
     toexpand=$1
@@ -73,97 +79,208 @@ echo Tarring...
 ### Generic
 cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp > /tmp/wxgen_in.txt
 expandlines /tmp/wxgen_in.txt /tmp/wxgen.txt
-tar cvf $2/wxWindows-${WXVER}-gen.tar -T /tmp/wxgen.txt
+$TAR cf $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
-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_in.txt
+cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
 expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
-tar cvf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
+$TAR cf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
+
+echo Re-tarring wxGTK in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxGTK-${WXVER}.tar
+cd ..
+rm -f wxGTK-${WXVER}.tar
+$TAR cf $2/wxGTK-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
 gzip $2/wxGTK-${WXVER}.tar
 
 ### wxMotif
 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_in.txt
 expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
-tar cvf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
+$TAR cf $2/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
+
+echo Re-tarring wxMotif in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxMotif-${WXVER}.tar
+cd ..
+rm -f wxMotif-${WXVER}.tar
+$TAR cf $2/wxMotif-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
 gzip $2/wxMotif-${WXVER}.tar
 
 ### wxX11: combined wxMotif and wxX11 distributions
 cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/x11.rsp $1/distrib/msw/univ.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
 expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
-tar cvf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
+$TAR cf $2/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
+
+echo Re-tarring wxX11 in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxX11-${WXVER}.tar
+cd ..
+rm -f wxX11-${WXVER}.tar
+$TAR cf $2/wxX11-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
 gzip $2/wxX11-${WXVER}.tar
 
 ### wxMSW
 # 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_in.txt
 # expandlines /tmp/wxmsw_in.txt /tmp/wxmsw.txt
-# tar cvf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
+# $TAR cf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
 # gzip $2/wxMSW-${WXVER}.tar
 
 ### wxMac
-cat $1/distrib/msw/mac.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
-tar cvf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
+$TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
+
+echo Re-tarring wxMac in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxMac-${WXVER}.tar
+cd ..
+rm -f wxMac-${WXVER}.tar
+$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
 gzip $2/wxMac-${WXVER}.tar
 
 ### Doc sources
 cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
 expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
-tar cvf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+$TAR cf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+
+echo Re-tarring docs in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-doc.tar
+cd ..
+rm -f wxWindows-${WXVER}-doc.tar
+$TAR cf $2/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
 gzip $2/wxWindows-${WXVER}-doc.tar
 
 ### HTML docs
 cat $1/distrib/msw/wx_html.rsp > /tmp/html_in.txt
 expandlines /tmp/html_in.txt /tmp/html.txt
-tar cvf $2/wxWindows-${WXVER}-htm.tar -T /tmp/html.txt
-gzip $2/wxWindows-${WXVER}-htm.tar
+$TAR cf $2/wxWindows-${WXVER}-html.tar -T /tmp/html.txt
+
+echo Re-tarring HTML in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-html.tar
+cd ..
+rm -f wxWindows-${WXVER}-html.tar
+$TAR cf $2/wxWindows-${WXVER}-html.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-html.tar
 
 ### PDF docs
 cat $1/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
 expandlines /tmp/pdf_in.txt /tmp/pdf.txt
-tar cvf $2/wxWindows-${WXVER}-pdf.tar -T /tmp/pdf.txt
+$TAR cf $2/wxWindows-${WXVER}-pdf.tar -T /tmp/pdf.txt
+
+echo Re-tarring PDF in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-pdf.tar
+cd ..
+rm -f wxWindows-${WXVER}-pdf.tar
+$TAR cf $2/wxWindows-${WXVER}-pdf.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
 gzip $2/wxWindows-${WXVER}-pdf.tar
 
 ### Tex2RTF
 cat $1/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
 expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
-tar cvf $2/tex2rtf2-${WXVER}.tar -T /tmp/tex2rtf.txt
-gzip $2/tex2rtf2-${WXVER}.tar
+$TAR cf $2/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
+
+echo Re-tarring Tex2RTF in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
+cd ..
+rm -f wxWindows-${WXVER}-tex2rtf.tar
+$TAR cf $2/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-tex2rtf.tar
 
 ### OGL
 cat $1/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
 expandlines /tmp/ogl_in.txt /tmp/ogl.txt
-tar cvf $2/ogl3-${WXVER}.tar -T /tmp/ogl.txt
-gzip $2/ogl3-${WXVER}.tar
+$TAR cf $2/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
+
+echo Re-tarring OGL in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-ogl.tar
+cd ..
+rm -f wxWindows-${WXVER}-ogl.tar
+$TAR cf $2/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-ogl.tar
 
 ### JPEG
 cat $1/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
 expandlines /tmp/jpeg_in.txt /tmp/wxx11.txt
-tar cvf $2/jpeg-${WXVER}.tar -T /tmp/jpeg.txt
-gzip $2/jpeg-${WXVER}.tar
+$TAR cf $2/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
+
+echo Re-tarring docs in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-jpeg.tar
+cd ..
+rm -f wxWindows-${WXVER}-jpeg.tar
+$TAR cf $2/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-jpeg.tar
 
 ### TIFF
 cat $1/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
 expandlines /tmp/tiff_in.txt /tmp/tiff.txt
-tar cvf $2/tiff-${WXVER}.tar -T /tmp/tiff.txt
-gzip $2/tiff-${WXVER}.tar
+$TAR cf $2/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
+
+echo Re-tarring docs in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxWindows-${WXVER}-tiff.tar
+cd ..
+rm -f wxWindows-${WXVER}-tiff.tar
+$TAR cf $2/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxWindows-${WXVER}-tiff.tar
 
 # Copy readme and other files
 cp $1/docs/readme.txt $2/readme-${WXVER}.txt
 cp $1/docs/changes.txt $2/changes-${WXVER}.txt
-cp $1/docs/mgl/readme.txt $2/readme_mgl-${WXVER}.txt
-cp $1/docs/mgl/install.txt $2/install_mgl-${WXVER}.txt
-cp $1/docs/x11/readme.txt $2/readme_x11-${WXVER}.txt
-cp $1/docs/x11/readme-nanox.txt $2/readme_nanox-${WXVER}.txt
-cp $1/docs/x11/install.txt $2/install_x11-${WXVER}.txt
-cp $1/docs/motif/readme.txt $2/readme_motif-${WXVER}.txt
-cp $1/docs/motif/install.txt $2/install_motif-${WXVER}.txt
-cp $1/docs/msw/readme.txt $2/readme_msw-${WXVER}.txt
-cp $1/docs/msw/install.txt $2/install_msw-${WXVER}.txt
-cp $1/docs/gtk/readme.txt $2/readme_gtk-${WXVER}.txt
-cp $1/docs/gtk/install.txt $2/install_gtk-${WXVER}.txt
-cp $1/docs/mac/readme.txt $2/readme_mac-${WXVER}.txt
-cp $1/docs/mac/install.txt $2/install_mac-${WXVER}.txt
+cp $1/docs/mgl/readme.txt $2/readme-mgl-${WXVER}.txt
+cp $1/docs/mgl/install.txt $2/install-mgl-${WXVER}.txt
+cp $1/docs/x11/readme.txt $2/readme-x11-${WXVER}.txt
+cp $1/docs/x11/readme-nanox.txt $2/readme-nanox-${WXVER}.txt
+cp $1/docs/x11/install.txt $2/install-x11-${WXVER}.txt
+cp $1/docs/motif/readme.txt $2/readme-motif-${WXVER}.txt
+cp $1/docs/motif/install.txt $2/install-motif-${WXVER}.txt
+cp $1/docs/msw/readme.txt $2/readme-msw-${WXVER}.txt
+cp $1/docs/msw/install.txt $2/install-msw-${WXVER}.txt
+cp $1/docs/gtk/readme.txt $2/readme-gtk-${WXVER}.txt
+cp $1/docs/gtk/install.txt $2/install-gtk-${WXVER}.txt
+cp $1/docs/mac/readme.txt $2/readme-mac-${WXVER}.txt
+cp $1/docs/mac/install.txt $2/install-mac-${WXVER}.txt
+cp $1/docs/os2/install.txt $2/install-os2-${WXVER}.txt
 
 echo Done!
diff --git a/distrib/msw/tarwxmac b/distrib/msw/tarwxmac
new file mode 100755
index 0000000000..3c20d1ff0f
--- /dev/null
+++ b/distrib/msw/tarwxmac
@@ -0,0 +1,93 @@
+#!/bin/sh
+# tarwxmac: make up a tar.gz distribution of wxMac
+# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
+
+# We can't use e.g. this:
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
+# because there's not enough space on the command line, plus we need to ignore the
+# blank lines.
+
+TAR=tar
+ARCH=`arch`
+if [ "$ARCH" = "ppc" ]; then
+  TAR=gnutar
+fi
+
+expandlines()
+{
+    toexpand=$1
+    outputfile=$2
+
+    rm -f $outputfile
+    touch $outputfile
+    for line in `cat $toexpand` ; do
+      if [ "$line" != "" ]; then
+        ls $line >> $outputfile
+      fi
+    uniq < $outputfile > /tmp/uniqtemp.txt
+    mv /tmp/uniqtemp.txt $outputfile
+    done
+}
+
+
+init=""
+if [ "$1" = "" ]
+then
+  echo Usage: tardist wx-dir output-dir version
+  exit
+fi
+
+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 wxMac:
+echo   From   $1
+echo   To     $2
+echo CTRL-C if this is not correct.
+read dummy
+
+cd $1
+
+echo Removing backup files...
+rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
+
+rm -f $2/wxMac-${WXVER}*.tar.gz
+rm -f -r $2/wxMac-${WXVER}
+
+echo Tarring...
+
+### wxMac
+cat $1/distrib/msw/mac.rsp $1/distrib/msw/generic.rsp $1/distrib/msw/cw.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
+$TAR cf $2/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
+
+echo Re-tarring in a subdirectory...
+cd $2
+mkdir wxWindows-${WXVER}
+cd wxWindows-${WXVER}
+$TAR xf ../wxMac-${WXVER}.tar
+cd ..
+rm -f wxMac-${WXVER}.tar
+
+$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
+rm -f -r wxWindows-${WXVER}
+gzip $2/wxMac-${WXVER}.tar
+
+# Copy readme and other files
+cp $1/docs/readme.txt $2/readme-${WXVER}.txt
+cp $1/docs/changes.txt $2/changes-${WXVER}.txt
+cp $1/docs/mac/readme.txt $2/readme-mac-${WXVER}.txt
+cp $1/docs/mac/install.txt $2/install-mac-${WXVER}.txt
+
+echo Done!
diff --git a/distrib/msw/tex2rtf.rsp b/distrib/msw/tex2rtf.rsp
index 12a4e2cbff..3cfd568af1 100644
--- a/distrib/msw/tex2rtf.rsp
+++ b/distrib/msw/tex2rtf.rsp
@@ -23,7 +23,11 @@ utils/tex2rtf/src/*.ico
 utils/tex2rtf/src/*.def
 utils/tex2rtf/src/*.rc
 
-utils/tex2rtf/tools/*
+utils/tex2rtf/tools/*.1
+utils/tex2rtf/tools/*.exe
+utils/tex2rtf/tools/*.lex
+utils/tex2rtf/tools/*.rea
+utils/tex2rtf/tools/*.txt
 
 utils/tex2rtf/distrib/*.sh
 utils/tex2rtf/distrib/*.bat
diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index a6101aa83c..9b7e955f1d 100644
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -128,6 +128,9 @@ samples/joytest/joytest.dsw
 samples/layout/layout.dsp
 samples/layout/layout.dsw
 
+samples/listbox/lboxtest.dsp
+samples/listbox/lboxtest.dsw
+
 samples/listctrl/listctrl.dsp
 samples/listctrl/listctrl.dsw
 
@@ -150,6 +153,12 @@ samples/minimal/minimalUniv.dsp
 samples/minifram/minifram.dsp
 samples/minifram/minifram.dsw
 
+samples/mobile/styles/styles.dsp
+samples/mobile/wxedit/wxedit.dsw
+
+samples/multimon/multimon_test.dsp
+samples/multimon/multimon_test.dsw
+
 samples/nativdlg/nativdlg.dsp
 samples/nativdlg/nativdlg.dsw
 
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 697ea4bcac..cc387b7fb2 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -63,12 +63,29 @@ Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\wx_chm.rsp
 Rem zip32 -@ -u %dest\wxMSW-%version%.zip  < %src\distrib\msw\jpeg.rsp
 Rem zip32 -@ -u %dest\wxMSW-%version%.zip < %src\distrib\msw\tiff.rsp
 
+Rem Zip up the complete wxOS2-xxx.zip file
+zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\wx_chm.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip  < %src\distrib\msw\jpeg.rsp
+zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
+zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
+
 echo Zipping wxMac distribution
 zip32 -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp
+zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\utils.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\dialoged.rsp
 zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\ogl.rsp
@@ -140,26 +157,27 @@ zip32 -@ %dest\wxxrc-%version%.zip < %src\distrib\msw\xml.rsp
 zip32 -@ %dest\contrib-%version%.zip < %src\distrib\msw\contrib.rsp
 
 rem Dialog Editor source and binary
-erase %dest\dialoged_source.zip
-zip32 -@ %dest\dialoged_source.zip < %src\distrib\msw\dialoged.rsp
-zip32 -j %dest\dialoged-%version%.zip %dest\dialoged_source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
-erase %dest\dialoged_source.zip
+erase %dest\dialoged-source.zip
+zip32 -@ %dest\dialoged-source.zip < %src\distrib\msw\dialoged.rsp
+zip32 -j %dest\dialoged-%version%.zip %dest\dialoged-source.zip %src\bin\dialoged.exe %src\docs\winhelp\dialoged.hlp %src\docs\winhelp\dialoged.cnt
+erase %dest\dialoged-source.zip
 
 rem Misc. utils not in the main distribution
 zip32 -@ %dest\utils-%version%.zip < %src\distrib\msw\utils.rsp
 zip32 -@ -u %dest\utils-%version%.zip < %src\distrib\msw\utilmake.rsp
 
 copy %src\docs\changes.txt %dest\changes-%version%.txt
-copy %src\docs\msw\install.txt %dest\install_msw-%version%.txt
-copy %src\docs\mac\install.txt %dest\install_mac-%version%.txt
-copy %src\docs\motif\install.txt %dest\install_motif-%version%.txt
-copy %src\docs\gtk\install.txt %dest\install_gtk-%version%.txt
+copy %src\docs\msw\install.txt %dest\install-msw-%version%.txt
+copy %src\docs\mac\install.txt %dest\install-mac-%version%.txt
+copy %src\docs\motif\install.txt %dest\install-motif-%version%.txt
+copy %src\docs\gtk\install.txt %dest\install-gtk-%version%.txt
 copy %src\docs\readme.txt %dest\readme-%version%.txt
-copy %src\docs\motif\readme.txt %dest\readme_motif-%version%.txt
-copy %src\docs\gtk\readme.txt %dest\readme_gtk-%version%.txt
-copy %src\docs\msw\readme.txt %dest\readme_msw-%version%.txt
-copy %src\docs\mac\readme.txt %dest\readme_mac-%version%.txt
-copy %src\docs\readme_vms.txt %dest\readme_vms-%version%.txt
+copy %src\docs\motif\readme.txt %dest\readme-motif-%version%.txt
+copy %src\docs\gtk\readme.txt %dest\readme-gtk-%version%.txt
+copy %src\docs\msw\readme.txt %dest\readme-msw-%version%.txt
+copy %src\docs\mac\readme.txt %dest\readme-mac-%version%.txt
+copy %src\docs\os2\install.txt %dest\install-os2-%version%.txt
+copy %src\docs\readme_vms.txt %dest\readme-vms-%version%.txt
 copy %src\docs\motif\makewxmotif %dest\makewxmotif-%version%
 copy %src\docs\gtk\makewxgtk %dest\makewxgtk-%version%