X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/865b3d6b4dad16ee4787d22d5a470656d442fd47..5462f4596108c4309fb69b4e57aa1e59d7100908:/mkunxarc.sh

diff --git a/mkunxarc.sh b/mkunxarc.sh
index 7e8d367c..b15e2f45 100755
--- a/mkunxarc.sh
+++ b/mkunxarc.sh
@@ -1,26 +1,45 @@
-#!/bin/sh 
+#!/bin/bash 
 
 # Build a Unix source distribution from the PuTTY CVS area.
 #
 # Pass an argument of the form `2004-02-08' to have the archive
 # tagged as a development snapshot; of the form `0.54' to have it
-# tagged as a release.
+# tagged as a release; of the form `r1234' to have it tagged as a
+# custom build. Otherwise it'll be tagged as unidentified.
 
 case "$1" in
   ????-??-??)
     case "$1" in *[!-0-9]*) echo "Malformed snapshot ID '$1'" >&2;exit 1;;esac
-    arcsuffix="-`cat LATEST.VER`-$1"
+    autoconfver="`cat LATEST.VER`-$1"
+    arcsuffix="-$autoconfver"
     ver="-DSNAPSHOT=$1"
     docver=
     ;;
+  r*)
+    autoconfver="$1"
+    arcsuffix="-$autoconfver"
+    ver="-DSVN_REV=${1#r}"
+    docver=
+    ;;
   '')
+    autoconfver="X.XX" # got to put something in here!
     arcsuffix=
     ver=
     docver=
     ;;
+  *pre)
+    set -- "${1%pre}" "$2"
+    case "$1" in *[!.0-9a-z~]*) echo "Malformed prerelease ID '$1'">&2;exit 1;;esac
+    case "$2" in *[!.0-9a-z~]*) echo "Malformed prerelease revision '$1'">&2;exit 1;;esac
+    autoconfver="$1~pre$2"
+    arcsuffix="-$autoconfver"
+    ver="-DPRERELEASE=$1 -DSVN_REV=$2"
+    docver="VERSION=\"PuTTY prerelease $1:r$2\""
+    ;;
   *)
-    case "$1" in *[!.0-9a-z]*) echo "Malformed release ID '$1'">&2;exit 1;;esac
-    arcsuffix="-$1"
+    case "$1" in *[!.0-9a-z~]*) echo "Malformed release ID '$1'">&2;exit 1;;esac
+    autoconfver="$1"
+    arcsuffix="-$autoconfver"
     ver="-DRELEASE=$1"
     docver="VERSION=\"PuTTY release $1\""
     ;;
@@ -28,7 +47,6 @@ esac
 
 perl mkfiles.pl
 (cd doc && make -s ${docver:+"$docver"})
-sh mkauto.sh 2>/dev/null
 
 relver=`cat LATEST.VER`
 arcname="putty$arcsuffix"
@@ -43,6 +61,7 @@ find . -name uxarc -prune -o \
        -name CVS -prune -o \
        -name .cvsignore -prune -o \
        -name .svn -prune -o \
+       -name configure.ac -prune -o \
        -name '*.zip' -prune -o \
        -name '*.tar.gz' -prune -o \
        -type f -exec ln -s $PWD/{} uxarc/$arcname/{} \;
@@ -51,5 +70,8 @@ if test "x$ver" != "x"; then
    md5sum `find . -name '*.[ch]' -print` > manifest;
    echo "$ver" > version.def)
 fi
+sed "s/^AC_INIT(putty,.*/AC_INIT(putty, $autoconfver)/" unix/configure.ac > uxarc/$arcname/unix/configure.ac
+(cd uxarc/$arcname && sh mkauto.sh) 2>errors || { cat errors >&2; exit 1; }
+
 tar -C uxarc -chzof $arcname.tar.gz $arcname
 rm -rf uxarc