Module: Mesa
Branch: gallium-0.1
Commit: ebe4c35e440e8e1294e87abc638f00b393f33565
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebe4c35e440e8e1294e87abc638f00b393f33565
Author: José Fonseca <jfons...@vmware.com>
Date: Tue Jun 2 18:23:12 2009 -0700
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.
(cherry picked from commit 0f50c4fab8acfe291ddd426f331eea5eec66ba13)
---
common.py | 2 +-
scons/gallium.py | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/common.py b/common.py
index d5d258f..72c8434 100644
--- a/common.py
+++ b/common.py
@@ -54,7 +54,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', 'x86', 'x86_64')))
opts.Add(EnumOption('platform', 'target platform', default_platform,
diff --git a/scons/gallium.py b/scons/gallium.py
index 7f89cf0..78a8d50 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']
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
