Make bob builds show the full source git commit hash in buildinfo.

[PuTTY.git] / version.c

diff --git a/version.c b/version.c
index c39709cd8a657932128d5c0321f9ea4084a19825..231c1a75b803c1c031980bab8f82b866e8714163 100644 (file)
--- a/version.c
+++ b/version.c
@@ -2,25 +2,17 @@
  * PuTTY version numbering
  */
 
-#define STR1(x) #x
-#define STR(x) STR1(x)
-
-#if defined SNAPSHOT
-
-char ver[] = "Development snapshot " STR(SNAPSHOT);
-char sshver[] = "PuTTY-Snapshot-" STR(SNAPSHOT);
-
-#elif defined RELEASE
-
-char ver[] = "Release " STR(RELEASE);
-char sshver[] = "PuTTY-Release-" STR(RELEASE);
-
-#else
+/*
+ * 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.
+ */
 
-char ver[] = "Unidentified build, " __DATE__ " " __TIME__;
-char sshver[] = "PuTTY-Local: " __DATE__ " " __TIME__;
+#include "version.h"
 
-#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