X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=a93bab67df3084ea751f33e671cd39744d2ca0c5;hb=5fbfcae374466c0d8d631d93e1fd58a5b7eea7d3;hp=0719475ea083232dbe3ff2be476b69310f07d726;hpb=e898f807e2bdd260a0967051829fe307e2e4a0bd;p=senf.git diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py index 0719475..a93bab6 100644 --- a/senfscons/SENFSCons.py +++ b/senfscons/SENFSCons.py @@ -51,6 +51,7 @@ SCONS_TOOLS = [ "Dia2Png", "CopyToDir", "InstallIncludes", + "ProgramNoScan", ] opts = None @@ -118,7 +119,7 @@ def Finalizer(f): # libraries are provided by the distribution, you probably don't need # to specify any parameters. If your configuration is more complex, # refer to the Boost.Build +# href="http://www.boost.org/tools/build/v2/index.html">Boost.Build # documentation for a definition of the terms used above (toolset, # variant, runtime ...). # @@ -147,8 +148,9 @@ def FinalizeBoost(env): if runtime: runtime = "-" + runtime env['BOOST_VARIANT'] = "-" + env['BOOST_TOOLSET'] + runtime - env['BOOSTTESTLIB'] = 'libboost_unit_test_framework' + env['BOOST_VARIANT'] - env['BOOSTREGEXLIB'] = 'libboost_regex' + env['BOOST_VARIANT'] + env['BOOSTTESTLIB'] = 'boost_unit_test_framework' + env['BOOST_VARIANT'] + env['BOOSTREGEXLIB'] = 'boost_regex' + env['BOOST_VARIANT'] + env['BOOSTFSLIB'] = 'boost_filesystem' + env['BOOST_VARIANT'] env.Append(LIBPATH = [ '$BOOST_LIBDIR' ], CPPPATH = [ '$BOOST_INCLUDES' ]) @@ -245,10 +247,13 @@ def MakeEnvironment(): CPPDEFINES = [ 'NDEBUG' ]) else: env.Append(CXXFLAGS = [ '-O0', '-g', '-fno-inline' ], + # The boost-regex library is not compiled with _GLIBCXX_DEBUG so this fails. + # CPPDEFINES = [ '_GLIBCXX_DEBUG' ], LINKFLAGS = [ '-g' ]) env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ], - LIBS = [ '$EXTRA_LIBS' ]) + LIBS = [ '$EXTRA_LIBS' ], + ALLLIBS = []) return env @@ -288,7 +293,7 @@ def StandardTargets(env): # # \ingroup target def GlobalTargets(env): - env.Depends(env.Alias('all'),'#') + env.Alias('all', [ 'default', 'all_tests', 'all_docs' ]) ## \brief Return path of a built library within $LOCALLIBDIR # \internal @@ -320,14 +325,14 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []): objects = None if sources: - objects = env.Object([ - source - for source in sources - if not str(source).endswith('.o') ]) + [ - source - for source in sources - if str(source).endswith('.o') ] - + obsources = [ source + for source in sources + if not str(source).endswith('.o') ] + objects = [ source + for source in sources + if str(source).endswith('.o') ] + if obsources: + objects += env.Object(obsources) if testSources: test = env.BoostUnitTests( @@ -345,6 +350,16 @@ def Objects(env, sources, testSources = None, LIBS = [], OBJECTS = []): return objects +def InstallIncludeFiles(env, files): + # Hrmpf ... why do I need this in 0.97?? + if env.GetOption('clean'): + return + target = env.Dir(env['INCLUDEINSTALLDIR']) + base = env.Dir(env['INSTALL_BASE']) + for f in files: + src = env.File(f) + env.Alias('install_all', env.Install(target.Dir(src.dir.get_path(base)), src)) + def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes = False): if type(sources) is type(()): sources, testSources = sources @@ -353,8 +368,7 @@ def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes if type(testSources) is not type([]): testSources = [ testSources ] - installs = [] - installs.append( env.Install(dir, targets) ) + installs = [ env.Install(dir, targets) ] if not no_includes: target = env.Dir(env['INCLUDEINSTALLDIR']).Dir( @@ -362,7 +376,6 @@ def InstallWithSources(env, targets, dir, sources, testSources = [], no_includes source = targets if testSources: source.append( env.File('.test.bin') ) - installs.append(env.InstallIncludes( target = target, source = targets, @@ -491,8 +504,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): l = len(env.Dir('#').abspath) if htmlnode: env.Alias('install_all', - env.Install( '$DOCINSTALLDIR' + htmlnode.dir.dir.abspath[l:], - htmlnode.dir )) + env.Command('$DOCINSTALLDIR' + htmlnode.dir.abspath[l:], htmlnode.dir, + [ SCons.Defaults.Copy('$TARGET','$SOURCE') ])) if tagnode: env.Alias('install_all', env.Install( '$DOCINSTALLDIR' + tagnode.dir.abspath[l:], @@ -578,6 +591,7 @@ def Lib(env, library, sources, testSources = None, LIBS = [], OBJECTS = [], no_i lib = env.Library(env.File(LibPath(library)),objects) env.Default(lib) env.Append(ALLLIBS = library) + env.Alias('default', lib) install = InstallWithSources(env, lib, '$LIBINSTALLDIR', sources, testSources, no_includes) env.Alias('install_all', install) return lib @@ -589,6 +603,7 @@ def Object(env, target, sources, testSources = None, LIBS = [], OBJECTS = [], no if objects: ob = env.Command(target+".o", objects, "ld -r -o $TARGET $SOURCES") env.Default(ob) + env.Alias('default', ob) install = InstallWithSources(env, ob, '$OBJINSTALLDIR', sources, testSources, no_includes) env.Alias('install_all', install) return ob @@ -609,10 +624,18 @@ def Binary(env, binary, sources, testSources = None, LIBS = [], OBJECTS = [], no if objects: progEnv = env.Copy() progEnv.Prepend(LIBS = LIBS) - program = progEnv.Program(target=binary,source=objects+OBJECTS) + program = progEnv.ProgramNoScan(target=binary,source=objects+OBJECTS) env.Default(program) env.Depends(program, [ env.File(LibPath(x)) for x in LIBS ]) + env.Alias('default', program) install = InstallWithSources(env, program, '$BININSTALLDIR', sources, testSources, no_includes) env.Alias('install_all', install) return program + +def AllIncludesHH(env, headers): + headers.sort() + target = env.File("all_includes.hh") + file(target.abspath,"w").write("".join([ '#include "%s"\n' % f + for f in headers ])) + env.Clean('all', target)