X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=version.c;h=59e9ca758f5a445eea7ee549f08b9034eead1aa8;hb=095072fa46b2d7b8beafaddb2f873d2f500a1e10;hp=c39709cd8a657932128d5c0321f9ea4084a19825;hpb=080d59422b49e14320de33bb0b22a6b93ddb07bf;p=PuTTY.git

diff --git a/version.c b/version.c
index c39709cd..59e9ca75 100644
--- a/version.c
+++ b/version.c
@@ -2,25 +2,21 @@
  * 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);
+/*
+ * 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.
+ */
 
-#else
+#ifdef SOURCE_COMMIT
+#include "empty.h"
+#endif
 
-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