Script updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/dmc.rsp b/distrib/msw/dmc.rsp
index 20759932c6e99696f72b6596d1c05a80f306c31e..15286c3d3b1d0c1108b81ce6d667fce88ac6d41b 100644 (file)
--- a/distrib/msw/dmc.rsp
+++ b/distrib/msw/dmc.rsp
@@ -140,5 +140,4 @@ utils/hhp2cached/makefile.dmc
 utils/makefile.dmc
 utils/tex2rtf/src/makefile.dmc
 utils/wxrc/makefile.dmc
-contrib/utils/wxrcedit/makefile.dmc
 

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 824e0585de42b42c6524689deaec016a1213832d..686ebbfc521b98b52db1fe88fd15168dc51a3a63 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -124,7 +124,7 @@ findversion()
 dospinos2()
 {
     cd $APPDIR
-    echo Zipping OS/2
+    echo Zipping OS/2...
 
     # Zip up the complete wxOS2-xxx.zip file
     zip $ZIPFLAGS -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/generic.rsp
@@ -176,6 +176,7 @@ dospinos2()
 
 dospinmac()
 {
+    echo Spinning wxMac...
     cd $APPDIR
 
     echo Zipping wxMac distribution
@@ -227,6 +228,7 @@ dospinmac()
 
 dospinmsw()
 {
+    echo Zipping wxMSW...
     cd $APPDIR
 
     # Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
@@ -248,12 +250,12 @@ dospinmsw()
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
     zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/wince.rsp
-    zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/dmc.rsp
 
 }
 
 dospinwxall()
 {
+    echo Zipping wxAll...
     cd $APPDIR
 
     echo Zipping individual components
@@ -291,7 +293,7 @@ dospinbase()
 {
     cd $APPDIR
 
-    echo Zipping wxBase
+    echo Zipping wxBase...
     rm -f $DESTDIR/wxBase-$VERSION.zip
     zip $ZIPFLAGS -@ $DESTDIR/wxBase-$VERSION.zip < $APPDIR/distrib/msw/base.rsp
 
@@ -415,6 +417,7 @@ dospinsetup()
 
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip -d wxWidgets-$VERSION
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-VC.zip -d wxWidgets-$VERSION
+    unzip $ZIPFLAGS -o wxWidgets-$VERSION-DMC.zip -d wxWidgets-$VERSION
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-CW.zip -d wxWidgets-$VERSION
     unzip $ZIPFLAGS -o wxWidgets-$VERSION-HTMLHelp.zip
@@ -644,7 +647,7 @@ makesetup()
     fi
 
     # Do wxBase spin
-    if [ "$SPINBASE" = "1" ]; then
+    if [ "$SPINBASE" = "1" ] || [ "$SPINALL" = "1" ]; then
         dospinbase
     fi
 
@@ -775,7 +778,7 @@ for i in "$@"; do
        --upx) UPX=1 ;;
        --no-upx) UPX=0 ;;
        --wxmac) SPINMAC=1; SPINALL=0 ;;
-       --wxmsw) SPINMSW=1; SPINALL=0; SPINWXALL=0 ;;
+       --wxmsw) SPINMSW=1; SPINALL=0 ;;
        --wxos2) SPINOS2=1; SPINALL=0 ;;
        --wxall) SPINWXALL=1; SPINALL=0 ;;
        --wxbase) SPINBASE=1; SPINALL=0 ;;

diff --git a/distrib/msw/utils.rsp b/distrib/msw/utils.rsp
index c9977bc22eb30aa79e3d35fadf4fc68c75d95671..97a70009b008ab44caeaeff5c88601bc4951e610 100644 (file)
--- a/distrib/msw/utils.rsp
+++ b/distrib/msw/utils.rsp
@@ -76,8 +76,6 @@ utils/configtool/docs/manual/*.ini
 utils/configtool/docs/manual/*.gif
 utils/configtool/docs/manual/*.bmp
 utils/configtool/docs/manual/*.png
-utils/configtool/docs/manual/*.ini
-utils/configtool/docs/manual/*.ini
 utils/configtool/docs/manual/Makefile
 utils/configtool/docs/code/*.doxy
 utils/configtool/docs/code/Makefile