first pass

[PuTTY.git] / version.c

diff --git a/version.c b/version.c
index de658677b71c9feb18984f5ce19ff8819876356f..59e9ca758f5a445eea7ee549f08b9034eead1aa8 100644 (file)
--- a/version.c
+++ b/version.c
@@ -2,38 +2,21 @@
  * PuTTY version numbering
  */
 
-#define STR1(x) #x
-#define STR(x) STR1(x)
-
-#if defined SNAPSHOT
+/*
+ * The difficult part of deciding what goes in these version strings
+ * is done in Buildscr, and then written into version.h. All we have
+ * to do here is to drop it into variables of the right names.
+ */
 
-#if defined SVN_REV
-#define SNAPSHOT_TEXT STR(SNAPSHOT) ":r" STR(SVN_REV)
-#else
-#define SNAPSHOT_TEXT STR(SNAPSHOT)
+#ifdef SOURCE_COMMIT
+#include "empty.h"
 #endif
 
-char ver[] = "Development snapshot " SNAPSHOT_TEXT;
-char sshver[] = "PuTTY-Snapshot-" SNAPSHOT_TEXT;
-
-#undef SNAPSHOT_TEXT
-
-#elif defined RELEASE
-
-char ver[] = "Release " STR(RELEASE);
-char sshver[] = "PuTTY-Release-" STR(RELEASE);
+#include "version.h"
 
-#elif defined SVN_REV
-
-char ver[] = "Custom build r" STR(SVN_REV);
-char sshver[] = "PuTTY-Custom-r" STR(SVN_REV);
-
-#else
-
-char ver[] = "Unidentified build, " __DATE__ " " __TIME__;
-char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__;
-
-#endif
+const char ver[] = TEXTVER;
+const char sshver[] = SSHVER;
+const char commitid[] = SOURCE_COMMIT;
 
 /*
  * SSH local version string MUST be under 40 characters. Here's a