X-Git-Url: http://g0dil.de/git?p=senf.git;a=blobdiff_plain;f=SConstruct;h=8566c0f91fb9cfb50203a2feb6dbce2ab9937db8;hp=873892bbdac0217cf986a409a917d03e2f2dec79;hb=HEAD;hpb=c1704e837e8bcf6b50da633326213f65cd5a8c46 diff --git a/SConstruct b/SConstruct index 873892b..8566c0f 100644 --- a/SConstruct +++ b/SConstruct @@ -1,6 +1,6 @@ # -*- python -*- -import sys, os.path, fnmatch +import sys, os.path import SENFSCons, senfutil ########################################################################### @@ -33,10 +33,25 @@ fixlinks Fix broken links in doxygen documentation all_valgrinds Run all tests under valgrind/memcheck lcov Generate test coverage output in doc/lcov and lcov.info -You may execute targets on a remote host (if the directory layout is the same) -by calling +The following additional targets may be called within subdirectories, either +using '$ scons -u ' or '$ scons /: - scons @[@] +test Build and run unit test for this module +doc Build the documentation of this module +valgrind Run the unit test of this module under valgrind + +When cleaning up using '$ scons -c ', some targets are handled specially: + +all Remove everything generated by the build including temporary and + backup files + +some Remove all files not needed for building like temporary or backup + files. This target is only valid when called as clean target. + +You may execute targets on a remote host via ssh (if the directory layout is the +same) by calling + + $ scons @[@] Some more elaborate unit tests may be enabled by setting appropritate variables in the shell (unix) environment @@ -66,12 +81,11 @@ env.Replace( env.Append( IMPORT_ENV = [ 'PATH', 'HOME', 'SSH_*', 'SENF*', 'CCACHE_*', 'DISTCC_*' ], - CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', - '.sconf_temp' ], + CLEAN_SOME_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache' ], + CLEAN_PATTERNS = [ '.sconsign*', '.sconf_temp' ], CPPPATH = [ '#', '$BUILDDIR', '${NEED_BOOST_EXT and "#/boost_ext" or None}' ], - LOCALLIBDIR = '$BUILDDIR', LIBPATH = [ '$LOCALLIBDIR' ], LIBS = [ '$EXTRA_LIBS' ], EXTRA_LIBS = [ 'rt' ], @@ -87,21 +101,26 @@ env.Append( '--param','large-function-growth=10000', '--param', 'large-function-insns=10000', '--param','inline-unit-growth=10000' ], - INLINE_OPTS_NORMAL = [ '-finline-limit=5000' ], - INLINE_OPTS = [ '$INLINE_OPTS_NORMAL' ], + INLINE_OPTS_GCC = [ '-finline-limit=5000', '--param', 'inline-unit-growth=60' ], + INLINE_OPTS = [ '${str(CXX).split("/")[-1] == "g++" and "$INLINE_OPTS_GCC" or None}' ], + CXXFLAGS_CLANG = [ '-Wno-unneeded-internal-declaration' ], # needed for BOOST_PARAMETER_KEYWORD CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS', - '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing' ], - CXXFLAGS_final = [ '-O3' ], + '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing', + "${profile and '-pg' or None}", + '${str(CXX).split("/")[-1] == "clang++" and "$CXXFLAGS_CLANG" or None}' ], + CXXFLAGS_final = [ '-O3', '-fno-threadsafe-statics','-fno-stack-protector', + "${profile and ' ' or '-ffunction-sections'}" ], CXXFLAGS_normal = [ '-O2', '-g' ], CXXFLAGS_debug = [ '-O0', '-g' ], CPPDEFINES = [ '$expandLogOption', '$CPPDEFINES_' ], - CPPDEFINES_final = [ 'SENF_PPI_NOTRACE', 'BOOST_NO_MT' ], + CPPDEFINES_final = [ 'SENF_PPI_NOTRACE', 'NDEBUG', + 'BOOST_NO_MT', 'BOOST_DISABLE_ASSERTS', 'BOOST_DISABLE_THREADS' ], CPPDEFINES_normal = [ 'SENF_DEBUG' ], CPPDEFINES_debug = [ '$CPPDEFINES_normal' ], - LINKFLAGS = [ '-rdynamic', '$LINKFLAGS_' ], - LINKFLAGS_final = [ ], + LINKFLAGS = [ '-rdynamic', '$LINKFLAGS_', "${profile and '-pg' or None}" ], + LINKFLAGS_final = [ "${profile and ' ' or '-Wl,--gc-sections'}" ], LINKFLAGS_normal = [ '-Wl,-S' ], LINKFLAGS_debug = [ '-g' ], ) @@ -116,6 +135,7 @@ env.SetDefault( SCONSINSTALLDIR = '$CONFINSTALLDIR/site_scons', BUILDDIR = '${FLAVOR and "#/build/$FLAVOR" or "#"}', + LOCALLIBDIR = '$BUILDDIR', LIBSENF = "senf", LCOV = "lcov", @@ -123,13 +143,15 @@ env.SetDefault( VALGRIND = "valgrind", SCONSBIN = env.File("#/tools/scons"), SCONSARGS = ([ '-Q', '-j$CONCURRENCY_LEVEL' ] + - [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ]), + [ '%s=%s' % (k,v) for k,v in ARGLIST ]), SCONS = "@$SCONSBIN $SCONSARGS", CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1, TOPDIR = env.Dir('#').abspath, LIBADDSUFFIX = '${FLAVOR and "_$FLAVOR" or ""}', OBJADDSUFFIX = '${LIBADDSUFFIX}', FLAVOR = '', + + PARSEFLAGS = '', ) # Set variables from command line @@ -137,6 +159,7 @@ senfutil.parseArguments( env, BoolVariable('final', 'Build final (optimized) build', False), BoolVariable('debug', 'Link in debug symbols', False), + BoolVariable('profile', 'compile and link with the profiling enabled option', False), BoolVariable('syslayout', 'Install in to system layout directories (lib/, include/ etc)', False), BoolVariable('sparse_tests', 'Link tests against object files and not the senf lib', False) ) @@ -160,9 +183,9 @@ SConscript('SConfigure') # Only add this here, after all configure checks have run -env.Append(LIBS = '$LIBSENF$LIBADDSUFFIX', - EXTRA_LIBS = [ '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', - '$BOOSTFSLIB' ]) +env.Append(LIBS = [ '$LIBSENF$LIBADDSUFFIX', + '$BOOSTREGEXLIB', '$BOOSTSIGNALSLIB', + '$BOOSTFSLIB', '$BOOSTSYSTEMLIB', '$BOOSTDATETIMELIB' ]) ########################################################################### @@ -201,7 +224,6 @@ if env['sparse_tests']: #### install_all, default, all_tests, all env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py', 'site_scons/senfutil.py', - 'site_scons/senfconf.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' ]) @@ -214,12 +236,13 @@ env.Alias('all_tests', env.FindAllBoostUnitTests()) env.Alias('test_changes', 'all_tests') env.Alias('all', [ 'default', 'all_tests', 'examples', 'all_docs' ]) -#### prepare +#### prepare and -c some env.PhonyTarget('prepare', [], []) +env.PhonyTarget('some', [], []) #### valgrind env.Alias('all_valgrinds') -if env['HAVE_VALGRIND']: +if env.get('HAVE_VALGRIND'): for test in env.FindAllBoostUnitTests(): stamp = env.Command(test[0].dir.File('.test-valgrind.stamp'), [ test[0].dir.File('.test.bin'), 'tools/valgrind.sup' ], @@ -235,27 +258,37 @@ if env['HAVE_VALGRIND']: ### lcov env.PhonyTarget('lcov', [], [ - '$SCONS debug=1 BUILDDIR="#/build/lcov" CCFLAGS+="-fprofile-arcs -ftest-coverage" LIBS+="gcov" all_tests', - '$LCOV --follow --directory $TOPDIR/build/lcov/senf --capture --output-file /tmp/senf_lcov.info --base-directory $TOPDIR', - '$LCOV --output-file lcov.info --remove /tmp/senf_lcov.info "*/include/*" "*/boost/*" "*.test.*" ', - '$GENHTML --output-directory doc/lcov --title all_tests lcov.info', + '$SCONS' + ' debug=1' + ' BUILDDIR="#/build/lcov"' + ' CCFLAGS+="-fprofile-arcs -ftest-coverage"' + ' LIBS+="gcov"' + ' all_tests', + '$LCOV' + ' --follow' + ' --directory $TOPDIR/build/lcov/senf' + ' --capture' + ' --output-file /tmp/senf_lcov.info' + ' --base-directory $TOPDIR', + '$LCOV' + ' --output-file lcov.info' + ' --remove /tmp/senf_lcov.info "*/include/*" "*/boost/*" "*.test.*"', + '$GENHTML' + ' --output-directory doc/lcov' + ' --title all_tests lcov.info', 'rm /tmp/senf_lcov.info' ]) -if env.GetOption('clean'): - 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.Dir('build/lcov') ]) +senfutil.CleanGlob(env, ['lcov','some','all'], [ '*.gcno', '*.gcda', '*.gcov' ]) +env.Clean(['lcov', 'all'], [ 'lcov.info', env.Dir('doc/lcov'), env.Dir('build/lcov') ]) #### clean + env.Clean('all', ('.prepare-stamp', env.Dir('dist'), env.Dir('build'))) -if env.GetOption('clean') : env.Depends('all', ('lcov', 'all_valgrinds')) + +senfutil.CleanGlob(env, 'all', '$CLEAN_PATTERNS') +senfutil.CleanGlob(env, ['some', 'all'], '$CLEAN_SOME_PATTERNS') if env.GetOption('clean') and 'all' in BUILD_TARGETS: - env.Clean('all', [ os.path.join(path,f) - for path, subdirs, files in os.walk('.') - for pattern in env['CLEAN_PATTERNS'] - for f in fnmatch.filter(files,pattern) ]) + env.Depends('all', ('lcov', 'all_valgrinds')) # Disable writing to the deleted .sconsign file import SCons.SConsign SCons.SConsign.write = lambda : None @@ -275,3 +308,10 @@ for target in COMMAND_LINE_TARGETS: args.append('-u') env.PhonyTarget(target, [], [ "ssh $HOST scons $SCONSARGS -C $DIR $RTARGET" ], HOST=host, RTARGET=realtarget, DIR=cwd, SCONSARGS=args) + +env.PhonyTarget('clean', [], [ + lambda **args: sys.stderr.write( + "=================================================================\n" + "'clean' is not a valid target, use the '-c' option instead:\n" + " $ scons -c all\n" + "=================================================================\n") ])