add optional 'limit' argument to read

[senf.git] / satscons / SatSCons.py

diff --git a/satscons/SatSCons.py b/satscons/SatSCons.py
index 12eb6cf..783500c 100644 (file)
--- a/satscons/SatSCons.py
+++ b/satscons/SatSCons.py
@@ -94,9 +94,9 @@ def MakeEnvironment():
     #return conf.Finish()
     return env
 
-def GlobSources():
+def GlobSources(exclude=[]):
     testSources = glob.glob("*.test.cc")
-    sources = [ x for x in glob.glob("*.cc") if x not in testSources ]
+    sources = [ x for x in glob.glob("*.cc") if x not in testSources and x not in exclude ]
     return (sources, testSources)
     
 def StandardTargets(env):
@@ -126,7 +126,7 @@ def Objects(env, sources, testSources = None, LIBS = []):
 
     if testSources:
         test = env.BoostUnitTests(
-            target = 'test.log',
+            target = 'test',
             source = sources,
             test_source = testSources,
             LIBS = LIBS,
@@ -139,14 +139,15 @@ def Objects(env, sources, testSources = None, LIBS = []):
 
     return objects
 
-def Doxygen(env, sources, testSources = None):
+def Doxygen(env, sources, testSources = None, target='doc', image = []):
     if type(sources) == type(()):
         testSources = sources[1]
         sources = sources[0]
 
     doc = env.Doxygen(
-        target = 'doc',
-        source = sources )
+        target = target,
+        source = sources,
+        image = image)
 
     env.Alias('all_docs', doc)
     return doc