Fix __uint128_t compile error on MinGW.

[PuTTY.git] / mksrcarc.sh

diff --git a/mksrcarc.sh b/mksrcarc.sh
index f2e9845b58660d7ae7877858036d96c881887c20..87327df7c8d97c8b6b47330126835bcf9d585816 100755 (executable)
--- a/mksrcarc.sh
+++ b/mksrcarc.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -e
+
 perl mkfiles.pl
 # These are text files.
 text=`{ find . -name CVS -prune -o \
@@ -10,15 +13,21 @@ text=`{ find . -name CVS -prune -o \
                -name '*.dsp' -prune -o \
                -name '*.dsw' -prune -o \
                -type f -print | sed 's/^\.\///'; } | \
-      grep -ivE 'testdata/.*\.txt|MODULE|putty.iss|website.url' | grep -vF .ico`
+      grep -ivE 'testdata/.*\.txt|MODULE|putty.iss|website.url' | grep -vF .ico | grep -vF .icns`
 # These are files which I'm _sure_ should be treated as text, but
 # which zip might complain about, so we direct its moans to
 # /dev/null! Apparently its heuristics are doubtful of UTF-8 text
 # files.
 bintext=testdata/*.txt
 # These are actual binary files which we don't want transforming.
-bin=`{ ls -1 windows/*.ico windows/putty.iss windows/website.url; \
+bin=`{ ls -1 windows/*.ico windows/putty.iss windows/website.url macosx/*.icns; \
        find . -name '*.dsp' -print -o -name '*.dsw' -print; }`
-zip -k -l putty-src.zip $text > /dev/null
-zip -k -l putty-src.zip $bintext >& /dev/null
-zip -k putty-src.zip $bin > /dev/null
+
+verbosely() {
+    echo "$@"
+    "$@"
+}
+
+verbosely zip -l putty-src.zip $text
+verbosely zip -l putty-src.zip $bintext
+verbosely zip putty-src.zip $bin