X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=makedist.sh;h=22b4f5d0aebd7d885ce42ebe903096269f00072c;hb=3ce69e84cad15844282d691fa03e711c5353c05e;hp=ae7b86a31458fb02e40a12adf0a39c64dd108dc9;hpb=1129ba83f9514e5bc742936f9b9338848858dad9;p=sgt-puzzles.git

diff --git a/makedist.sh b/makedist.sh
index ae7b86a..22b4f5d 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -2,36 +2,26 @@
 
 # Build a Unix source distribution from the Puzzles SVN area.
 #
-# Pass a numeric argument to have the archive tagged as that SVN
-# revision. Otherwise, the script will work it out itself by
-# calling `svnversion', or failing that it will not version-tag the
+# Pass a version number argument to have the archive tagged with that
+# version number. Otherwise, the script will not version-tag the
 # archive at all.
 
-case "$#" in
-  0)
-    # Ignore errors; if we can't get a version, we'll have a blank
-    # string.
-    rev=`svnversion . 2>/dev/null`
-    if test "x$rev" = "xexported"; then rev=; fi
-    ;;
-  *)
-    case "$1" in *[!0-9]*) echo "Malformed revision number '$1'">&2;exit 1;;esac
-    rev="$1"
-    ;;
-esac
-
-if test "x$rev" != "x"; then
-  arcsuffix="-r$rev"
-  ver="-DREVISION=$rev"
+version="$1"
+
+if test "x$version" != "x"; then
+  arcsuffix="-$version"
+  ver="-DVER=$version"
 else
   arcsuffix=
   ver=
 fi
 
 perl mkfiles.pl
+./mkauto.sh
 
 mkdir tmp.$$
 mkdir tmp.$$/puzzles$arcsuffix
+mkdir tmp.$$/puzzles$arcsuffix/icons
 
 # Build Windows Help and text versions of the manual for convenience.
 halibut --winhelp=puzzles.hlp --text=puzzles.txt puzzles.but
@@ -39,19 +29,19 @@ halibut --winhelp=puzzles.hlp --text=puzzles.txt puzzles.but
 # Build a text version of the HACKING document.
 halibut --text=HACKING devel.but
 
-for i in *.c *.m *.h *.R *.but *.plist *.icns LICENCE README Recipe \
-  mkfiles.pl Makefile Makefile.* \
-  HACKING puzzles.txt puzzles.hlp puzzles.cnt; do
-  ln -s ../../$i tmp.$$/puzzles$arcsuffix
-  if test "x$ver" != "x"; then
-    md5sum $i >> tmp.$$/puzzles$arcsuffix/manifest
-  fi
+for i in *.c *.m *.h *.R *.rc *.but *.plist *.icns LICENCE README Recipe \
+  *.rc2 mkfiles.pl Makefile Makefile.* \
+  HACKING puzzles.txt puzzles.hlp puzzles.cnt puzzles.chm \
+  icons/Makefile icons/*.sav icons/*.pl icons/*.sh icons/win16pal.xpm \
+  icons/*.png icons/*.ico icons/*.rc icons/*.c \
+  configure.ac mkauto.sh aclocal.m4 \
+  configure depcomp install-sh missing compile; do
+  case $i in
+    */*) ln -s ../../../$i tmp.$$/puzzles$arcsuffix/$i;;
+    *)   ln -s ../../$i tmp.$$/puzzles$arcsuffix/$i;;
+  esac
 done
 
-if test "x$ver" != "x"; then
-  echo "$ver" >> tmp.$$/puzzles$arcsuffix/version.def
-fi
-
 tar -C tmp.$$ -chzf - puzzles$arcsuffix > ../puzzles$arcsuffix.tar.gz
 
 rm -rf tmp.$$