From 0d0417cc75c3f7047a783c42a76bf378d8ab1397 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 1 May 2009 16:12:17 +0100
Subject: scons: Don't use deprecated Options.

---
 common.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'common.py')

diff --git a/common.py b/common.py
index f1c6372abd..e57429eb75 100644
--- a/common.py
+++ b/common.py
@@ -46,13 +46,13 @@ else:
 
 def AddOptions(opts):
 	try:
-		from SCons.Options.BoolOption import BoolOption
-	except ImportError:
 		from SCons.Variables.BoolVariable import BoolVariable as BoolOption
-	try:
-		from SCons.Options.EnumOption import EnumOption
 	except ImportError:
+		from SCons.Options.BoolOption import BoolOption
+	try:
 		from SCons.Variables.EnumVariable import EnumVariable as EnumOption
+	except ImportError:
+		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'))
-- 
cgit v1.2.3


From 0f50c4fab8acfe291ddd426f331eea5eec66ba13 Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 2 Jun 2009 18:23:12 -0700
Subject: 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.
---
 common.py        |  2 +-
 scons/gallium.py | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'common.py')

diff --git a/common.py b/common.py
index e57429eb75..a687efc86f 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 c7e74d7e59..5e59636087 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']
-- 
cgit v1.2.3