From 5aba87e47c7a598a82cd508409ac951c5b74cf9d Mon Sep 17 00:00:00 2001 From: lloyd Date: Thu, 25 Mar 2010 18:10:26 +0000 Subject: Report TR1 missing as different from incompatible compiler in configure output --- configure.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'configure.py') diff --git a/configure.py b/configure.py index ebca9d078..c85c7481d 100755 --- a/configure.py +++ b/configure.py @@ -513,11 +513,15 @@ class ModuleInfo(object): def compatible_os(self, os): return self.os == [] or os in self.os - def compatible_compiler(self, cc, with_tr1): - if self.uses_tr1 and with_tr1 not in ['boost', 'system']: - return False + def compatible_compiler(self, cc): return self.cc == [] or cc in self.cc + def tr1_ok(self, with_tr1): + if self.uses_tr1: + return with_tr1 in ['boost', 'system'] + else: + return True + def dependencies(self): # utils is an implicit dep (contains types, etc) deps = self.requires + ['utils'] @@ -1045,9 +1049,10 @@ def choose_modules_to_use(modules, archinfo, options): cannot_use_because(modname, 'incompatible CPU') elif not module.compatible_os(options.os): cannot_use_because(modname, 'incompatible OS') - elif not module.compatible_compiler(options.compiler, - options.with_tr1): + elif not module.compatible_compiler(options.compiler): cannot_use_because(modname, 'incompatible compiler') + elif not module.tr1_ok(options.with_tr1): + cannot_use_because(modname, 'missing TR1') else: if module.load_on == 'never': -- cgit v1.2.3 From 2b35226d37d96a0f98b008e759fe04f234d255b4 Mon Sep 17 00:00:00 2001 From: lloyd Date: Mon, 29 Mar 2010 14:10:23 +0000 Subject: Update for 1.9.5 release 2009-03-29 --- configure.py | 2 +- doc/log.txt | 2 +- readme.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.py') diff --git a/configure.py b/configure.py index c85c7481d..2cd68b009 100755 --- a/configure.py +++ b/configure.py @@ -42,7 +42,7 @@ class BuildConfigurationInformation(object): version_minor = 9 version_patch = 5 version_so_patch = 5 - version_suffix = '-dev' + version_suffix = '' version_string = '%d.%d.%d%s' % ( version_major, version_minor, version_patch, version_suffix) diff --git a/doc/log.txt b/doc/log.txt index 770bfaf5b..f3619ff30 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -1,5 +1,5 @@ -* 1.9.5-dev, ????-??-?? +* 1.9.5, 2010-03-29 - Numerous ECC optimizations - Fix GOST 34.10-2001 X.509 key loading - Allow PK_Signer's fault protection checks to be toggled off diff --git a/readme.txt b/readme.txt index 3b3729123..33e26d12e 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -Botan 1.9.5-dev, ????-??-?? +Botan 1.9.5, 2010-03-29 Botan is a C++ class library for performing a wide variety of cryptographic operations. -- cgit v1.2.3 From fd61747c28071c67dafbe7a4e8d8e20cb869dc46 Mon Sep 17 00:00:00 2001 From: lloyd Date: Tue, 30 Mar 2010 01:53:13 +0000 Subject: Tick 1.9.6-dev --- configure.py | 6 +++--- doc/log.txt | 2 ++ readme.txt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'configure.py') diff --git a/configure.py b/configure.py index 2cd68b009..0dea05a38 100755 --- a/configure.py +++ b/configure.py @@ -40,9 +40,9 @@ class BuildConfigurationInformation(object): """ version_major = 1 version_minor = 9 - version_patch = 5 - version_so_patch = 5 - version_suffix = '' + version_patch = 6 + version_so_patch = 6 + version_suffix = '-dev' version_string = '%d.%d.%d%s' % ( version_major, version_minor, version_patch, version_suffix) diff --git a/doc/log.txt b/doc/log.txt index f3619ff30..ac9354048 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -1,4 +1,6 @@ +* 1.9.6-dev, ????-??-?? + * 1.9.5, 2010-03-29 - Numerous ECC optimizations - Fix GOST 34.10-2001 X.509 key loading diff --git a/readme.txt b/readme.txt index 33e26d12e..c4549912c 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -Botan 1.9.5, 2010-03-29 +Botan 1.9.6-dev, ????-??-?? Botan is a C++ class library for performing a wide variety of cryptographic operations. -- cgit v1.2.3