X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=common.py;h=b836a8b41dbfeb78054d1f2a5aca2cc866b6cae7;hb=22cbf6a70437dfa12c10600e5a496ea5771cfc56;hp=b65ed7eaaa760c815cee315eb4d3dfeb2760d2b8;hpb=7a678556d4311168ac1dacdd613eb7b94684e443;p=mesa.git

diff --git a/common.py b/common.py
index b65ed7eaaa7..b836a8b41db 100644
--- a/common.py
+++ b/common.py
@@ -43,19 +43,30 @@ else:
 #######################################################################
 # Common options
 
-def Options():
-	from SCons.Options import Options
+def AddOptions(opts):
 	from SCons.Options.BoolOption import BoolOption
 	from SCons.Options.EnumOption import EnumOption
-	opts = Options('config.py')
 	opts.Add(BoolOption('debug', 'build debug version', 'no'))
+	#opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
 	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,
 											 allowed_values=('linux', 'cell', 'winddk')))
 	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
 	opts.Add(BoolOption('dri', 'build DRI drivers', default_dri))
-	return opts
+
+
+#######################################################################
+# Quiet command lines
+#
+# See also http://www.scons.org/wiki/HidingCommandLinesInOutput
+
+def quietCommandLines(env):
+	env['CCCOMSTR'] = "Compiling $SOURCE ..."
+	env['CXXCOMSTR'] = "Compiling $SOURCE ..."
+	env['ARCOMSTR'] = "Archiving $TARGET ..."
+	env['RANLIBCOMSTR'] = ""
+	env['LINKCOMSTR'] = "Linking $TARGET ..."
 
 
 #######################################################################
@@ -114,3 +125,16 @@ def make_build_dir(env):
 	env.SConsignFile(os.path.join(build_dir, '.sconsign'))
 	return build_dir
 
+
+#######################################################################
+# Common environment generation code
+
+def generate(env):
+	# FIXME: this is already too late
+	#if env.get('quiet', False):
+	#	quietCommandLines(env)
+	createConvenienceLibBuilder(env)
+
+	# for debugging
+	#print env.Dump()
+