X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad17c279f338162bbc4a745fd41b99a48d5e1bef..1441bb60dfea9ba90ddf991535ab4fe59211b6ba:/distrib/scripts/mac/tardist

diff --git a/distrib/scripts/mac/tardist b/distrib/scripts/mac/tardist
index 943aad8f17..c4c2aac3ec 100644
--- a/distrib/scripts/mac/tardist
+++ b/distrib/scripts/mac/tardist
@@ -64,7 +64,18 @@ echo Tarring wxMac...
 cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/setup.h
 cp $WXSRC/include/wx/mac/setup0.h $WXSRC/include/wx/mac/setup.h
 cd $WXSRC
-cat $SCRIPTDIR/manifests/mac.rsp $SCRIPTDIR/manifests/cocoa.rsp $SCRIPTDIR/manifests/generic.rsp $SCRIPTDIR/manifests/cw_mac.rsp $SCRIPTDIR/manifests/tex2rtf.rsp $SCRIPTDIR/manifests/utils.rsp $SCRIPTDIR/manifests/ogl.rsp $SCRIPTDIR/manifests/stc.rsp $SCRIPTDIR/manifests/xml.rsp $SCRIPTDIR/manifests/contrib.rsp $SCRIPTDIR/manifests/deprecated.rsp $SCRIPTDIR/manifests/makefile.rsp $SCRIPTDIR/manifests/tiff.rsp $SCRIPTDIR/manifests/jpeg.rsp > /tmp/wxmac_in.txt
+cat $SCRIPTDIR/manifests/mac.rsp  \
+    $SCRIPTDIR/manifests/cocoa.rsp  \
+    $SCRIPTDIR/manifests/generic.rsp  \
+    $SCRIPTDIR/manifests/generic_samples.rsp  \
+    $SCRIPTDIR/manifests/cw_mac.rsp  \
+    $SCRIPTDIR/manifests/tex2rtf.rsp  \
+    $SCRIPTDIR/manifests/utils.rsp  \
+    $SCRIPTDIR/manifests/xml.rsp  \
+    $SCRIPTDIR/manifests/makefile.rsp  \
+    $SCRIPTDIR/manifests/tiff.rsp  \
+    $SCRIPTDIR/manifests/jpeg.rsp \
+    > /tmp/wxmac_in.txt
 expandlines /tmp/wxmac_in.txt /tmp/wxmac.txt
 $TAR cf $WXDEST/wxMac-${WXVER}.tar -T /tmp/wxmac.txt
 
@@ -76,7 +87,6 @@ mkdir wxMac-${WXVER}
 cd wxMac-${WXVER}
 
 $TAR xf ../wxMac-${WXVER}.tar
-rm -f -r contrib/src/mmedia contrib/samples/mmedia
 echo Copying readme files...
 cp $WXSRC/docs/mac/readme.txt README-MAC.txt
 cp $WXSRC/docs/mac/install.txt INSTALL-MAC.txt
@@ -111,7 +121,33 @@ echo Tarring wxAll...
 
 ### wxAll: all distributions in one giant archive
 cd $WXSRC
