]> git.saurik.com Git - wxWidgets.git/blobdiff - distrib/msw/tardist
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed outdated build files.
[wxWidgets.git] / distrib / msw / tardist
diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 64c3072b129ec76e9ccb059fa0483d67b1bde316..036ad350f51bff9bc9d96edf6c7f29396b8356b6 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -1,9 +1,9 @@
 #!/bin/sh
-# tardist: make up a tar.gz distribution of wxWindows 2
+# tardist: make up a tar.gz distribution of wxWidgets 2
 # 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
+# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
 # because there's not enough space on the command line, plus we need to ignore the
 # blank lines.
 
@@ -37,7 +37,6 @@ doinit()
 
   rm -f $WXDEST/wx*-${WXVER}*.tar.gz
   # Copy setup files
-  cp $WXSRC/include/wx/os2/SETUP0.H $WXSRC/include/wx/os2/setup.h
   cp $WXSRC/include/wx/msw/setup0.h $WXSRC/include/wx/msw/setup.h
   cp $WXSRC/include/wx/univ/setup0.h $WXSRC/include/wx/univ/setup.h
 
@@ -45,19 +44,29 @@ doinit()
 
   cp $WXSRC/docs/readme.txt $WXDEST/readme-${WXVER}.txt
   cp $WXSRC/docs/changes.txt $WXDEST/changes-${WXVER}.txt
+
   cp $WXSRC/docs/mgl/readme.txt $WXDEST/readme-mgl-${WXVER}.txt
   cp $WXSRC/docs/mgl/install.txt $WXDEST/install-mgl-${WXVER}.txt
+
   cp $WXSRC/docs/x11/readme.txt $WXDEST/readme-x11-${WXVER}.txt
-  cp $WXSRC/docs/x11/readme-nanox.txt $WXDEST/readme-nanox-${WXVER}.txt
+#  cp $WXSRC/docs/x11/readme-nanox.txt $WXDEST/readme-nanox-${WXVER}.txt
   cp $WXSRC/docs/x11/install.txt $WXDEST/install-x11-${WXVER}.txt
+
   cp $WXSRC/docs/motif/readme.txt $WXDEST/readme-motif-${WXVER}.txt
   cp $WXSRC/docs/motif/install.txt $WXDEST/install-motif-${WXVER}.txt
+
   cp $WXSRC/docs/msw/readme.txt $WXDEST/readme-msw-${WXVER}.txt
   cp $WXSRC/docs/msw/install.txt $WXDEST/install-msw-${WXVER}.txt
+
   cp $WXSRC/docs/gtk/readme.txt $WXDEST/readme-gtk-${WXVER}.txt
   cp $WXSRC/docs/gtk/install.txt $WXDEST/install-gtk-${WXVER}.txt
+
   cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
   cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
+
+  cp $WXSRC/docs/cocoa/readme.txt $WXDEST/readme-cocoa-${WXVER}.txt
+  cp $WXSRC/docs/cocoa/install.txt $WXDEST/install-cocoa-${WXVER}.txt
+
   cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
 
   # Make .mo files
@@ -70,7 +79,7 @@ dospinwxgtk()
 echo Tarring wxGTK...
 
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
 expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
 $TAR cf $WXDEST/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
 
@@ -79,6 +88,13 @@ cd $WXDEST
 mkdir wxGTK-${WXVER}
 cd wxGTK-${WXVER}
 $TAR xf ../wxGTK-${WXVER}.tar
