diff options
| author | lloyd <[email protected]> | 2013-03-04 21:29:17 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2013-03-04 21:29:17 +0000 |
| commit | adce60ae4e4fa0b36bd032e2afe77094f5897161 (patch) | |
| tree | caa0c4f575fad9784a11e390f1d572c1404806d0 /src/utils/version.cpp | |
| parent | 404c6f0cc0fa42ff835b8b082478b1c43044c1af (diff) | |
Set the release type (unreleased, released, snapshot) in
botan_version.py via the release script, and propagate it to
version.cpp via build.h
Diffstat (limited to 'src/utils/version.cpp')
| -rw-r--r-- | src/utils/version.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/utils/version.cpp b/src/utils/version.cpp index 49fec4392..32679cf63 100644 --- a/src/utils/version.cpp +++ b/src/utils/version.cpp @@ -1,6 +1,6 @@ /* * Version Information -* (C) 1999-2011 Jack Lloyd +* (C) 1999-2013 Jack Lloyd * * Distributed under the terms of the Botan license */ @@ -24,17 +24,20 @@ std::string version_string() #define QUOTE(name) #name #define STR(macro) QUOTE(macro) + /* + It is intentional that this string is a compile-time constant; + it makes it much easier to find in binaries. + */ + return "Botan " STR(BOTAN_VERSION_MAJOR) "." STR(BOTAN_VERSION_MINOR) "." STR(BOTAN_VERSION_PATCH) " (" - -#if (BOTAN_VERSION_DATESTAMP == 0) - "unreleased version built " __DATE__ -#else - "released " STR(BOTAN_VERSION_DATESTAMP) + BOTAN_VERSION_RELEASE_TYPE +#if (BOTAN_VERSION_DATESTAMP != 0) + ", dated " STR(BOTAN_VERSION_DATESTAMP) #endif - ", revision " BOTAN_VERSION_VC_REVISION - ", distribution " BOTAN_DISTRIBUTION_INFO ")"; + ", revision " BOTAN_VERSION_VC_REVISION + ", distribution " BOTAN_DISTRIBUTION_INFO ")"; #undef STR #undef QUOTE |