diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-09-25 01:00:55 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-09-25 01:00:55 +0000 |
| commit | a63d79f93e746f611f37a7e3c9c1c13aaa7c6db3 (patch) | |
| tree | c38a038fd78fc6e6246d64aec1cbf5b20f76c77b /src/windows | |
| parent | 429c571fa4fe828192cc5f5349218616a50efa70 (diff) | |
| download | krb5-a63d79f93e746f611f37a7e3c9c1c13aaa7c6db3.tar.gz krb5-a63d79f93e746f611f37a7e3c9c1c13aaa7c6db3.tar.xz krb5-a63d79f93e746f611f37a7e3c9c1c13aaa7c6db3.zip | |
Make patchlevel.h be the master version file
ticket: 1345
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16790 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows')
| -rw-r--r-- | src/windows/ChangeLog | 4 | ||||
| -rw-r--r-- | src/windows/version.rc | 28 |
2 files changed, 25 insertions, 7 deletions
diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog index d09feec5a3..5dcadcfd5a 100644 --- a/src/windows/ChangeLog +++ b/src/windows/ChangeLog @@ -1,3 +1,7 @@ +2004-09-24 Tom Yu <tlyu@mit.edu> + + * version.rc: Use patchlevel.h to generate version stamp info. + 2004-06-18 Ken Raeburn <raeburn@mit.edu> * version.rc: Add info for support library. diff --git a/src/windows/version.rc b/src/windows/version.rc index 3951dbdeea..58da7b0b7b 100644 --- a/src/windows/version.rc +++ b/src/windows/version.rc @@ -1,17 +1,31 @@ #include <windows.h> #include <winver.h> +#include "patchlevel.h" /* * BEGIN COMMON VERSION INFO for GSS and Kerberos version resources */ -#define PRE_RELEASE +#define XSTR(x) #x +#define STR(x) XSTR(x) -#ifdef PRE_RELEASE -#define BETA_STR " beta" +#define MAJOR_MINOR STR(KRB5_MAJOR_RELEASE) "." STR(KRB5_MINOR_RELEASE) + +#if KRB5_PATCH_LEVEL != 0 +#define MAYBE_PATCH "." STR(KRB5_PATCHLEVEL) +#else +#define MAYBE_PATCH "" +#endif + +#ifdef KRB5_RELTAIL +#define RELTAIL "-" KRB5_RELTAIL +#else +#define RELTAIL "" +#endif + +#ifdef BETA #define BETA_FLAG VS_FF_PRERELEASE #else -#define BETA_STR "" #define BETA_FLAG 0 #endif @@ -23,10 +37,10 @@ /* we're going to stamp all the DLLs with the same version number */ -#define K5_PRODUCT_VERSION_STRING "1.3 (TEST)" BETA_STR "\0" -#define K5_PRODUCT_VERSION 1, 3, 0, 0 +#define K5_PRODUCT_VERSION_STRING MAJOR_MINOR MAYBE_PATCH RELTAIL "\0" +#define K5_PRODUCT_VERSION KRB5_MAJOR_RELEASE, KRB5_MINOR_RELEASE, KRB5_PATCHLEVEL, 0 -#define K5_COPYRIGHT "Copyright (C) 1997-2000 by the Massachusetts Institute of Technology\0" +#define K5_COPYRIGHT "Copyright (C) 1997-2004 by the Massachusetts Institute of Technology\0" #define K5_COMPANY_NAME "Massachusetts Institute of Technology.\0" /* |