+echo Copying readme files...
+cp $WXSRC/docs/gtk/readme.txt README-GTK.txt
+cp $WXSRC/docs/gtk/install.txt INSTALL-GTK.txt
+cp $WXSRC/docs/readme.txt README.txt
+cp $WXSRC/docs/changes.txt CHANGES.txt
+cp $WXSRC/docs/licence.txt LICENCE.txt
+cp $WXSRC/docs/lgpl.txt COPYING.LIB
 cd ..
 rm -f wxGTK-${WXVER}.tar
 $TAR cf $WXDEST/wxGTK-${WXVER}.tar wxGTK-${WXVER}/*
@@ -91,7 +107,7 @@ dospinwxmotif()
 echo Tarring wxMotif...
 
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.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 > /tmp/wxmotif_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.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 > /tmp/wxmotif_in.txt
 expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
 $TAR cf $WXDEST/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
 
@@ -100,6 +116,13 @@ cd $WXDEST
 mkdir wxMotif-${WXVER}
 cd wxMotif-${WXVER}
 $TAR xf ../wxMotif-${WXVER}.tar
+echo Copying readme files...
+cp $WXSRC/docs/motif/readme.txt README-MOTIF.txt
+cp $WXSRC/docs/motif/install.txt INSTALL-MOTIF.txt
+cp $WXSRC/docs/readme.txt README.txt
+cp $WXSRC/docs/changes.txt CHANGES.txt
+cp $WXSRC/docs/licence.txt LICENCE.txt
+cp $WXSRC/docs/lgpl.txt COPYING.LIB
 cd ..
 rm -f wxMotif-${WXVER}.tar
 $TAR cf $WXDEST/wxMotif-${WXVER}.tar wxMotif-${WXVER}/*
@@ -113,7 +136,7 @@ echo Tarring wxX11...
 
 ### wxX11: combined wxMotif and wxX11 distributions
 cd $WXSRC
-cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
+cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/utils.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 > /tmp/wxx11_in.txt
 expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
 $TAR cf $WXDEST/wxX11-${WXVER}.tar -T /tmp/wxx11.txt
 
@@ -122,6 +145,15 @@ cd $WXDEST
 mkdir wxX11-${WXVER}
 cd wxX11-${WXVER}
 $TAR xf ../wxX11-${WXVER}.tar
+echo Copying readme files...
+cp $WXSRC/docs/motif/readme.txt README-MOTIF.txt
+cp $WXSRC/docs/motif/install.txt INSTALL-MOTIF.txt
+cp $WXSRC/docs/x11/readme.txt README-X11.txt
+cp $WXSRC/docs/x11/install.txt INSTALL-X11.txt
+cp $WXSRC/docs/readme.txt README.txt
+cp $WXSRC/docs/changes.txt CHANGES.txt
+cp $WXSRC/docs/licence.txt LICENCE.txt
+cp $WXSRC/docs/lgpl.txt COPYING.LIB
 cd ..
 rm -f wxX11-${WXVER}.tar
 $TAR cf $WXDEST/wxX11-${WXVER}.tar wxX11-${WXVER}/*
@@ -131,7 +163,7 @@ gzip $WXDEST/wxX11-${WXVER}.tar
 
 ### wxMSW
 # cd $WXSRC
-# cat $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/bc.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmsw_in.txt
+# cat $WXSRC/distrib/msw/msw.rsp $WXSRC/distrib/msw/vc.rsp $WXSRC/distrib/msw/bc.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmsw_in.txt
 # expandlines /tmp/wxmsw_in.txt /tmp/wxmsw.txt
 # $TAR cf $WXDEST/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
 # gzip $WXDEST/wxMSW-${WXVER}.tar
@@ -141,8 +173,9 @@ dospinwxmac()
 echo Tarring wxMac...
 ### wxMac
 cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/setup.h
+cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/mac/setup.h
 cd $WXSRC
-cat $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
+cat $WXSRC/distrib/msw/mac.rsp $WXSRC/distrib/msw/cocoa.rsp $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/cw_mac.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/deprecated.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
 $TAR cf $WXDEST/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
@@ -155,14 +188,21 @@ cd wxMac-${WXVER}
 
 # If we have the full set of Mac CW project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
 $TAR xf ../wxMac-${WXVER}.tar
 rm -f -r contrib/src/mmedia contrib/samples/mmedia
+echo Copying readme files...
+cp $WXSRC/docs/mac/readme.txt README-MAC.txt
+cp $WXSRC/docs/mac/install.txt INSTALL-MAC.txt
+cp $WXSRC/docs/readme.txt README.txt
+cp $WXSRC/docs/changes.txt CHANGES.txt
+cp $WXSRC/docs/licence.txt LICENCE.txt
+cp $WXSRC/docs/lgpl.txt COPYING.LIB
 cd ..
 rm -f wxMac-${WXVER}.tar
 $TAR cf $WXDEST/wxMac-${WXVER}.tar wxMac-${WXVER}/*
@@ -174,18 +214,18 @@ gzip $WXDEST/wxMac-${WXVER}.tar
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
 #expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
 #
 #echo Re-tarring wxUniversal in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-Univ.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-Univ.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-Univ.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-Univ.tar
+#rm -f wxWidgets-${WXVER}-Univ.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-Univ.tar
 
 dospinwxall()
 {
@@ -193,197 +233,244 @@ 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/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/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/dialoged.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/palmos.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
+$TAR cf $WXDEST/wxWidgets-${WXVER}.tar -T /tmp/wxall.txt
 
 echo Re-tarring wxAll in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
+mkdir wxWidgets-${WXVER}
 
-cd wxWindows-${WXVER}
+cd wxWidgets-${WXVER}
 
 # If we have the full set of VC++ project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-VC.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-VC.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-VC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-VC.zip
+else
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-VC.zip"
+fi
+
+# If we have the full set of eVC++ project files,
+# get them
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-eVC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-eVC.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-VC.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-eVC.zip"
+fi
+
+# If we have the full set of DMC project files,
+# get them
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-DMC.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-DMC.zip
+else
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-DMC.zip"
 fi
 
 # If we have the full set of Mac CW project files,
 # get them
-if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
-  unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
+if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
+  unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
 else
-  echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
+  echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
 fi
 
-$TAR xf ../wxAll-${WXVER}.tar
+$TAR xf ../wxWidgets-${WXVER}.tar
 
 # Translate all .dsp and .dsw files to DOS format
 unix2dos --unix2dos `cat $WXSRC/distrib/msw/vc.rsp`
 
-# Copy OS/2 specific configure files
-cp $WXSRC/distrib/os2/os2-specific.zip docs/os2
+echo Copying readme files...
+cp $WXSRC/docs/readme.txt README.txt
+cp $WXSRC/docs/changes.txt CHANGES.txt
+cp $WXSRC/docs/licence.txt LICENCE.txt
+cp $WXSRC/docs/lgpl.txt COPYING.LIB
+cp $WXSRC/docs/motif/readme.txt README-MOTIF.txt
+cp $WXSRC/docs/motif/install.txt INSTALL-MOTIF.txt
+cp $WXSRC/docs/x11/readme.txt README-X11.txt
+cp $WXSRC/docs/x11/install.txt INSTALL-X11.txt
+cp $WXSRC/docs/mac/readme.txt README-MAC.txt
+cp $WXSRC/docs/mac/install.txt INSTALL-MAC.txt
+cp $WXSRC/docs/mgl/readme.txt README-MGL.txt
+cp $WXSRC/docs/mgl/install.txt INSTALL-MGL.txt
+cp $WXSRC/docs/palmos/readme.txt README-PALMOS.txt
+#cp $WXSRC/docs/os2/readme.txt README-OS2.txt
+cp $WXSRC/docs/os2/install.txt INSTALL-OS2.txt
+
+cd ..
+rm -f wxWidgets-${WXVER}.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip -c $WXDEST/wxWidgets-${WXVER}.tar > $WXDEST/wxWidgets-${WXVER}.tar.gz
+bzip2 $WXDEST/wxWidgets-${WXVER}.tar
+}
+
+domakedocs()
+{
+  mkdir -p $WXSRC/docs/html/wx
+  mkdir -p $WXSRC/docs/html/tex2rtf
+  mkdir -p $WXSRC/docs/html/fl
+  mkdir -p $WXSRC/docs/html/ogl
+  mkdir -p $WXSRC/docs/htb
+
+  rm -f -r $WXSRC/docs/html/wx/*.htm*
+  rm -f -r $WXSRC/docs/htb/wx.htb
 
-# Copy the OS/2 files which probably haven't been copied yet
-mkdir include/wx/os2
-mkdir src/os2
-cp $WXSRC/include/wx/os2/*.H include/wx/os2
-cp $WXSRC/src/os2/*.CPP $WXSRC/src/os2/*.I src/os2
+  echo Making HTML wxWidgets manual...
+  cd $WXSRC/docs/latex/wx
+  cp *.gif $WXSRC/docs/html/wx
+  tex2rtf manual.tex $WXSRC/docs/html/wx/wx.htm -twice -html
 
-# Make all OS/2 files lower case
-$WXSRC/distrib/msw/namedown include/wx/os2/*.H
-$WXSRC/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
+  echo Making HTB wxWidgets manual...
+  cd $WXSRC/docs/html/wx
+  zip -q $WXSRC/docs/htb/wx.htb *.html *.gif *.hhp *.hhc *.hhk
 
-cd ..
-rm -f wxAll-${WXVER}.tar
-$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxAll-${WXVER}.tar
+  echo Done making manuals.
 }
 
 dospinwxdocs()
 {
+  # First make the docs
+  domakedocs
+
 echo Tarring wxDocs...
 
 ### Doc sources
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
 #expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar -T /tmp/docsrc.txt
 #
 #echo Re-tarring docs in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-doc.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-doc.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-doc.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-doc.tar
+#rm -f wxWidgets-${WXVER}-doc.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-doc.tar
 
 ### HTML docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_html.rsp > /tmp/html_in.txt
 expandlines /tmp/html_in.txt /tmp/html.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
 
 echo Re-tarring HTML in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTML.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-HTML.tar
 cd ..
-rm -f wxWindows-${WXVER}-HTML.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTML.tar
+rm -f wxWidgets-${WXVER}-HTML.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-HTML.tar
 
 ### HTB docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
 expandlines /tmp/htb_in.txt /tmp/htb.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
 
 echo Re-tarring HTB in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-HTB.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-HTB.tar
 cd ..
-rm -f wxWindows-${WXVER}-HTB.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-HTB.tar
+rm -f wxWidgets-${WXVER}-HTB.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-HTB.tar
 
 ### PDF docs
 cd $WXSRC
 cat $WXSRC/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
 expandlines /tmp/pdf_in.txt /tmp/pdf.txt
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
+$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
 
 echo Re-tarring PDF in a subdirectory...
 cd $WXDEST
-mkdir wxWindows-${WXVER}
-cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-PDF.tar
+mkdir wxWidgets-${WXVER}
+cd wxWidgets-${WXVER}
+$TAR xf ../wxWidgets-${WXVER}-PDF.tar
 cd ..
-rm -f wxWindows-${WXVER}-PDF.tar
-$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
-rm -f -r wxWindows-${WXVER}
-gzip $WXDEST/wxWindows-${WXVER}-PDF.tar
+rm -f wxWidgets-${WXVER}-PDF.tar
+$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar wxWidgets-${WXVER}/*
+rm -f -r wxWidgets-${WXVER}
+gzip $WXDEST/wxWidgets-${WXVER}-PDF.tar
 }
 
 ### Tex2RTF
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
 #expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
 #
 #echo Re-tarring Tex2RTF in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-tex2rtf.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-tex2rtf.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tex2rtf.tar
+#rm -f wxWidgets-${WXVER}-tex2rtf.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar
 
 ### OGL
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
 #expandlines /tmp/ogl_in.txt /tmp/ogl.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar -T /tmp/ogl.txt
 #
 #echo Re-tarring OGL in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-ogl.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-ogl.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-ogl.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-ogl.tar
+#rm -f wxWidgets-${WXVER}-ogl.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-ogl.tar
 
 ### JPEG
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
 #expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
 #
 #echo Re-tarring jpeg in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-jpeg.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-jpeg.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-jpeg.tar
+#rm -f wxWidgets-${WXVER}-jpeg.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-jpeg.tar
 
 ### TIFF
 #cd $WXSRC
 #cat $WXSRC/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
 #expandlines /tmp/tiff_in.txt /tmp/tiff.txt
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar -T /tmp/tiff.txt
 #
 #echo Re-tarring docs in a subdirectory...
 #cd $WXDEST
-#mkdir wxWindows-${WXVER}
-#cd wxWindows-${WXVER}
-#$TAR xf ../wxWindows-${WXVER}-tiff.tar
+#mkdir wxWidgets-${WXVER}
+#cd wxWidgets-${WXVER}
+#$TAR xf ../wxWidgets-${WXVER}-tiff.tar
 #cd ..
-#rm -f wxWindows-${WXVER}-tiff.tar
-#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
-#rm -f -r wxWindows-${WXVER}
-#gzip $WXDEST/wxWindows-${WXVER}-tiff.tar
+#rm -f wxWidgets-${WXVER}-tiff.tar
+#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar wxWidgets-${WXVER}/*
+#rm -f -r wxWidgets-${WXVER}
+#gzip $WXDEST/wxWidgets-${WXVER}-tiff.tar
 
 init=""
 if [ "$1" = "" ]
@@ -451,7 +538,7 @@ for i in "$@"; do
     esac
 done
 
-echo About to archive wxWindows:
+echo About to archive wxWidgets:
 echo   From    $WXSRC
 echo   To      $WXDEST
 echo   Version $WXVER
wxWidgets (Impactor)