Setup fix

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

diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index d32b3a8b0e12fa3b32207b6aa62978e6ca39970a..ec5f5579cd4aaddcde0f0892ea6cac90931a6e5a 100644 (file)
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -36,7 +36,7 @@
     InfoBeforeFile=%READMEFILE%
     InfoAfterFile=%READMEAFTERFILE%
 ;    MessagesFile=compiler:default.isl
-    DiskSpanning=1
+    DiskSpanning=0
 ;    DiskSize=1457664
 ;    DiskClusterSize=512
     ReserveBytes=0

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index b6cc14e6a693cf44a50157f95b501ba3660e6aef..5d29cc6931502cb5c97dd7d1d05b843c198d6eaa 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -533,7 +533,7 @@ dospinsetup()
                doreplace $SETUPSCRIPTNAME "s;%HELPFILE%;$RETVALUE;g"
     fi
 
-    rm -f $DESTDIR/setup*.*
+    rm -f $DESTDIR/setup*.* $DESTDIR/wxMSW-$VERSION-Setup.exe
 
     # Inno Setup complains if this step is not done
     unix2dos --unix2dos $SETUPSCRIPTNAME
@@ -560,13 +560,19 @@ dospinsetup()
     fi
 
     cd $DESTDIR
-#    mv setup.exe $APPNAME-$VERSION-setup.exe
+    mv setup.exe wxMSW-$VERSION-Setup.exe
 
-    echo Putting all the setup files into a single zip archive
-    zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
+    # echo Putting all the setup files into a single zip archive
+    # zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
 
-#    rm -f wxWidgets-$VERSION-win.zip
+    rm -f wxWidgets-$VERSION-win.zip
     rm -f wxWidgets-$VERSION-ExtraDoc.zip
+    rm -f wxWidgets-$VERSION-DMC.zip
+    rm -f wxWidgets-$VERSION-eVC.zip
+    rm -f wxWidgets-$VERSION-Univ.zip
+    rm -f wxWidgets-$VERSION-VC.zip
+    rm -f wxWidgets-$VERSION-DocSource.zip
+    rm -f wxWidgets-$VERSION-LinuxDocs.zip
 
     echo If you saw no warnings or errors, $APPTITLE was successfully spun.
     echo