diff options
| author | José Fonseca <[email protected]> | 2011-06-17 18:42:39 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2011-06-17 20:13:16 +0100 |
| commit | c7bd0fa4851187c3102948f5f4d70c26d1b55a5e (patch) | |
| tree | ae1738a52ba0f1a09bfda460b14e54fb7d19347a | |
| parent | bf69ce37f0dcbb479078ee676d5100ac63e20750 (diff) | |
scons: Accept verbose=yes instead of quiet=no.
'verbose' is affirmative, and much more common name for this sort of option.
| -rw-r--r-- | common.py | 3 | ||||
| -rw-r--r-- | scons/custom.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common.py b/common.py index 052929e2bb0..f218e6f6c67 100644 --- a/common.py +++ b/common.py @@ -79,7 +79,7 @@ def AddOptions(opts): from SCons.Options.EnumOption import EnumOption opts.Add(EnumOption('build', 'build type', 'debug', allowed_values=('debug', 'checked', 'profile', 'release'))) - opts.Add(BoolOption('quiet', 'quiet command lines', 'yes')) + opts.Add(BoolOption('verbose', 'verbose output', 'no')) opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine, allowed_values=('generic', 'ppc', 'x86', 'x86_64'))) opts.Add(EnumOption('platform', 'target platform', host_platform, @@ -90,4 +90,5 @@ def AddOptions(opts): opts.Add(BoolOption('llvm', 'use LLVM', default_llvm)) opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes')) opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no')) + opts.Add(BoolOption('quiet', 'DEPRECATED: quiet command lines', 'yes')) opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0'))) diff --git a/scons/custom.py b/scons/custom.py index a2c690f655e..029f99b9946 100644 --- a/scons/custom.py +++ b/scons/custom.py @@ -157,7 +157,8 @@ def createCodeGenerateMethod(env): def generate(env): """Common environment generation code""" - if env.get('quiet', True): + verbose = env.get('verbose', False) or not env.get('quiet', True) + if not verbose: quietCommandLines(env) # Custom builders and methods |