diff options
| -rw-r--r-- | botan_version.py | 4 | ||||
| -rwxr-xr-x | configure.py | 25 | ||||
| -rw-r--r-- | doc/log.txt | 3 | ||||
| -rw-r--r-- | readme.txt | 2 | ||||
| -rw-r--r-- | src/build-data/buildh.in | 2 | ||||
| -rw-r--r-- | src/utils/version.cpp | 1 |
6 files changed, 29 insertions, 8 deletions
diff --git a/botan_version.py b/botan_version.py index ec84ce569..6ea49f50d 100644 --- a/botan_version.py +++ b/botan_version.py @@ -1,8 +1,8 @@ release_major = 1 release_minor = 10 -release_patch = 0 +release_patch = 1 release_so_abi_rev = 0 -release_datestamp = 20110620 +release_datestamp = 0 diff --git a/configure.py b/configure.py index 44b42a193..134e6c513 100755 --- a/configure.py +++ b/configure.py @@ -40,6 +40,19 @@ import botan_version def flatten(l): return sum(l, []) +def get_vc_revision(): + mtn = subprocess.Popen(['mtn', 'automate', 'heads'], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + (stdout, stderr) = mtn.communicate() + + if(stderr != ''): + #logging.debug('Error getting rev from monotone - %s' % (stderr)) + return 'unknown' + + return 'mtn:' + stdout.strip() + class BuildConfigurationInformation(object): """ @@ -52,6 +65,7 @@ class BuildConfigurationInformation(object): version_datestamp = botan_version.release_datestamp + version_vc_rev = get_vc_revision() version_string = '%d.%d.%d' % (version_major, version_minor, version_patch) """ @@ -1039,11 +1053,12 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo): return normal_flags return { - 'version_major': build_config.version_major, - 'version_minor': build_config.version_minor, - 'version_patch': build_config.version_patch, - 'so_abi_rev': build_config.version_so_rev, - 'version': build_config.version_string, + 'version_major': build_config.version_major, + 'version_minor': build_config.version_minor, + 'version_patch': build_config.version_patch, + 'version_vc_rev': build_config.version_vc_rev, + 'so_abi_rev': build_config.version_so_rev, + 'version': build_config.version_string, 'distribution_info': options.distribution_info, diff --git a/doc/log.txt b/doc/log.txt index b0050c7be..3deb98e12 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -7,6 +7,9 @@ Release Notes Series 1.10 ---------------------------------------- +Version 1.10.1, Not Yet Released +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + Version 1.10.0, 2011-06-20 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/readme.txt b/readme.txt index 8e002a28c..b98c7499b 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -Botan 1.10.0, 2011-06-20 +Botan 1.10.1, Not Yet Released http://botan.randombit.net/ Botan is a C++ class library for performing a wide variety of diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index 733646524..b3e6f8197 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -17,6 +17,8 @@ #define BOTAN_VERSION_PATCH %{version_patch} #define BOTAN_VERSION_DATESTAMP %{version_datestamp} +#define BOTAN_VERSION_VC_REVISION "%{version_vc_rev}" + #define BOTAN_DISTRIBUTION_INFO "%{distribution_info}" #ifndef BOTAN_DLL diff --git a/src/utils/version.cpp b/src/utils/version.cpp index cf3205d19..acc8bee61 100644 --- a/src/utils/version.cpp +++ b/src/utils/version.cpp @@ -33,6 +33,7 @@ std::string version_string() else out << "released " << version_datestamp(); + out << ", revision " << BOTAN_VERSION_VC_REVISION; out << ", distribution " << BOTAN_DISTRIBUTION_INFO << ")"; return out.str(); |