X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=58a9841460aedeb676a6f16a8028db6a2e1865e0;hb=b89e3166f7680755683dccee5e48cb3a820185c0;hp=90a04ffb72f617ee5d1ab669b5945f3f86d7f4ae;hpb=e8217e1c096910e4cace3d22dbce9a257093ed18;p=senf.git diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py index 90a04ff..58a9841 100644 --- a/senfscons/SENFSCons.py +++ b/senfscons/SENFSCons.py @@ -50,8 +50,8 @@ from SCons.Script import * SCONS_TOOLS = [ "Doxygen", "Dia2Png", + "PkgDraw", "CopyToDir", - "InstallIncludes", "ProgramNoScan", "CompileCheck", ] @@ -71,8 +71,10 @@ def InitOpts(): opts.Add('CXX', 'C++ compiler to use', 'g++') opts.Add('EXTRA_DEFINES', 'Additional preprocessor defines', '') opts.Add('EXTRA_LIBS', 'Additional libraries to link against', '') + opts.Add('EXTRA_CCFLAGS', 'Additional compilation parameters', '') opts.Add(SCons.Options.BoolOption('final','Enable optimization',0)) opts.Add(SCons.Options.BoolOption('debug','Enable debug symbols in binaries',0)) + opts.Add(SCons.Options.BoolOption('profile','Enable profiling',0)) opts.Add('PREFIX', 'Installation prefix', '/usr/local') opts.Add('LIBINSTALLDIR', 'Library install dir', '$PREFIX/lib') opts.Add('BININSTALLDIR', 'Executable install dir', '$PREFIX/bin') @@ -162,6 +164,7 @@ def FinalizeBoost(env): env['BOOSTREGEXLIB'] = 'boost_regex' + env['BOOST_VARIANT'] env['BOOSTFSLIB'] = 'boost_filesystem' + env['BOOST_VARIANT'] env['BOOSTIOSTREAMSLIB'] = 'boost_iostreams' + env['BOOST_VARIANT'] + env['BOOSTSIGNALSLIB'] = 'boost_signals' + env['BOOST_VARIANT'] if env['BOOST_PREFIX']: env['BOOST_LIBDIR'] = os.path.join(env['BOOST_PREFIX'], 'lib') @@ -264,19 +267,26 @@ def MakeEnvironment(): if env['final']: env.Append(CXXFLAGS = [ '-O3' ]) + if env['profile']: + env.Append(CXXFLAGS = [ '-g', '-pg' ], + LINKFLAGS = [ '-g', '-pg' ]) else: # The boost-regex library is not compiled with _GLIBCXX_DEBUG so this fails: # CPPDEFINES = [ '_GLIBCXX_DEBUG' ], env.Append(CXXFLAGS = [ '-O0', '-g' ], CPPDEFINES = { 'SENF_DEBUG': ''}) - if env['debug']: + if env['profile']: + env.Append(CXXFLAGS = [ '-pg' ], + LINKFLAGS = [ '-pg' ]) + if env['debug'] or env['profile']: env.Append(LINKFLAGS = [ '-g', '-rdynamic' ]) else: env.Append(LINKFLAGS = [ '-Wl,-S', '-rdynamic' ]) env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ], LIBS = [ '$EXTRA_LIBS' ], - ALLLIBS = []) + CXXFLAGS = [ '$EXTRA_CCFLAGS' ], + ALLOBJECTS = []) return env @@ -287,7 +297,7 @@ def MakeEnvironment(): # in the current directory. The sources will be returned as a tuple of # sources, test-sources. The target helpers all accept such a tuple as # their source argument. -def GlobSources(exclude=[], subdirs=[]): +def GlobSources(env, exclude=[], subdirs=[]): testSources = glob.glob("*.test.cc") sources = [ x for x in glob.glob("*.cc") if x not in testSources and x not in exclude ] for subdir in subdirs: @@ -296,6 +306,22 @@ def GlobSources(exclude=[], subdirs=[]): if x not in testSources and x not in exclude ] return (sources, testSources) +def GlobIncludes(env, exclude=[], subdirs=[]): + includes = [] + for d in [ '.' ] + subdirs: + for f in os.listdir(d): + ext = '.' + f.split('.',1)[-1] + p = os.path.join(d,f) + if ext in env['CPP_INCLUDE_EXTENSIONS'] \ + and ext not in env['CPP_EXCLUDE_EXTENSIONS'] \ + and p not in exclude: + includes.append(p) + return includes + +def Glob(env, exclude=[], subdirs=[]): + return ( GlobSources(env, exclude, subdirs), + GlobIncludes(env, exclude, subdirs) ) + ## \brief Add generic standard targets for every module # # This target helper should be called in the top-level \c SConstruct file @@ -322,20 +348,26 @@ def GlobalTargets(env): # \internal def LibPath(lib): return '${LOCALLIBDIR}/${LIBPREFIX}%s${LIBADDSUFFIX}${LIBSUFFIX}' % lib +## \brief Add explicit test +# +# This target helper will add an explicit test. This is like a unit test but is +# built directly against the completed library +# +# \ingroup target def Test(env, sources, LIBS = [], OBJECTS = []): test = [ env.BoostUnitTests( target = 'test', objects = [], test_sources = sources, - LIBS = [ x + '$LIBADDSUFFIX' for x in LIBS ], + LIBS = [ '$LIBSENF$LIBADDSUFFIX' ], OBJECTS = OBJECTS, - DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) ] + DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ] compileTestSources = [ src for src in sources if 'COMPILE_CHECK' in file(src).read() ] if compileTestSources: test.extend(env.CompileCheck(source = compileTestSources)) env.Alias('all_tests', test) - env.Command(env.File('test'), test, []) + env.Command(env.File('test'), test, [ 'true' ]) #env.Alias(env.File('test'), test) @@ -356,7 +388,7 @@ def Test(env, sources, LIBS = [], OBJECTS = []): # provide both \a sources and \a testSources. # # \ingroup target -def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = [], no_includes = False): +def Objects(env, sources, testSources = None, OBJECTS = []): if type(sources) == type(()): testSources = sources[1] sources = sources[0] @@ -379,9 +411,9 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = [], no_includ target = 'test', objects = objects, test_sources = testSources, - LIBS = [ x + '$LIBADDSUFFIX' for x in LIBS ], + LIBS = [ '$LIBSENF$LIBADDSUFFIX' ], OBJECTS = OBJECTS, - DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) ] + DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ] compileTestSources = [ src for src in testSources if 'COMPILE_CHECK' in file(src).read() ] if compileTestSources: @@ -390,7 +422,7 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = [], no_includ # Hmm ... here I'd like to use an Alias instead of a file # however the alias does not seem to live in the subdirectory # which breaks 'scons -u test' - env.Command(env.File('test'), test, []) + env.Command(env.File('test'), test, [ 'true' ]) #env.Alias(env.File('test'), test) return objects @@ -400,40 +432,11 @@ def InstallIncludeFiles(env, files): if env.GetOption('clean'): return target = env.Dir(env['INCLUDEINSTALLDIR']) - base = env.Dir(env['INSTALL_BASE']) + base = env.Dir('#') for f in files: src = env.File(f) env.Alias('install_all', env.Install(target.Dir(src.dir.get_path(base)), src)) -def InstallSourceIncludes(env, sources): - target = env.Dir(env['INCLUDEINSTALLDIR']).Dir( - env.Dir('.').get_path(env.Dir(env['INSTALL_BASE']))) - install = env.InstallIncludes( target = target, - source = [ type(x) is str and env.File(x) or x - for x in sources ], - INSTALL_BASE = env.Dir('.') ) - env.Alias( 'install_all', install ) - -def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes = False): - if type(sources) is type(()): - sources, testSources = sources - if type(sources) is not type([]): - sources = [ sources ] - if type(testSources) is not type([]): - testSources = [ testSources ] - - installs = [ env.Install(dir, targets) ] - env.Alias( 'install_all', installs[:] ) - - if not no_includes: - sources = targets - if testSources: - sources.append( env.File('.test.bin') ) - installs.append( - InstallSourceIncludes(env, sources)) - - return installs - ## \brief Build documentation with doxygen # # The doxygen target helper will build software documentation using @@ -636,26 +639,21 @@ def DoxyXRef(env, docs=None, # The library is added to the list of default targets. # #\ingroup target -def Lib(env, library, sources, testSources = None, LIBS = [], OBJECTS = [], no_includes = False): - objects = Objects(env,sources,testSources,LIBS=LIBS,OBJECTS=OBJECTS) - lib = None +def Lib(env, sources, testSources = None, OBJECTS = []): + objects = Objects(env,sources,testSources,OBJECTS=OBJECTS) if objects: - lib = env.Library(env.File(LibPath(library)),objects) - env.Default(lib) - env.Append(ALLLIBS = library) - env.Alias('default', lib) - InstallWithSources(env, lib, '$LIBINSTALLDIR', sources, testSources, no_includes) - return lib + env.Append(ALLOBJECTS = objects) + return objects ## \brief Build Object from multiple sources -def Object(env, target, sources, testSources = None, LIBS = [], OBJECTS = [], no_includes = False): - objects = Objects(env,sources,testSources,LIBS=LIBS,OBJECTS=OBJECTS) +def Object(env, target, sources, testSources = None, OBJECTS = []): + objects = Objects(env,sources,testSources,OBJECTS=OBJECTS) ob = None if objects: ob = env.Command(target+"${OBJADDSUFFIX}${OBJSUFFIX}", objects, "ld -r -o $TARGET $SOURCES") env.Default(ob) env.Alias('default', ob) - InstallWithSources(env, ob, '$OBJINSTALLDIR', sources, testSources, no_includes) + env.Alias('install_all', env.Install("$OBJINSTALLDIR", ob)) return ob ## \brief Build executable @@ -668,17 +666,17 @@ def Object(env, target, sources, testSources = None, LIBS = [], OBJECTS = [], no # construction environment parameters or the framework helpers. # # \ingroup target -def Binary(env, binary, sources, testSources = None, LIBS = [], OBJECTS = [], no_includes = False): - objects = Objects(env,sources,testSources,LIBS=LIBS,OBJECTS=OBJECTS) +def Binary(env, binary, sources, testSources = None, OBJECTS = []): + objects = Objects(env,sources,testSources,OBJECTS=OBJECTS) program = None if objects: progEnv = env.Clone() - progEnv.Prepend(LIBS = [ x + '$LIBADDSUFFIX' for x in LIBS ]) + progEnv.Prepend(LIBS = [ '$LIBSENF$LIBADDSUFFIX' ]) program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS) env.Default(program) - env.Depends(program, [ env.File(LibPath(x)) for x in LIBS ]) + env.Depends(program, [ env.File(LibPath(env['LIBSENF'])) ]) env.Alias('default', program) - InstallWithSources(env, program, '$BININSTALLDIR', sources, testSources, no_includes) + env.Alias('install_all', env.Install('$BININSTALLDIR', program)) return program def AllIncludesHH(env, headers):