From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 3 Jun 2009 01:23:12 +0000 (-0700)
Subject: scons: Output nice summary messages instead of long command lines.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f50c4fab8acfe291ddd426f331eea5eec66ba13;p=mesa.git

scons: Output nice summary messages instead of long command lines.

You can still get the old behavior by passing the option quiet=no to scons.
---

diff --git a/common.py b/common.py
index e57429eb75e..a687efc86fa 100644
--- a/common.py
+++ b/common.py
@@ -55,7 +55,7 @@ def AddOptions(opts):
 		from SCons.Options.EnumOption import EnumOption
 	opts.Add(BoolOption('debug', 'debug build', 'no'))
 	opts.Add(BoolOption('profile', 'profile build', 'no'))
-	#opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
+	opts.Add(BoolOption('quiet', 'quiet command lines', 'yes'))
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', default_platform,
diff --git a/scons/gallium.py b/scons/gallium.py
index c7e74d7e599..5e596360871 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -42,11 +42,17 @@ import SCons.Scanner
 def quietCommandLines(env):
     # Quiet command lines
     # See also http://www.scons.org/wiki/HidingCommandLinesInOutput
+    env['ASCOMSTR'] = "Assembling $SOURCE ..."
     env['CCCOMSTR'] = "Compiling $SOURCE ..."
+    env['SHCCCOMSTR'] = "Compiling $SOURCE ..."
     env['CXXCOMSTR'] = "Compiling $SOURCE ..."
+    env['SHCXXCOMSTR'] = "Compiling $SOURCE ..."
     env['ARCOMSTR'] = "Archiving $TARGET ..."
-    env['RANLIBCOMSTR'] = ""
+    env['RANLIBCOMSTR'] = "Indexing $TARGET ..."
     env['LINKCOMSTR'] = "Linking $TARGET ..."
+    env['SHLINKCOMSTR'] = "Linking $TARGET ..."
+    env['LDMODULECOMSTR'] = "Linking $TARGET ..."
+    env['SWIGCOMSTR'] = "Generating $TARGET ..."
 
 
 def createConvenienceLibBuilder(env):
@@ -185,9 +191,8 @@ def num_jobs():
 def generate(env):
     """Common environment generation code"""
 
-    # FIXME: this is already too late
-    #if env.get('quiet', False):
-    #    quietCommandLines(env)
+    if env.get('quiet', True):
+        quietCommandLines(env)
 
     # Toolchain
     platform = env['platform']