X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=version.c;h=f6086127e662159bfc5e462466bd8e44a4addd4b;hb=2eb952ca31aa13d1f6f429305fbb6f43a9a28c56;hp=da7e11ca725590c9d2565d32847b7774c91a9f47;hpb=f86ad059db0c5225b29da5f8a138d7dce4322f22;p=PuTTY.git diff --git a/version.c b/version.c index da7e11ca..f6086127 100644 --- a/version.c +++ b/version.c @@ -2,33 +2,16 @@ * PuTTY version numbering */ -#define STR1(x) #x -#define STR(x) STR1(x) - -#if defined SNAPSHOT - -#if defined SVN_REV -#define SNAPSHOT_TEXT STR(SNAPSHOT) ":r" STR(SVN_REV) -#else -#define SNAPSHOT_TEXT STR(SNAPSHOT) -#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); - -#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 +char ver[] = TEXTVER; +char sshver[] = SSHVER; /* * SSH local version string MUST be under 40 characters. Here's a