Avoid passing modified SVN revision numbers (of the form 1234M) to

parts of the versioning code which might not like them.

As a result of this checkin, bob builds from modified SVN working
copies will still announce themselves as revision nnnnM in the
textual version strings, but their binary version in the Windows
VERSIONINFO will now be 0.0.0.0.

git-svn-id: http://svn.tartarus.org/sgt/putty@7231 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Buildscr b/Buildscr
index 090e89a034b25005f61ced7935174fc4654fee54..d48f5a48f1268bc75ce30878da415f2572c29265 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -5,6 +5,7 @@ module putty
 
 # Set up the arguments for the main make command.
 set Makever -DSVN_REV=$(revision)
+ifneq "$(!numeric $(revision))" "yes" set Makever $(Makever) -DMODIFIED
 ifneq "$(RELEASE)" "" set Makever $(Makever) -DRELEASE=$(RELEASE)
 ifneq "$(date)" "" set Makever $(Makever) -DSNAPSHOT=$(date)
 set Makeargs VER="$(Makever)"

diff --git a/windows/version.rc2 b/windows/version.rc2
index 049dbe530bf8dec6ce14a9a102e99f582059c3e6..8474a62baf9102cd247521b29cf79165eefc60a0 100644 (file)
--- a/windows/version.rc2
+++ b/windows/version.rc2
@@ -50,7 +50,11 @@
 #endif
 
 #define VERSION_TEXT "Development snapshot " STR(SNAPSHOT) ":r" STR(SVN_REV)
+#ifdef MODIFIED
+#define BINARY_VERSION 0,0,0,0
+#else
 #define BINARY_VERSION BASE_VERSION,SVN_REV,0
+#endif
 
 #elif defined RELEASE
 
@@ -60,7 +64,11 @@
 #elif defined SVN_REV
 
 #define VERSION_TEXT "Custom build r" STR(SVN_REV)
+#ifdef MODIFIED
+#define BINARY_VERSION 0,0,0,0
+#else
 #define BINARY_VERSION BASE_VERSION,SVN_REV,0
+#endif
 
 #else