X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=version.c;h=59e9ca758f5a445eea7ee549f08b9034eead1aa8;hb=be586d53b0e503a00c72982667f8e8d11b1893fe;hp=7734160f593875986fd71e5c47382b2571d8fdd4;hpb=64150a5ef28a23c30b60219d550956955311faf3;p=PuTTY.git

diff --git a/version.c b/version.c
index 7734160f..59e9ca75 100644
--- a/version.c
+++ b/version.c
@@ -2,54 +2,21 @@
  * PuTTY version numbering
  */
 
-#define STR1(x) #x
-#define STR(x) STR1(x)
-
-#ifdef INCLUDE_EMPTY_H
 /*
- * Horrible hack to force version.o to be rebuilt unconditionally in
- * the automake world: empty.h is an empty header file, created by the
- * makefile and forcibly updated every time make is run. Including it
- * here causes automake to track it as a dependency, which will cause
- * version.o to be rebuilt too.
- *
- * The space between # and include causes mkfiles.pl's dependency
- * scanner (for all other makefile types) to ignore this include,
- * which is correct because only the automake makefile passes
- * -DINCLUDE_EMPTY_H to enable it.
+ * 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.
  */
-# include "empty.h"
-#endif
-
-#if defined SNAPSHOT
 
-#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) ", " __DATE__ " " __TIME__;
-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