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

[u/mdw/putty] / windows / version.rc2

diff --git a/windows/version.rc2 b/windows/version.rc2
index 8d47872..8474a62 100644 (file)
--- a/windows/version.rc2
+++ b/windows/version.rc2
@@ -45,18 +45,31 @@
 
 /* Make SVN_REV mandatory for snapshots, to avoid issuing binary
  * version numbers that look like full releases. */
-#if (!defined SVN_REV) || (SVN_REV == 0)
+#ifndef SVN_REV
 #error SVN_REV not defined/nonzero for snapshot build
 #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
 
 #define VERSION_TEXT "Release " STR(RELEASE)
 #define BINARY_VERSION BASE_VERSION,0,0
 
+#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
 
 /* We can't reliably get the same date and time as version.c, so