Document -proxycmd in help and man pages.

[PuTTY.git] / version.c

diff --git a/version.c b/version.c
index 834beec81a3c1f20c91aa033a5aced1665674312..59e9ca758f5a445eea7ee549f08b9034eead1aa8 100644 (file)
--- a/version.c
+++ b/version.c
@@ -2,19 +2,24 @@
  * PuTTY version numbering
  */
 
-#define STR1(x) #x
-#define STR(x) STR1(x)
-
-#if defined SNAPSHOT
-
-char ver[] = "Development snapshot " STR(SNAPSHOT);
-
-#elif defined 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.
+ */
 
-char ver[] = "Release " STR(RELEASE);
+#ifdef SOURCE_COMMIT
+#include "empty.h"
+#endif
 
-#else
+#include "version.h"
 
-char ver[] = "Unidentified build, " __DATE__ " " __TIME__;
+const char ver[] = TEXTVER;
+const char sshver[] = SSHVER;
+const char commitid[] = SOURCE_COMMIT;
 
-#endif
+/*
+ * SSH local version string MUST be under 40 characters. Here's a
+ * compile time assertion to verify this.
+ */
+enum { vorpal_sword = 1 / (sizeof(sshver) <= 40) };