From: g0dil Date: Mon, 14 Sep 2009 14:58:13 +0000 (+0000) Subject: More 'scons -c' stuff X-Git-Url: http://g0dil.de/git?p=senf.git;a=commitdiff_plain;h=2a4fe188bb262a1affe14939111bd73f8dcbfed8 More 'scons -c' stuff git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1416 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/Examples/SConscript b/Examples/SConscript index 60c1337..b8e2767 100644 --- a/Examples/SConscript +++ b/Examples/SConscript @@ -15,7 +15,9 @@ for sconstruct in glob.glob("*/SConstruct"): [ '$SCONS -C $EXAMPLEDIR' ], 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' ]) + for dox in glob.glob("*/Doxyfile"): extra_sources = [ eval(line.split(':',1)[1]) diff --git a/SConstruct b/SConstruct index c64ab9a..8db781c 100644 --- a/SConstruct +++ b/SConstruct @@ -190,14 +190,15 @@ env.PhonyTarget('lcov', [], [ 'rm /tmp/senf_lcov.info' ]) 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 f in fnmatch.filter(files,pattern) ] + - [ 'lcov.info', env.Dir('doc/lcov') ]) + env.Clean('lcov', [ os.path.join(path,f) + for path, subdirs, files in os.walk('.') + 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'), 'lcov.info', env.Dir('doc/lcov') )) +env.Clean('all', ('.prepare-stamp', libsenf, env.Dir('dist'))) +if env.GetOption('clean') : env.Depends('all', ('lcov', 'all_valgrinds')) if env.GetOption('clean'): env.Clean('all', [ os.path.join(path,f)