diff options
author | David Robillard <d@drobilla.net> | 2018-09-16 14:45:08 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-09-16 14:45:08 +0200 |
commit | a3565c5962039f776f5eaaacac7fcbe989a60970 (patch) | |
tree | c8d8e927249f1d824b74aa3a73834604793e6bf0 /waflib | |
parent | ba0c566fb126cfd5f28b9bc15a3a8f101619df2e (diff) | |
parent | d36a6bde8535ece85f89905fccac0c6b727b9e60 (diff) | |
download | sord-a3565c5962039f776f5eaaacac7fcbe989a60970.tar.gz sord-a3565c5962039f776f5eaaacac7fcbe989a60970.tar.bz2 sord-a3565c5962039f776f5eaaacac7fcbe989a60970.zip |
Merge commit 'd36a6bde8535ece85f89905fccac0c6b727b9e60'
Diffstat (limited to 'waflib')
-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) |