From: Simon Tatham <anakin@pobox.com>
Date: Sat, 26 Nov 2011 17:45:51 +0000 (+0000)
Subject: Merge r9343 (the new 'pre-release' version type).
X-Git-Tag: 0.62~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cc50fe5f33b40463aba18c662a1d163f8b9d518f;p=PuTTY.git

Merge r9343 (the new 'pre-release' version type).

[originally from svn r9344]
[r9343 == 1dff23a2143b7a6ce1084a6308569d14c2826240]
---

diff --git a/Buildscr b/Buildscr
index 75a660ef..e9dc295f 100644
--- a/Buildscr
+++ b/Buildscr
@@ -7,6 +7,7 @@ module putty
 set Makever -DSVN_REV=$(revision)
 ifneq "$(!numeric $(revision))" "yes" set Makever $(Makever) -DMODIFIED
 ifneq "$(RELEASE)" "" set Makever $(Makever) -DRELEASE=$(RELEASE)
+ifneq "$(PRERELEASE)" "" set Makever $(Makever) -DPRERELEASE=$(PRERELEASE)
 ifneq "$(date)" "" set Makever $(Makever) -DSNAPSHOT=$(date)
 set Makeargs VER="$(Makever)"
 ifneq "$(XFLAGS)" "" set Makeargs $(Makeargs) XFLAGS="$(XFLAGS)"
@@ -15,11 +16,13 @@ ifneq "$(MAKEARGS)" "" set Makeargs $(Makeargs) $(MAKEARGS)
 # Set up the version string for the docs build.
 set Docmakeargs VERSION="PuTTY revision $(revision)"
 ifneq "$(RELEASE)" "" set Docmakeargs VERSION="PuTTY release $(RELEASE)"
+ifneq "$(PRERELEASE)" "" set Docmakeargs VERSION="PuTTY pre-release $(PRERELEASE):r$(revision)"
 ifneq "$(date)" "" set Docmakeargs VERSION="PuTTY development snapshot $(date)"
 
 # Set up the version string for the Unix source archive.
 set Unxver r$(revision)
 ifneq "$(RELEASE)" "" set Unxver $(RELEASE)
+ifneq "$(PRERELEASE)" "" set Unxver $(PRERELEASE)pre $(revision)
 ifneq "$(date)" "" set Unxver $(date)
 
 # Set up the various version strings for the installer.
@@ -33,16 +36,15 @@ ifneq "$(RELEASE)" "" set Iname PuTTY version $(RELEASE)
 ifneq "$(RELEASE)" "" set Ivertext Release $(RELEASE)
 ifneq "$(RELEASE)" "" set Irev 0
 ifneq "$(RELEASE)" "" set Ifilename putty-$(RELEASE)-installer.exe
+ifneq "$(PRERELEASE)" "" set Iversion $(PRERELEASE):r$(revision)
+ifneq "$(PRERELEASE)" "" set Iname PuTTY pre-release $(PRERELEASE):r$(revision)
+ifneq "$(PRERELEASE)" "" set Ivertext Pre-release $(PRERELEASE):r$(revision)
+ifneq "$(PRERELEASE)" "" set Ifilename putty-$(PRERELEASE)-pre$(revision)-installer.exe
 ifneq "$(date)" "" set Iversion $(date):r$(revision)
 ifneq "$(date)" "" set Iname PuTTY development snapshot $(date):r$(revision)
 ifneq "$(date)" "" set Ivertext Development snapshot $(date):r$(revision)
 ifneq "$(date)" "" set Ifilename putty-$(date)-installer.exe
 
-# Set up the version string for the installer.
-set Iversion r$(revision)
-ifneq "$(RELEASE)" "" set Iversion $(RELEASE)
-ifneq "$(date)" "" set Iversion $(date):r$(revision)
-
 in putty do ./mksrcarc.sh
 in putty do ./mkunxarc.sh $(Unxver)
 in putty do perl mkfiles.pl
diff --git a/mkunxarc.sh b/mkunxarc.sh
index 7c69c2f6..20ff1550 100755
--- a/mkunxarc.sh
+++ b/mkunxarc.sh
@@ -24,8 +24,17 @@ case "$1" in
     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
+    case "$1" in *[!.0-9a-z~]*) echo "Malformed release ID '$1'">&2;exit 1;;esac
     arcsuffix="-$1"
     ver="-DRELEASE=$1"
     docver="VERSION=\"PuTTY release $1\""
diff --git a/version.c b/version.c
index 3fa0c0ef..bcb7c530 100644
--- a/version.c
+++ b/version.c
@@ -23,6 +23,11 @@ char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT;
 char ver[] = "Release " STR(RELEASE);
 char sshver[] = "PuTTY-Release-" STR(RELEASE);
 
+#elif defined PRERELEASE
+
+char ver[] = "Pre-release " STR(PRERELEASE) ":r" STR(SVN_REV);
+char sshver[] = "PuTTY-Prerelease-" STR(PRERELEASE) ":r" STR(SVN_REV);
+
 #elif defined SVN_REV
 
 char ver[] = "Custom build r" STR(SVN_REV) ", " __DATE__ " " __TIME__;