Further top-dir cleanup and lcov target

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 2192601..cabb4bc 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -3,20 +3,16 @@
 import sys, glob, os.path, fnmatch
 import SENFSCons, senfutil
 
-# Fix for SCons 0.97 compatibility
-try:
-    BoolVariable
-except NameError:
-    BoolVariable = BoolOption
-
 ###########################################################################
 # Load utilities and setup libraries and configure build
 
 env = Environment()
 
+env.Decider('MD5-timestamp')
+env.EnsureSConsVersion(1,2)
+
 # Load all the local SCons tools
 env.Tool('Doxygen')
-env.Tool('Doxygen')
 env.Tool('Dia2Png')
 env.Tool('PkgDraw')
 env.Tool('InstallSubdir')
@@ -42,15 +38,13 @@ debbin       Build debian binary package
 linklint     Check links of doxygen documentation with 'linklint'
 fixlinks     Fix broken links in doxygen documentation
 valgrind     Run all tests under valgrind/memcheck
+lcov         Generate test coverage output in doc/lcov and lcov.info
 """)
 
-env.Replace(
-   PKGDRAW                = 'doclib/pkgdraw',
-)
-
 env.Append(
-   ENV                    = { 'PATH' : os.environ.get('PATH') },
-   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],
+   ENV                    = { 'PATH' : os.environ.get('PATH'), 'HOME' : os.environ.get('HOME') },
+   CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*',
+                              '*.gcno', '*.gcda', '*.gcov' ],
 
    CPPPATH                = [ '#' ],
    LOCALLIBDIR            = '#',
@@ -101,10 +95,11 @@ env.Append(
 )
 
 env.SetDefault(
-    LIBSENF   = "senf",
-    final     = False,
-    debug     = False,
-    syslayout = False
+    LIBSENF           = "senf",
+    LCOV              = "lcov",
+    GENHTML           = "genhtml",
+    SCONS             = "./tools/scons -j$CONCURRENCY_LEVEL",
+    CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1,
 )
 
 # Set variables from command line
@@ -158,7 +153,12 @@ env.Default(conf)
 env.Install('$CONFINSTALLDIR', conf)
 
 #### install_all, default, all_tests, all
-env.Install('${SCONSINSTALLDIR}', 'site_scons/senfutil.py')
+env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py',
+                                    'site_scons/senfutil.py',
+                                    'site_scons/yaptu.py' ])
+env.InstallDir('${SCONSINSTALLDIR}', [ 'site_scons/site_tools', 'site_scons/lib' ],
+               FILTER_SUFFIXES=[ '','.css','.pl','.py','.sh','.sty','.xml','.xsl','.yap' ])
+env.Install('${INCLUDEINSTALLDIR}', 'boost')
 
 env.Alias('install_all', env.FindInstalledFiles())
 env.Alias('default', DEFAULT_TARGETS)
@@ -175,17 +175,27 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """
             echo;
             echo "Running $$test";
             echo;
-            valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup 
+            valgrind --tool=memcheck --error-exitcode=99 --suppressions=tools/valgrind.sup 
                 $$test $BOOSTTESTARGS;
             [ $$? -ne 99 ] || exit 1;
         done
 """.replace("\n"," ") ])
 
+### lcov
+env.Alias('lcov', env.AlwaysBuild(
+    env.Command( [ env.Dir('doc/lcov'), 'lcov.info' ], [], [
+        '$SCONS debug=1 CCFLAGS+="-fprofile-arcs -ftest-coverage" LIBS+="gcov" all_tests',
+        '$LCOV --directory . --capture --output-file /tmp/senf_lcov.info --base-directory .',
+        '$LCOV --output-file ${TARGETS[1]} --remove /tmp/senf_lcov.info \\*/include/\\*',
+        '$GENHTML --output-directory ${TARGETS[0]} --title all_tests ${TARGETS[1]}',
+        'rm /tmp/senf_lcov.info' ])))
+
 #### clean
 env.Clean('all', '.prepare-stamp')
 env.Clean('all', libsenf)
 env.Clean('all', env.Dir('linklint')) # env.Dir to disambiguate from linklint PhonyTarget
 env.Clean('all', env.Dir('dist'))
+env.Clean('all', 'lcov.info')
 
 if env.GetOption('clean'):
     env.Clean('all', [ os.path.join(path,f)