scons: Accept verbose=yes instead of quiet=no.

'verbose' is affirmative, and much more common name for this sort of option.

diff --git a/common.py b/common.py
index 052929e2bb087f95c335d31b0bbf2283b2df8ca3..f218e6f6c678b0c8f2538fdde007b870af2e3b3e 100644 (file)
--- 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 a2c690f655efd1de99b7817937491f74d1faed38..029f99b99463985862978f64817081aa337ea440 100644 (file)
--- 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