More minor build cleanups

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1417 270642c3-0616-0410-b53a-bc976706d245

diff --git a/Examples/SConscript b/Examples/SConscript
index b8e2767..7350f38 100644 (file)
--- a/Examples/SConscript
+++ b/Examples/SConscript
@@ -16,7 +16,7 @@ for sconstruct in glob.glob("*/SConstruct"):
                         CONCURRENCY_LEVEL=1, EXAMPLEDIR=dir)
     env.Alias('examples', example)
     if env.GetOption('clean') and 'all' in BUILD_TARGETS or 'examples' in BUILD_TARGETS:
-        env.Clone(CONCURRENCY_LEVEL=1, EXAMPLEDIR=dir).Execute([ '.$SCONS -C $EXAMPLEDIR -c' ])
+        env.Clone(CONCURRENCY_LEVEL=1, EXAMPLEDIR=dir).Execute([ '$SCONS -C $EXAMPLEDIR -c' ])
                     
 
 for dox in glob.glob("*/Doxyfile"):

diff --git a/SConstruct b/SConstruct
index 8db781c..1dbe31c 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -43,8 +43,7 @@ lcov           Generate test coverage output in doc/lcov and lcov.info
 
 env.Append(
    ENV                    = { 'PATH' : os.environ.get('PATH'), 'HOME' : os.environ.get('HOME') },
-   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*',
-                              '*.gcno', '*.gcda', '*.gcov' ],
+   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],
 
    CPPPATH                = [ '#' ],
    LOCALLIBDIR            = '#',
@@ -99,7 +98,8 @@ env.SetDefault(
     LIBSENF           = "senf",
     LCOV              = "lcov",
     GENHTML           = "genhtml",
-    SCONS             = "./tools/scons -j$CONCURRENCY_LEVEL",
+    SCONSBIN          = env.File("#/tools/scons"),
+    SCONS             = "@$SCONSBIN -Q -j$CONCURRENCY_LEVEL",
     CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1,
     TOPDIR            = env.Dir('#').abspath,
 )
@@ -121,7 +121,7 @@ if not os.path.exists("doclib/Doxyfile.local"):
 
 if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \
    and not os.environ.get("SCONS") and COMMAND_LINE_TARGETS != [ 'prepare' ]:
-    env.Execute([ "scons prepare" ])
+    env.Execute([ "$(SCONS) prepare" ])
 
 # Load SConscripts
 
@@ -192,12 +192,12 @@ if env.GetOption('clean'):
     env.Depends('lcov', 'all_tests')
     env.Clean('lcov', [ os.path.join(path,f)
                         for path, subdirs, files in os.walk('.')
-                        for pattern in ['*.gcno', '*.gcda', '*.gcov']
+                        for pattern in ('*.gcno', '*.gcda', '*.gcov')
                         for f in fnmatch.filter(files,pattern) ] + 
                       [ 'lcov.info', env.Dir('doc/lcov') ])
     
 #### clean
-env.Clean('all', ('.prepare-stamp', libsenf, env.Dir('dist')))
+env.Clean('all', ('.prepare-stamp', env.Dir('dist')))
 if env.GetOption('clean') : env.Depends('all', ('lcov', 'all_valgrinds'))
 
 if env.GetOption('clean'):

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 0b932d4..9a4578b 100644 (file)
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -132,8 +132,9 @@ def SetupForSENF(env, senf_path = []):
         if not path.startswith('/') : sconspath = '#/%s' % path
         else                        : sconspath = path
         if os.path.exists(os.path.join(path,"senf/config.hh")):
-            print "\nUsing SENF in '%s'\n" \
-                % ('/..' in sconspath and os.path.abspath(path) or sconspath)
+            if not env.GetOption('no_progress'):
+                print "\nUsing SENF in '%s'\n" \
+                    % ('/..' in sconspath and os.path.abspath(path) or sconspath)
             env.Append( LIBPATH = [ sconspath ],
                         CPPPATH = [ sconspath ],
                         BUNDLEDIR = sconspath,
@@ -142,17 +143,20 @@ def SetupForSENF(env, senf_path = []):
             try:
                 env.MergeFlags(file(os.path.join(path,"senf.conf")).read())
             except IOError:
-                print "(SENF configuration file 'senf.conf' not found, assuming non-final SENF)"
+                if not env.GetOption('no_progress'):
+                    print "(SENF configuration file 'senf.conf' not found, assuming non-final SENF)"
                 env.Append(CPPDEFINES = [ 'SENF_DEBUG' ])
             break
         elif os.path.exists(os.path.join(path,"include/senf/config.hh")):
-            print "\nUsing system SENF in '%s/'\n" % sconspath
+            if not env.GetOption('no_progress'):
+                print "\nUsing system SENF in '%s/'\n" % sconspath
             env.Append(BUNDLEDIR = os.path.join(sconspath,"lib/senf"),
                        SENFDIR = sconspath,
                        SENFSYSLAYOUT = True)
             break
     else:
-        print "\nSENF library not found .. trying build anyway !!\n"
+        if not env.GetOption('no_progress'):
+            print "\nSENF library not found .. trying build anyway !!\n"
 
     env.Alias('all', '#')
 
@@ -199,7 +203,8 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
                 break
         tagfiles = []
         if senfdocdir is None:
-            print "(SENF documentation not found)"
+            if not env.GetOption('no_progress'):
+                print "(SENF documentation not found)"
         else:
             for dir, dirs, files in os.walk(senfdocdir):
                 tagfiles.extend([ os.path.join(dir,f) for f in files if f.endswith('.tag') ])