-cat $SCRIPTDIR/manifests/generic.rsp $SCRIPTDIR/manifests/msw.rsp $SCRIPTDIR/manifests/wince.rsp $SCRIPTDIR/manifests/vc.rsp $SCRIPTDIR/manifests/cw.rsp $SCRIPTDIR/manifests/cw_mac.rsp $SCRIPTDIR/manifests/gtk.rsp $SCRIPTDIR/manifests/x11.rsp $SCRIPTDIR/manifests/motif.rsp $SCRIPTDIR/manifests/mac.rsp $SCRIPTDIR/manifests/cocoa.rsp $SCRIPTDIR/manifests/os2.rsp $SCRIPTDIR/manifests/palmos.rsp $SCRIPTDIR/manifests/x11.rsp $SCRIPTDIR/manifests/univ.rsp $SCRIPTDIR/manifests/mgl.rsp $SCRIPTDIR/manifests/contrib.rsp $SCRIPTDIR/manifests/deprecated.rsp $SCRIPTDIR/manifests/utilmake.rsp $SCRIPTDIR/manifests/utils.rsp $SCRIPTDIR/manifests/mmedia.rsp $SCRIPTDIR/manifests/tex2rtf.rsp $SCRIPTDIR/manifests/stc.rsp $SCRIPTDIR/manifests/xml.rsp $SCRIPTDIR/manifests/ogl.rsp $SCRIPTDIR/manifests/makefile.rsp $SCRIPTDIR/manifests/tiff.rsp $SCRIPTDIR/manifests/jpeg.rsp $SCRIPTDIR/manifests/docsrc.rsp | uniq > /tmp/wxall_in.txt
+cat $SCRIPTDIR/manifests/generic.rsp \
+    $SCRIPTDIR/manifests/generic_samples.rsp \
+    $SCRIPTDIR/manifests/msw.rsp \
+    $SCRIPTDIR/manifests/wince.rsp  \
+    $SCRIPTDIR/manifests/vc.rsp  \
+    $SCRIPTDIR/manifests/cw.rsp  \
+    $SCRIPTDIR/manifests/cw_mac.rsp  \
+    $SCRIPTDIR/manifests/gtk.rsp  \
+    $SCRIPTDIR/manifests/x11.rsp  \
+    $SCRIPTDIR/manifests/motif.rsp  \
+    $SCRIPTDIR/manifests/mac.rsp  \
+    $SCRIPTDIR/manifests/cocoa.rsp  \
+    $SCRIPTDIR/manifests/os2.rsp  \
+    $SCRIPTDIR/manifests/palmos.rsp  \
+    $SCRIPTDIR/manifests/x11.rsp  \
+    $SCRIPTDIR/manifests/univ.rsp  \
+    $SCRIPTDIR/manifests/mgl.rsp  \
+    $SCRIPTDIR/manifests/dfb.rsp  \
+    $SCRIPTDIR/manifests/utilmake.rsp  \
+    $SCRIPTDIR/manifests/utils.rsp  \
+    $SCRIPTDIR/manifests/tex2rtf.rsp  \
+    $SCRIPTDIR/manifests/xml.rsp  \
+    $SCRIPTDIR/manifests/makefile.rsp  \
+    $SCRIPTDIR/manifests/tiff.rsp  \
+    $SCRIPTDIR/manifests/jpeg.rsp  \
+    $SCRIPTDIR/manifests/docsrc.rsp \
+    | uniq > /tmp/wxall_in.txt
 expandlines /tmp/wxall_in.txt /tmp/wxall.txt
 $TAR cf $WXDEST/wxWidgets-${WXVER}.tar -T /tmp/wxall.txt
 
@@ -203,6 +239,7 @@ fi
 SPINWXALL=0
 SPINWXMAC=0
 SPINEVERYTHING=0
+SILENT=0
 
 usage()
 {
@@ -212,6 +249,7 @@ usage()
     echo "    --wxall        Spin wxAll"
     echo "    --wxmac        Spin wxMac"
     echo "    --all          Spin EVERYTHING"
+    echo "    --silent       Don't ask for confirmation before running"
 
     exit 1
 }
@@ -223,6 +261,7 @@ for i in "$@"; do
 	--wxall) SPINWXALL=1 ;;
 	--wxmac) SPINWXMAC=1 ;;
 	--all) SPINEVERYTHING=1 ;;
+	--silent) SILENT=1 ;;
 	*)
 	    usage
 	    exit
@@ -230,13 +269,14 @@ for i in "$@"; do
     esac
 done
 
-
-echo About to archive wxWidgets:
-echo   From    $WXSRC
-echo   To      $WXDEST
-echo   Version $WXVER
-echo CTRL-C if this is not correct.
-read dummy
+if [ "$SILENT" = "0" ]; then
+  echo About to archive wxWidgets:
+  echo   From    $WXSRC
+  echo   To      $WXDEST
+  echo   Version $WXVER
+  echo CTRL-C if this is not correct.
+  read dummy
+fi
 
 doinit