diff options
| author | David Robillard <d@drobilla.net> | 2018-09-16 14:45:09 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2018-09-16 14:45:09 +0200 |
| commit | a82a011d6a0fc09375b6ae9b7814219293c15270 (patch) | |
| tree | 2dae40b20072a976eae59a757fba84b2e7a6c91b | |
| parent | 385c5cf99d3ce957693272b733190ae304302103 (diff) | |
| parent | 5a7ab1f83c78c5783882b5ed57f87d5fa1b7ba60 (diff) | |
| download | sratom-a82a011d6a0fc09375b6ae9b7814219293c15270.tar.gz sratom-a82a011d6a0fc09375b6ae9b7814219293c15270.tar.bz2 sratom-a82a011d6a0fc09375b6ae9b7814219293c15270.zip | |
Merge commit '5a7ab1f83c78c5783882b5ed57f87d5fa1b7ba60'
| -rw-r--r-- | waflib/extras/autowaf.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/waflib/extras/autowaf.py b/waflib/extras/autowaf.py index a4a06ba..be3bfe2 100644 --- a/waflib/extras/autowaf.py +++ b/waflib/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) |