X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71da8cffa1ab9e3f745cbcdebfeeda9ddb679027..c6f73d05ccfcb08fc5d245ba49b73d8e0cd43d4d:/distrib/msw/makesetup.sh

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 8578fdc013..1ed0730ba3 100644
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -2,7 +2,7 @@
 
 # Make a distribution of an application on MSW.
 # Example:
-# ../distrib/msw/makesetup.sh --wxmsw --verbose 2>&1 | cat > log
+# ../distrib/msw/makesetup.sh --wxmsw --verbose &> | cat > log
 
 # If your zip accepts Cygwin-style paths, then
 # use cygpath, else substitute echo
@@ -22,7 +22,7 @@ PROGNAME=$0
 SCRIPTDIR=$WXWIN/distrib/msw
 WEBFILES=c:/wx2dev/wxWebSite
 # Set this to the required version
-VERSION=2.5.0
+VERSION=2.5.1
 
 . $SCRIPTDIR/setup.var
 
@@ -128,12 +128,12 @@ dospinos2()
     # unzip $ZIPFLAGS -o $APPDIR/distrib/os2/os2-specific.zip
     rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
     rm -f src/tiff/*.mcp src/jpeg/*.mcp src/png/*.mcp src/zlib/*.mcp
-    rm -f -r docs/html/dialoged docs/html/tex2rtf
+    rm -f -r docs/html/tex2rtf
 
-    echo Making OS/2 files lower case...
-
-    $SCRIPTDIR/namedown include/wx/os2/*.H
-    $SCRIPTDIR/namedown src/os2/*.CPP src/os2/*.I
+    # echo Making OS/2 files lower case...
+    # no longer necessary
+    # $SCRIPTDIR/namedown include/wx/os2/*.H
+    # $SCRIPTDIR/namedown src/os2/*.CPP src/os2/*.I
 
     echo Copying readme files...
     cp $APPDIR/docs/os2/install.txt INSTALL-OS2.txt
@@ -182,7 +182,7 @@ dospinmac()
     cd $DESTDIR/wxWindows-$VERSION
     unzip $ZIPFLAGS ../wxMac-$VERSION.zip
     rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
-    rm -f -r docs/html/dialoged docs/html/tex2rtf docs/htmlhelp
+    rm -f -r docs/html/tex2rtf docs/htmlhelp
 
     echo Copying readme files...
     cp $APPDIR/docs/mac/readme.txt README-MAC.txt
@@ -347,7 +347,7 @@ dospinsetup()
     rm -f docs/html/wxbook.htm docs/html/roadmap.htm
     rm -f -r contrib/docs/latex/ogl
     rm -f src/mingegcs.bat
-    rm -f distrib
+    rm -f -r distrib
     rm -f *.spec
     rm -f -r contrib/utils/wxrcedit
 
@@ -355,18 +355,11 @@ dospinsetup()
     if [ ! -d bin ]; then
         mkdir bin
     fi
-    #cp $APPDIR/bin/dialoged.exe bin
-    #cp $APPDIR/bin/dialoged.hlp bin
-    #cp $APPDIR/bin/dialoged.chm bin
     cp $APPDIR/bin/tex2rtf.exe bin
-    cp $APPDIR/bin/tex2rtf.hlp bin
-    cp $APPDIR/bin/tex2rtf.cnt bin
+    cp $APPDIR/bin/tex2rtf.chm bin
     cp $APPDIR/bin/widgets.exe bin
-    cp $APPDIR/bin/widgets.exe.manifest bin
     cp $APPDIR/bin/life.exe bin
-    cp $APPDIR/bin/life.exe.manifest bin
     cp $APPDIR/demos/life/breeder.lif bin
-    #cp $APPDIR/docs/htmlhelp/dialoged.chm bin
     cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin
 
     if [ ! -d docs/pdf ]; then
@@ -626,6 +619,7 @@ usage()
     echo "    --wxos2           Build wxOS2 distribution"
     echo "    --docs            Build docs archives"
     echo "    --all             Build all distributions (the default)"
+    echo "    --verbose         Verbose zip operation"
     echo.
     echo Note that options only override settings in $SCRIPTDIR/setup.var.
     exit 1