Correctly parse boolen command line arguments

[senf.git] / site_scons / SENFSCons.py

diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index b0d3442..c51cda0 100644 (file)
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -70,10 +70,11 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
         if env.GetOption('clean'):
             env.Depends(doc, extra_sources)
         else:
-            env.Depends(env.CopyToDir(doc[0].dir, extra_sources))
+            env.Depends(doc, env.CopyToDir(doc[0].dir, extra_sources))
 
     # Install documentation into DOCINSTALLDIR
-    env.Install(env.Dir('$DOCINSTALLDIR').Dir(doc[0].dir.dir.get_path(env.Dir('#'))), doc[0].dir)
+    env.InstallDir(env.Dir('$DOCINSTALLDIR').Dir(doc[0].dir.dir.get_path(env.Dir('#'))), doc[0].dir,
+                   FILTER_SUFFIXES=['.html','.css','.png','.php','.idx'])
 
     # Useful aliases
     env.Alias('all_docs', doc)
@@ -100,32 +101,34 @@ def AllIncludesHH(env, exclude=[]):
 # parameters with their actual value. Parameters are marked with ((name)) )
 
 def AutoRules(env, exclude=[], subdirs=[], doc_extra_sources = []):
-    import SENFSCons, glob, os.path
+    import SENFSCons
 
-    sources, tests, includes      = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
-    subscripts                    = glob.glob("*/SConscript")
+    sources, tests, includes = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
+    subscripts               = env.Glob("*/SConscript")
+    doxyfile                 = env.Glob("Doxyfile")
 
-    if sources                    : env.Append(ALLOBJECTS = env.Object(sources))
-    if tests                      : env.BoostUnitTest('test', tests)
-    if includes                   : env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
-    if os.path.exists("Doxyfile") : SENFSCons.Doxygen(env, extra_sources=((doc_extra_sources)) )
-    if subscripts                 : SConscript(glob.glob("*/SConscript"))
+    if sources               : env.Append(ALLOBJECTS = env.Object(sources))
+    if tests                 : env.BoostUnitTest('test', tests)
+    if includes              : env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
+    if doxyfile              : SENFSCons.Doxygen(env, extra_sources=((doc_extra_sources)) )
+    if subscripts            : SConscript(subscripts)
 
 
 def AutoPacketBundle(env, name, exclude=[], subdirs=[], doc_extra_sources=[]):
-    import SENFSCons, glob, os.path
+    import SENFSCons
 
-    sources, tests, includes      = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
-    subscripts                    = glob.glob("*/SConscript")
+    sources, tests, includes = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
+    subscripts               = env.Glob("*/SConscript")
+    doxyfile                 = env.Glob("Doxyfile")
 
     objects = env.Object(sources)
-    cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}', objects, NAME=((name)))
+    cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', objects, NAME=((name)))
 
     env.Default(cobject)
     env.Append(ALLOBJECTS = objects, PACKET_BUNDLES = cobject)
     env.Install('$OBJINSTALLDIR', cobject)
 
-    if tests                      : env.BoostUnitTest('test', tests + cobject)
-    if includes                   : env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
-    if os.path.exists("Doxyfile") : SENFSCons.Doxygen(env, extra_sources=((doc_extra_sources)) )
-    if subscripts                 : SConscript(glob.glob("*/SConscript"))
+    if tests                 : env.BoostUnitTest('test', tests + cobject)
+    if includes              : env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
+    if doxyfile              : SENFSCons.Doxygen(env, extra_sources=((doc_extra_sources)) )
+    if subscripts            : SConscript(subscripts)