X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a82c9ecc9a2cba9727b538c818ebdba243eacbc..92a7272fdb8da914f8604c2b66a72a595b09ca77:/distrib/msw/makesetup.sh

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index baf0d1b945..99e1d3ce4c 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
 
@@ -123,17 +123,24 @@ dospinos2()
     mkdir $DESTDIR/wxWindows-$VERSION
     cd $DESTDIR/wxWindows-$VERSION
     unzip $ZIPFLAGS ../wxOS2-$VERSION.zip
-    # No longer do this, configure should be OK (maybe)
+    # No longer do this, configure should be OK
     # echo Overwriting with OS2-specific versions of configure files...
     # 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...
+    # echo Making OS/2 files lower case...
+    # no longer necessary
+    # $SCRIPTDIR/namedown include/wx/os2/*.H
+    # $SCRIPTDIR/namedown src/os2/*.CPP src/os2/*.I
 
-    $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
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README.txt
 
     cd $DESTDIR
 
@@ -175,7 +182,15 @@ 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
+    cp $APPDIR/docs/mac/install.txt INSTALL-MAC.txt
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README.txt
 
     cd $DESTDIR
 
@@ -205,10 +220,31 @@ dospinmsw()
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
 
-    rearchive wxWindows-$VERSION-win.zip wxWindows-$VERSION $DESTDIR
+#    rearchive wxWindows-$VERSION-win.zip wxWindows-$VERSION $DESTDIR
+
+    if [ -d $DESTDIR/wxWindows-$VERSION ]; then
+        rm -f -r $DESTDIR/wxWindows-$VERSION
+    fi
+
+    mkdir $DESTDIR/wxWindows-$VERSION
+    cd $DESTDIR/wxWindows-$VERSION
+    unzip $ZIPFLAGS ../wxWindows-$VERSION-win.zip
 
     echo Removing .mms files
-    zip $ZIPFLAGS -d $DESTDIR/wxWindows-$VERSION-win.zip wxWindows-$VERSION/src/gtk/descrip.mms wxWindows-$VERSION/src/motif/descrip.mms
+    rm -f src/gtk/descrip.mms src/motif/descrip.mms
+
+    echo Copying readme files...
+    cp $APPDIR/docs/msw/readme.txt README-MSW.txt
+    cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
+    cp $APPDIR/docs/licence.txt LICENCE.txt
+    cp $APPDIR/docs/lgpl.txt COPYING.LIB
+    cp $APPDIR/docs/changes.txt CHANGES.txt
+    cp $APPDIR/docs/readme.txt README.txt
+
+    cd $DESTDIR
+
+    rm -f wxWindows-$VERSION-win.zip
+    zip $ZIPFLAGS -r wxWindows-$VERSION-win.zip wxWindows-$VERSION/*
 }
 
 dospindocs()
@@ -311,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
 
@@ -319,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
@@ -534,6 +563,9 @@ makesetup()
     cp $APPDIR/docs/motif/install.txt $DESTDIR/install-motif-$VERSION.txt
     cp $APPDIR/docs/gtk/install.txt $DESTDIR/install-gtk-$VERSION.txt
     cp $APPDIR/docs/x11/install.txt $DESTDIR/install-x11-$VERSION.txt
+    cp $APPDIR/docs/mgl/readme.txt $DESTDIR/readme-mgl-$VERSION.txt
+    cp $APPDIR/docs/mgl/install.txt $DESTDIR/install-mgl-$VERSION.txt
+
     cp $APPDIR/docs/readme.txt $DESTDIR/readme-$VERSION.txt
     cp $APPDIR/docs/motif/readme.txt $DESTDIR/readme-motif-$VERSION.txt
     cp $APPDIR/docs/gtk/readme.txt $DESTDIR/readme-gtk-$VERSION.txt
@@ -590,6 +622,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