aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-09-16 14:43:18 +0200
committerDavid Robillard <d@drobilla.net>2018-09-16 14:43:18 +0200
commit405314adb79411846b93d33ad4d6d9b13d9139c1 (patch)
tree9717316a14b263294ea7e826d6cbd69831864c0a
parent8c96b17a5393bffee0c521c4872a9fa999048032 (diff)
downloadpatchage-405314adb79411846b93d33ad4d6d9b13d9139c1.tar.gz
patchage-405314adb79411846b93d33ad4d6d9b13d9139c1.tar.bz2
patchage-405314adb79411846b93d33ad4d6d9b13d9139c1.zip
Squashed 'waflib/' changes from 982416b..3e43d09
3e43d09 Add short forms for common options 5db477c Automatically define version for child libraries git-subtree-dir: waflib git-subtree-split: 3e43d0965e29bbd7bf8aa1281930ffa75f401c99
-rw-r--r--extras/autowaf.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/extras/autowaf.py b/extras/autowaf.py
index a4a06ba..be3bfe2 100644
--- a/extras/autowaf.py
+++ b/extras/autowaf.py
@@ -60,13 +60,13 @@ def set_options(opt, debug_by_default=False, test=False):
opts.add_option('--optimize', action='store_false', default=True,
dest='debug', help="build optimized binaries")
else:
- opts.add_option('--debug', action='store_true', default=False,
+ opts.add_option('-d', '--debug', action='store_true', default=False,
dest='debug', help="build debuggable binaries")
opts.add_option('--pardebug', action='store_true', default=False,
dest='pardebug',
help="build debug libraries with D suffix")
- opts.add_option('--strict', action='store_true', default=False,
+ opts.add_option('-s', '--strict', action='store_true', default=False,
dest='strict',
help="use strict compiler flags and show all warnings")
opts.add_option('--ultra-strict', action='store_true', default=False,
@@ -78,12 +78,12 @@ def set_options(opt, debug_by_default=False, test=False):
# Test options
if test:
test_opts = opt.add_option_group('Test options', '')
- opts.add_option('--test', action='store_true', dest='build_tests',
+ opts.add_option('-T', '--test', action='store_true', dest='build_tests',
help='build unit tests')
opts.add_option('--no-coverage', action='store_true',
dest='no_coverage',
help='do not instrument code for test coverage')
- test_opts.add_option('--test-wrapper', type='string',
+ test_opts.add_option('--wrapper', type='string',
dest='test_wrapper',
help='command prefix for tests (e.g. valgrind)')
test_opts.add_option('--verbose-tests', action='store_true',
@@ -441,6 +441,8 @@ def set_lib_env(conf, name, version):
conf.env['LIBPATH_' + NAME] = [conf.env.LIBDIR]
conf.env['LIB_' + NAME] = [lib_name]
+ conf.define(NAME + '_VERSION', version)
+
def set_line_just(conf, width):
global line_just
line_just = max(line_just, width)