[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14173] trunk/blender: * BF_QUIET can now be set in user-config.py too.

[Nathan Letwory]

Revision: 14173
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14173
Author:   jesterking
Date:     2008-03-19 18:23:14 +0100 (Wed, 19 Mar 2008)

Log Message:
-----------
* BF_QUIET can now be set in user-config.py too.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/tools/btools.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2008-03-19 15:50:50 UTC (rev 14172)
+++ trunk/blender/SConstruct	2008-03-19 17:23:14 UTC (rev 14173)
@@ -286,7 +286,7 @@
 # default is new quieter output, but if you need to see the 
 # commands, do 'scons BF_QUIET=0'
 bf_quietoutput = B.arguments.get('BF_QUIET', '1')
-if bf_quietoutput=='1':
+if env['BF_QUIET']:
     B.set_quiet_output(env)
 else:
     if toolset=='msvc':

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2008-03-19 15:50:50 UTC (rev 14172)
+++ trunk/blender/tools/btools.py	2008-03-19 17:23:14 UTC (rev 14173)
@@ -6,7 +6,7 @@
 try:
     import subprocess
 except ImportError:
-	pass
+    pass
 import string
 import glob
 import shutil
@@ -59,7 +59,7 @@
             'WITHOUT_BF_INSTALL',
             'WITH_BF_OPENMP',
             'WITHOUT_BF_INSTALL',
-            'BF_FANCY',
+            'BF_FANCY', 'BF_QUIET'
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -251,7 +251,7 @@
         ('BF_FREETYPE_LIB', 'Freetype library', ''),
         ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''),
 
-	(BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', 'false')),
+        (BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', 'false')),
 
         (BoolOption('WITH_BF_QUICKTIME', 'Use QuickTime if true', 'false')),
         ('BF_QUICKTIME', 'QuickTime base path', ''),
@@ -293,7 +293,7 @@
         ('BF_DEBUG_FLAGS', 'Debug flags', ''),
 
         (BoolOption('BF_BSC', 'Create .bsc files (msvc only)', 'true')),
-        
+
         ('BF_BUILDDIR', 'Build dir', ''),
         ('BF_INSTALLDIR', 'Installation dir', ''),
 
@@ -306,7 +306,8 @@
         (BoolOption('BF_SPLIT_SRC', 'Split src lib into several chunks if true', 'false')),
         (BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', 'false')),
         (BoolOption('BF_FANCY', 'Enable fancy output if true', 'true')),
-		(BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')),
+        (BoolOption('BF_QUIET', 'Enable silent output if true', 'true')),
+        (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')),
 
     ) # end of opts.AddOptions()