DMC fix.

[wxWidgets.git] / distrib / msw / zipdist.sh

diff --git a/distrib/msw/zipdist.sh b/distrib/msw/zipdist.sh
index c42540df08dffcb2e8a0caf32b0168cc657028e1..727f464272d5691184d468f11ad4d408e670b580 100644 (file)
--- a/distrib/msw/zipdist.sh
+++ b/distrib/msw/zipdist.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Zip up an external, generic + Windows distribution of wxWindows 2
+# Zip up an external, generic + Windows distribution of wxWidgets 2
 SRC=`cygpath -u $WXWIN`
 DEST=$SRC/deliver
 WISE=0
@@ -22,16 +22,16 @@ dowise()
 
     # After this change of directory, we're in the
     # temporary 'wx' directory and not acting on
-    # the source wxWindows directory.
+    # the source wxWidgets directory.
     cd $DEST/wx
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-msw.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-gen.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-vc.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-bc.zip`
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-HTMLHelp.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-msw.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-gen.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-vc.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-bc.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-HTMLHelp.zip`
     unzip -o `$CYGPATHPROG -w ../extradoc.zip`
     # Need Word file, for Remstar DB classes
-    unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-Word.zip`
+    unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-Word.zip`
     unzip -o `$CYGPATHPROG -w ../ogl3.zip`
     unzip -o `$CYGPATHPROG -w ../jpeg.zip`
     unzip -o `$CYGPATHPROG -w ../tiff.zip`
@@ -55,11 +55,9 @@ dowise()
 
     # Now copy some binary files to 'bin'
     mkdir bin
-    cp $SRC/bin/dialoged.exe bin
     cp $SRC/bin/tex2rtf.exe bin
     cp $SRC/bin/dbgview.* bin
     cp $SRC/bin/life.exe bin
-    cp $SRC/docs/winhelp/dialoged.hlp $SRC/docs/winhelp/dialoged.cnt bin
     cp $SRC/docs/winhelp/tex2rtf.hlp $SRC/docs/winhelp/tex2rtf.cnt bin
 
     # Make wxMSW-xxx.zip
@@ -77,7 +75,7 @@ dowise()
     # Now invoke WISE install on the new wxwin2.wse
     echo Invoking WISE...
     /c/progra~1/wise/wise32.exe /C $WXWIN\\distrib\\msw\\wxwin2.wse
-    echo Press return to continue with the wxWindows distribution...
+    echo Press return to continue with the wxWidgets distribution...
     read dummy
 
     cd $DEST
@@ -169,7 +167,6 @@ rm -f  $DEST/ogl3.zip
 rm -f  $DEST/tex2rtf2.zip
 rm -f  $DEST/jpeg.zip
 rm -f  $DEST/tiff.zip
-rm -f  $DEST/dialoged.zip
 rm -f  $DEST/utils.zip
 rm -f  $DEST/extradoc.zip
 rm -f  $DEST/*-win32.zip
@@ -186,58 +183,58 @@ echo Zipping...
 # for local use, and for creating wxMSW-xxx.zip.
 
 # 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.
 
 expandlines $SRC/distrib/msw/generic.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/msw.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/gtk.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/stubs.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-stubs.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-stubs.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/motif.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/makefile.rsp temp.txt
-zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
+zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
 
 
 expandlines $SRC/distrib/msw/docsrc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-DocSource.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-DocSource.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_hlp.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-WinHelp.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-WinHelp.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_pdf.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-PDF.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-PDF.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_word.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-Word.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-Word.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_htb.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTB.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTB.zip` < temp.txt
 
 expandlines $SRC/distrib/msw/wx_chm.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTMLHelp.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTMLHelp.zip` < temp.txt
 
 # PDF/HTML docs that should go into the Windows setup because
 # there are no WinHelp equivalents
@@ -246,15 +243,15 @@ zip -@ `$CYGPATHPROG -w $DEST/extradoc.zip` < temp.txt
 
 # VC++ project files
 expandlines $SRC/distrib/msw/vc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-vc.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-vc.zip` < temp.txt
 
 # BC++ project files
 expandlines $SRC/distrib/msw/bc.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-bc.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-bc.zip` < temp.txt
 
 # CodeWarrior project files
 expandlines $SRC/distrib/msw/cw.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-cw.zip` < temp.txt
+zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-cw.zip` < temp.txt
 
 # OGL 3
 expandlines $SRC/distrib/msw/ogl.rsp temp.txt
@@ -280,13 +277,6 @@ zip -@ `$CYGPATHPROG -w $DEST/jpeg.zip` < temp.txt
 expandlines $SRC/distrib/msw/tiff.rsp temp.txt
 zip -@ `$CYGPATHPROG -w $DEST/tiff.zip` < temp.txt
 
-# Dialog Editor source and binary
-rm -f  $DEST/dialoged_source.zip
-expandlines $SRC/distrib/msw/dialoged.rsp temp.txt
-zip -@ `$CYGPATHPROG -w $DEST/dialoged_source.zip` < temp.txt
-zip -j `$CYGPATHPROG -w $DEST/dialoged.zip` $DEST/dialoged_source.zip $SRC/bin/dialoged.exe $SRC/docs/winhelp/dialoged.hlp $SRC/docs/winhelp/dialoged.cnt
-rm -f  $DEST/dialoged_source.zip
-
 # Misc. utils not in the main distribution
 expandlines $SRC/distrib/msw/utils.rsp temp.txt
 zip -@ `$CYGPATHPROG -w $DEST/utils.zip` < temp.txt
@@ -295,11 +285,8 @@ zip -@ -u `$CYGPATHPROG -w $DEST/utilmake.zip` < temp.txt
 
 rm -f temp.txt
 
-# Make dialoged-win32.zip and tex2rtf-win32.zip
-
 cd $SRC/bin
 
-zip `$CYGPATHPROG -w $DEST/dialoged-win32.zip` dialoged.*
 zip `$CYGPATHPROG -w $DEST/tex2rtf-win32.zip` tex2rtf.*
 
 cp $SRC/docs/changes.txt $DEST
@@ -319,5 +306,5 @@ if [ "$WISE" = "1" ]; then
     dowise
 fi
 
-echo wxWindows archived.
+echo wxWidgets archived.