aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Warta <simon@kullo.net>2015-07-27 07:42:03 +0200
committerSimon Warta <simon@kullo.net>2015-07-27 07:42:03 +0200
commit9eaa13539f035ab7ed6b4aa07b8b19885f42ef83 (patch)
treedf349b42fcdac7fcb02c717d32c0c71b6f50f793
parent00970c01bfb1a12b65f0527e6ff0b04cd9f82fbb (diff)
parent708b79097b66be2645a9665fde9abccb2e538dce (diff)
Merge pull request #224 from webmaster128/remove-python-2.6
Update configure.py
-rwxr-xr-xconfigure.py26
1 files changed, 11 insertions, 15 deletions
diff --git a/configure.py b/configure.py
index 4764162e2..9a8f6a805 100755
--- a/configure.py
+++ b/configure.py
@@ -8,11 +8,8 @@ Configuration program for botan
Botan is released under the Simplified BSD License (see license.txt)
-Tested with CPython 2.6, 2.7, and 3.3
-
-CPython 2.5 and earlier are not supported
-
-Jython - Target detection does not work (use --os and --cpu)
+Tested with CPython 2.7 and 3.4. CPython 2.6 and earlier are not supported.
+On Jython target detection does not work (use --os and --cpu).
"""
import sys
@@ -72,15 +69,12 @@ def get_vc_revision():
logging.debug('Error getting rev from %s - %s' % (cmdname, e))
return None
- vc_commands = [['mtn', 'automate', 'heads'],
- ['git', 'rev-parse', 'HEAD']]
-
- for vc_cmd in vc_commands:
- rev = get_vc_revision(vc_cmd)
- if rev is not None:
- return rev
-
- return 'unknown'
+ vc_command = ['git', 'rev-parse', 'HEAD']
+ rev = get_vc_revision(vc_command)
+ if rev is not None:
+ return rev
+ else:
+ return 'unknown'
class BuildConfigurationInformation(object):
@@ -301,8 +295,10 @@ def process_command_line(args):
build_group.add_option('--with-build-dir', metavar='DIR', default='',
help='setup the build in DIR')
+ link_methods = ['symlink', 'hardlink', 'copy']
build_group.add_option('--link-method', default=None, metavar='METHOD',
- help='choose how links are created')
+ choices=link_methods,
+ help='choose how links to include headers are created (%s)' % ', '.join(link_methods))
makefile_styles = ['gmake', 'nmake']
build_group.add_option('--makefile-style', metavar='STYLE', default=None,