X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mksrcarc.sh;h=a8b01b5bbeed7f84934d15ee7e29081fdc52a8b7;hb=145ecf611238c4f1e39d89d3eee40319a2c54fe8;hp=9ab51ce66a6e901385762f715300b803a62bc16a;hpb=6d7cc86470782937ea60a468a64fa661be21d673;p=PuTTY.git

diff --git a/mksrcarc.sh b/mksrcarc.sh
index 9ab51ce6..a8b01b5b 100755
--- a/mksrcarc.sh
+++ b/mksrcarc.sh
@@ -1,17 +1,33 @@
 #!/bin/sh
+
+set -e
+
 perl mkfiles.pl
-relver=`cat LATEST.VER`
-unixarc="putty-$relver$datesuffix"
+# These are text files.
 text=`{ find . -name CVS -prune -o \
                -name .cvsignore -prune -o \
+               -name .svn -prune -o \
                -name LATEST.VER -prune -o \
                -name CHECKLST.txt -prune -o \
                -name mksrcarc.sh -prune -o \
                -name '*.dsp' -prune -o \
                -name '*.dsw' -prune -o \
                -type f -print | sed 's/^\.\///'; } | \
-      grep -ivE MODULE\|putty.iss\|website.url | grep -vF .ico`
-bin=`{ ls -1 *.ico putty.iss website.url; \
+      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; \
        find . -name '*.dsp' -print -o -name '*.dsw' -print; }`
-zip -k -l putty-src.zip $text > /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