Generate wxMSW zip even if we've turned off InnoSetup.

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

distrib/scripts/msw/makesetup.sh

@@ -412,6 +412,7 @@ dospininstaller()
     zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWidgets-$VERSION/*
     cd wxWidgets-$VERSION
 
+    if ["$INNO" != "0"]; then
         echo Generating $SETUPSCRIPTNAME
         rm -f $SETUPSCRIPTNAME
     
@@ -485,6 +486,7 @@ dospininstaller()
         cd $DESTDIR
         mv setup.exe wxMSW-$VERSION-Setup.exe
 
+    fi
     # echo Putting all the setup files into a single zip archive
     # zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
 
@@ -614,46 +616,10 @@ makesetup()
     # Do misc files spin
     dospinmisc
 
-    cp $APPDIR/docs/changes.txt $DESTDIR/changes-$VERSION.txt
+    docopydocs $APPDIR $DESTDIR
-    cp $APPDIR/docs/readme.txt $DESTDIR/readme-$VERSION.txt
-
-    cp $APPDIR/docs/msw/readme.txt $DESTDIR/readme-msw-$VERSION.txt
-    cp $APPDIR/docs/msw/install.txt $DESTDIR/install-msw-$VERSION.txt
-
-    cp $APPDIR/docs/mac/readme.txt $DESTDIR/readme-mac-$VERSION.txt
-    cp $APPDIR/docs/mac/install.txt $DESTDIR/install-mac-$VERSION.txt
-
-    cp $APPDIR/docs/motif/readme.txt $DESTDIR/readme-motif-$VERSION.txt
-    cp $APPDIR/docs/motif/install.txt $DESTDIR/install-motif-$VERSION.txt
-
-    cp $APPDIR/docs/gtk/readme.txt $DESTDIR/readme-gtk-$VERSION.txt
-    cp $APPDIR/docs/gtk/install.txt $DESTDIR/install-gtk-$VERSION.txt
-
-    cp $APPDIR/docs/x11/readme.txt $DESTDIR/readme-x11-$VERSION.txt
-#    cp $APPDIR/docs/x11/readme-nanox.txt $DESTDIR/readme-nanox-$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/cocoa/readme.txt $DESTDIR/readme-cocoa-$VERSION.txt
-    cp $APPDIR/docs/cocoa/install.txt $DESTDIR/install-cocoa-$VERSION.txt
-
-    cp $APPDIR/docs/base/readme.txt $DESTDIR/readme-base-$VERSION.txt
-
-    cp $APPDIR/docs/os2/install.txt $DESTDIR/install-os2-$VERSION.txt
-
-    cp $APPDIR/docs/univ/readme.txt $DESTDIR/readme-univ-$VERSION.txt
-
-    cp $APPDIR/docs/readme_vms.txt $DESTDIR/readme-vms-$VERSION.txt
-
-    # cp $APPDIR/docs/motif/makewxmotif $DESTDIR/makewxmotif-$VERSION
-    # cp $APPDIR/docs/gtk/makewxgtk $DESTDIR/makewxgtk-$VERSION
     
     # Time to regenerate the Inno Install script
-    if [ "$INNO" != "0" ]; then
     dospininstaller
-    fi
 }
 
 # Get the makefiles that aren't in CVS and unarchive them
@@ -700,6 +666,7 @@ usage()
 # Process command line options.
 
 for i in "$@"; do
+
     case "$i" in
 	--inno) INNO=1 ;;
 	--no-inno) INNO=0 ;;