rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
rm -f $2/wx*-${WXVER}*.tar.gz
-rm -f $2/tex2rtf2-*.tar.gz
-rm -f $2/dialoged-*.tar.gz
-rm -f $2/ogl3-*.tar.gz
-rm -f $2/jpeg-*.tar.gz
-rm -f $2/tiff-*.tar.gz
-rm -f $2/stc-*.tar.gz
-rm -f $2/canvas-*.tar.gz
-rm -f $2/contrib-*.tar.gz
-rm -f $2/applet-*.tar.gz
-rm -f $2/wxxrc-*.tar.gz
+
+# Copy setup files
+cp $1/include/wx/os2/setup0.h $1/include/wx/os2/setup.h
+cp $1/include/wx/msw/setup0.h $1/include/wx/msw/setup.h
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 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
+#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 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
+cd $1
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 cf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
# gzip $2/wxMSW-${WXVER}.tar
### wxMac
+cp $1/include/wx/mac/setup0.h $1/include/wx/setup.h
cd $1
-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/stc.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_mac.rsp $1/distrib/msw/tex2rtf.rsp $1/distrib/msw/utils.rsp $1/distrib/msw/dialoged.rsp $1/distrib/msw/ogl.rsp $1/distrib/msw/stc.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
+rm -f $1/include/wx/setup.h
+
echo Re-tarring wxMac in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxMac-${WXVER}.tar
+rm -f -r contrib/src/mmedia contrib/samples/mmedia
cd ..
rm -f wxMac-${WXVER}.tar
$TAR cf $2/wxMac-${WXVER}.tar wxWindows-${WXVER}/*
gzip $2/wxMac-${WXVER}.tar
### Doc sources
+#cd $1
+#cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
+#expandlines /tmp/docsrc_in.txt /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
cd $1
-cat $1/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
-expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
-$TAR cf $2/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
+cat $1/distrib/msw/wx_html.rsp > /tmp/html_in.txt
+expandlines /tmp/html_in.txt /tmp/html.txt
+$TAR cf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
-echo Re-tarring docs in a subdirectory...
+echo Re-tarring HTML in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-doc.tar
+$TAR xf ../wxWindows-${WXVER}-HTML.tar
cd ..
-rm -f wxWindows-${WXVER}-doc.tar
-$TAR cf $2/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
+rm -f wxWindows-${WXVER}-HTML.tar
+$TAR cf $2/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
-gzip $2/wxWindows-${WXVER}-doc.tar
+gzip $2/wxWindows-${WXVER}-HTML.tar
-### HTML docs
+### HTB docs
cd $1
-cat $1/distrib/msw/wx_html.rsp > /tmp/html_in.txt
-expandlines /tmp/html_in.txt /tmp/html.txt
-$TAR cf $2/wxWindows-${WXVER}-html.tar -T /tmp/html.txt
+cat $1/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
+expandlines /tmp/htb_in.txt /tmp/htb.txt
+$TAR cf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
-echo Re-tarring HTML in a subdirectory...
+echo Re-tarring HTB in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
-$TAR xf ../wxWindows-${WXVER}-html.tar
+$TAR xf ../wxWindows-${WXVER}-HTB.tar
cd ..
-rm -f wxWindows-${WXVER}-html.tar
-$TAR cf $2/wxWindows-${WXVER}-html.tar wxWindows-${WXVER}/*
+rm -f wxWindows-${WXVER}-HTB.tar
+$TAR cf $2/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
-gzip $2/wxWindows-${WXVER}-html.tar
+gzip $2/wxWindows-${WXVER}-HTB.tar
### PDF docs
cd $1
cat $1/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
expandlines /tmp/pdf_in.txt /tmp/pdf.txt
-$TAR cf $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
+$TAR xf ../wxWindows-${WXVER}-PDF.tar
cd ..
-rm -f wxWindows-${WXVER}-pdf.tar
-$TAR cf $2/wxWindows-${WXVER}-pdf.tar wxWindows-${WXVER}/*
+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
+gzip $2/wxWindows-${WXVER}-PDF.tar
### Tex2RTF
-cd $1
-cat $1/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
-expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
-$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
+#cd $1
+#cat $1/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
+#expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
+#$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
-cd $1
-cat $1/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
-expandlines /tmp/ogl_in.txt /tmp/ogl.txt
-$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
+#cd $1
+#cat $1/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
+#expandlines /tmp/ogl_in.txt /tmp/ogl.txt
+#$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
-cd $1
-cat $1/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
-expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
-$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
+#cd $1
+#cat $1/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
+#expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
+#$TAR cf $2/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
+#
+#echo Re-tarring jpeg 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
-cd $1
-cat $1/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
-expandlines /tmp/tiff_in.txt /tmp/tiff.txt
-$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
+#cd $1
+#cat $1/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
+#expandlines /tmp/tiff_in.txt /tmp/tiff.txt
+#$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
cd $1