X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=8fd75038d457b58d3ce2b0529d7e48c8aeb815a5;hb=532240d72e09e19e57fac9bb55c2560b9c9e5b97;hp=10ca5f71c504252edb5d3d8156ffe3b95fde348a;hpb=532dab5ed9c5a51af5736e893e9b4a1af698bac4;p=senf.git diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py index 10ca5f7..8fd7503 100644 --- a/senfscons/SENFSCons.py +++ b/senfscons/SENFSCons.py @@ -25,6 +25,7 @@ import os.path, glob import SCons.Options, SCons.Environment, SCons.Script.SConscript, SCons.Node.FS import SCons.Defaults, SCons.Action +from SCons.Script import * ## \defgroup use Predefined Framework Configurators # @@ -49,6 +50,10 @@ import SCons.Defaults, SCons.Action SCONS_TOOLS = [ "Doxygen", "Dia2Png", + "PkgDraw", + "CopyToDir", + "ProgramNoScan", + "CompileCheck", ] opts = None @@ -66,7 +71,20 @@ 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') + opts.Add('INCLUDEINSTALLDIR', 'Include-file install dir', '$PREFIX/include') + opts.Add('OBJINSTALLDIR', 'Static object file install dir', '$LIBINSTALLDIR') + opts.Add('DOCINSTALLDIR', 'Documentation install dir', '$PREFIX/doc') + opts.Add('CPP_INCLUDE_EXTENSIONS', 'File extensions to include in source install', + [ '.h', '.hh', '.ih', '.mpp', '.cci', '.ct', '.cti', '.mpp' ]) + opts.Add('CPP_EXCLUDE_EXTENSIONS', 'File extensions to exclude from source install', + [ '.test.hh' ]) # A finalizer is any callable object. All finalizers will be called # in MakeEnvironment. We use them so every finalizer has knowledge of @@ -108,7 +126,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 ...). # @@ -122,6 +140,8 @@ def UseBoost(): opts.Add('BOOST_RUNTIME', 'The boost runtime to use', '') opts.Add('BOOST_DEBUG_RUNTIME', 'The boost debug runtime to use', '') opts.Add('BOOST_LIBDIR', 'The directory of the boost libraries', '') + opts.Add('BOOST_PREFIX', 'The prefix into which boost is installed', '') + opts.Add('BOOST_VERSION', 'The version of boost to use', '') Finalizer(FinalizeBoost) ## \brief Finalize Boost environment @@ -137,11 +157,27 @@ def FinalizeBoost(env): if runtime: runtime = "-" + runtime env['BOOST_VARIANT'] = "-" + env['BOOST_TOOLSET'] + runtime - env['BOOSTTESTLIB'] = 'libboost_unit_test_framework' + env['BOOST_VARIANT'] + if env['BOOST_VARIANT'] and env['BOOST_VERSION']: + env['BOOST_VARIANT'] = env['BOOST_VARIANT'] + '-%s' % env['BOOST_VERSION'].replace('.','_') + + env['BOOSTTESTLIB'] = 'boost_unit_test_framework' + env['BOOST_VARIANT'] + 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') + env['BOOST_INCLUDES'] = os.path.join(env['BOOST_PREFIX'], + 'include/boost-%s' + % env['BOOST_VERSION'].replace('.','_')) env.Append(LIBPATH = [ '$BOOST_LIBDIR' ], CPPPATH = [ '$BOOST_INCLUDES' ]) + if env['BOOST_LIBDIR']: + env.Append(ENV = { 'LD_LIBRARY_PATH': env['BOOST_LIBDIR'] }) + ## \brief Use STLPort as STL replacement if available # # Use STLPort as a replacement @@ -203,8 +239,13 @@ def MakeEnvironment(): global opts, finalizers InitOpts() env = SCons.Environment.Environment(options=opts) - if SCons.Script.SConscript.Arguments.get('final'): - env['final'] = 1 + env.Replace(**SCons.Script.SConscript.Arguments) + #for opt in opts.options: + # if SCons.Script.SConscript.Arguments.get(opt.key): + # env[opt.key] = SCons.Script.SConscript.Arguments.get(opt.key) + #if SCons.Script.SConscript.Arguments.get('final'): + # env['final'] = 1 + env.Help("\nSupported build variables (either in SConfig or on the command line:\n") env.Help(opts.GenerateHelpText(env)) # We want to pass the SSH_AUTH_SOCK system env-var so we can ssh @@ -221,19 +262,31 @@ def MakeEnvironment(): # These are the default compilation parameters. We should probably # make these configurable - env.Append(CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ], - LOCALLIBDIR = [ '#' ], + env.Append(LOCALLIBDIR = [ '#' ], LIBPATH = [ '$LOCALLIBDIR' ]) if env['final']: - env.Append(CXXFLAGS = [ '-O3' ], - CPPDEFINES = [ 'NDEBUG' ]) + env.Append(CXXFLAGS = [ '-O3' ]) + if env['profile']: + env.Append(CXXFLAGS = [ '-g', '-pg' ], + LINKFLAGS = [ '-g', '-pg' ]) else: - env.Append(CXXFLAGS = [ '-O0', '-g', '-fno-inline' ], - LINKFLAGS = [ '-g' ]) + # 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['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' ]) + LIBS = [ '$EXTRA_LIBS' ], + CXXFLAGS = [ '$EXTRA_CCFLAGS' ], + ALLOBJECTS = []) return env @@ -244,11 +297,31 @@ 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=[]): +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: + testSources += glob.glob(os.path.join(subdir,"*.test.cc")) + sources += [ x for x in glob.glob(os.path.join(subdir,"*.cc")) + 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 @@ -269,11 +342,34 @@ 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 -def LibPath(lib): return '$LOCALLIBDIR/lib%s.a' % lib +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 = [ '$LIBSENF$LIBADDSUFFIX' ], + OBJECTS = OBJECTS, + 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.Alias(env.File('test'), test) + ## \brief Build object files # @@ -292,30 +388,55 @@ def LibPath(lib): return '$LOCALLIBDIR/lib%s.a' % lib # provide both \a sources and \a testSources. # # \ingroup target -def Objects(env, sources, testSources = None, LIBS = []): +def Objects(env, sources, testSources = None, OBJECTS = []): if type(sources) == type(()): testSources = sources[1] sources = sources[0] + if type(sources) is not type([]): + sources = [ sources ] objects = None if sources: - objects = env.Object(sources) + obsources = [ source + for source in sources + if type(source) is type('') and not source.endswith('.o') ] + objects = [ source + for source in sources + if type(source) is not type('') or source.endswith('.o') ] + if obsources: + objects += env.Object(obsources) if testSources: - test = env.BoostUnitTests( + test = [ env.BoostUnitTests( target = 'test', - source = sources, - test_source = testSources, - LIBS = LIBS, - DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) + objects = objects, + test_sources = testSources, + LIBS = [ '$LIBSENF$LIBADDSUFFIX' ], + OBJECTS = OBJECTS, + DEPENDS = [ env.File(LibPath(env['LIBSENF'])) ]) ] + compileTestSources = [ src for src in testSources + if 'COMPILE_CHECK' in file(src).read() ] + if compileTestSources: + test.extend(env.CompileCheck(source = compileTestSources)) env.Alias('all_tests', test) # 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.Alias(env.File('test'), test) + env.Command(env.File('test'), test, []) + #env.Alias(env.File('test'), test) 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('#') + for f in files: + src = env.File(f) + env.Alias('install_all', env.Install(target.Dir(src.dir.get_path(base)), src)) + ## \brief Build documentation with doxygen # # The doxygen target helper will build software documentation using @@ -342,7 +463,7 @@ def Objects(env, sources, testSources = None, LIBS = []): # generated) by the given XSLT stylesheet. Since the HTML # generated by doxygen is broken, we first filter the code through # HTML-\c tidy and filter out some error messages. -# \li If xml output is generatedwe create files \c bug.xmli and \c +# \li If xml output is generated we create files \c bug.xmli and \c # todo.xmli which contain all bugs and todo items specified in the # sources. The format of these files is much more suited to # postprocessing and is a more database like format as the doxygen @@ -354,6 +475,8 @@ def Objects(env, sources, testSources = None, LIBS = []): # # \ingroup target def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): + if not 'all' in BUILD_TARGETS and not 'doc' in BUILD_TARGETS and not 'all_docs' in BUILD_TARGETS: + return [] # ARGHHH !!! without the [:] we are changing the target list # ||| WITHIN THE DOXYGEN BUILDER docs = env.Doxygen(doxyfile)[:] @@ -387,27 +510,27 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): docs, SCons.Action.Action(("for html in %s/*.html; do " + " echo $$html;" + - " sed -e 's/id=\"current\"/class=\"current\"/' $${html}" + - " | tidy -ascii -q --show-warnings no --fix-uri no" + - " | xsltproc --nonet --html --stringparam topdir %s -o $${html}.new %s - 2>&1" + - " | grep '^-'" + - " | grep -v 'ID .* already defined';" + - " mv $${html}.new $${html}; " + - "done") + " mv $${html} $${html}.orig;" + + " sed -e 's/id=\"current\"/class=\"current\"/' $${html}.orig" + + " | tidy -ascii -q --wrap 0 --show-warnings no --fix-uri no " + + " | sed -e 's/name=\"\([^\"]*\)\"\([^>]*\) id=\"\\1\"/name=\"\\1\"\\2/g'" + + " | xsltproc --novalid --nonet --html --stringparam topdir %s -o $${html} %s -;" + "done; true") % (htmlnode.dir.abspath, reltopdir, xslfile.abspath))) for doc in docs: - env.Depends(doc,xslfile) + env.Depends(doc, xslfile) if xmlnode: xrefs = [] for type in env.get("DOXY_XREF_TYPES",[ "bug", "todo" ]): xref = os.path.join(xmlnode.dir.abspath,type+".xml") xref_pp = env.Command(xref+'i', [ xref, os.path.join(basedir,'xrefxtract.xslt'), xmlnode ], - [ "test -s $SOURCE && xsltproc -o $TARGET" + + [ "test -s $SOURCE && xsltproc --nonet -o $TARGET" + " --stringparam module $MODULE" + " --stringparam type $TYPE" + " ${SOURCES[1]} $SOURCE || touch $TARGET" ], - MODULE = xmlnode.dir.dir.dir.name, + MODULE = xmlnode.dir.dir.dir.abspath[ + len(env.Dir('#').abspath)+1:], TYPE = type) env.SideEffect(xref, xmlnode) env.AddPreAction(docs, "rm -f %s" % (xref,)) @@ -415,12 +538,34 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): xrefs.extend(xref_pp) docs.extend(xrefs) - env.Depends(docs,extra_sources) + if extra_sources and htmlnode: + env.Depends(docs, + [ env.CopyToDir( source=source, target=htmlnode.dir ) + for source in extra_sources ]) + + if extra_sources and xmlnode: + env.Depends(docs, + [ env.CopyToDir( source=source, target=xmlnode.dir ) + for source in extra_sources ]) + + if not htmlnode and not xmlnode: + env.Depends(docs, extra_sources) + for doc in docs : env.Alias('all_docs', doc) env.Clean('all_docs', doc) env.Clean('all', doc) + l = len(env.Dir('#').abspath) + if htmlnode: + env.Alias('install_all', + 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:], + tagnode )) + return docs ## \brief Build combined doxygen cross-reference @@ -439,7 +584,8 @@ def DoxyXRef(env, docs=None, docs = env.Alias('all_docs')[0].sources xrefs = [ doc for doc in docs if os.path.splitext(doc.name)[1] == ".xmli" ] xref = env.Command("doc/html/xref.xml", xrefs, - [ "echo -e '\\n' >$TARGET", + [ "echo '' > $TARGET", + "echo '' >> $TARGET", "cat $SOURCES >> $TARGET", "echo '' >>$TARGET" ]) @@ -450,14 +596,32 @@ def DoxyXRef(env, docs=None, commands = [] if HTML_HEADER: - commands.append( - "sed -e 's/\\$$title/$TITLE/g' -e 's/\\$$projectname/Overview/g' ${SOURCES[2]} > $TARGET") - commands.append("xsltproc --stringparam title '$TITLE' --stringparam types '$DOXY_XREF_TYPES' ${SOURCES[1]} $SOURCE >> $TARGET") + commands.append("sed" + + " -e 's/\\$$title/$TITLE/g'" + + " -e 's/\\$$projectname/Overview/g'" + + " ${SOURCES[2]} > $TARGET") + commands.append("xsltproc" + + " --stringparam title '$TITLE'" + + " --stringparam types '$DOXY_XREF_TYPES'" + + " ${SOURCES[1]} $SOURCE >> $TARGET") if HTML_FOOTER: commands.append( "sed -e 's/\\$$title/$TITLE/g' -e 's/\\$$projectname/Overview/g' ${SOURCES[%d]} >> $TARGET" % (HTML_HEADER and 3 or 2)) + if env.get('DOXY_HTML_XSL'): + xslfile = env.File(env['DOXY_HTML_XSL']) + reltopdir = '../' * len(xref[0].dir.abspath[len(env.Dir('#').abspath)+1:].split('/')) + if reltopdir : reltopdir = reltopdir[:-1] + else : reltopdir = '.' + commands.append(("xsltproc -o ${TARGET}.tmp" + + " --nonet --html" + + " --stringparam topdir %s" + + " ${SOURCES[-1]} $TARGET 2>/dev/null") + % reltopdir) + commands.append("mv ${TARGET}.tmp ${TARGET}") + sources.append(xslfile) + xref = env.Command("doc/html/xref.html", sources, commands, TITLE = TITLE) @@ -475,14 +639,22 @@ 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 = Objects(env,sources,testSources,LIBS=LIBS) - 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) - return lib + env.Append(ALLOBJECTS = objects) + return objects + +## \brief Build Object from multiple sources +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) + env.Alias('install_all', env.Install("$OBJINSTALLDIR", ob)) + return ob ## \brief Build executable # @@ -494,13 +666,22 @@ def Lib(env, library, sources, testSources = None, LIBS = []): # construction environment parameters or the framework helpers. # # \ingroup target -def Binary(env, binary, sources, testSources = None, LIBS = []): - objects = Objects(env,sources,testSources,LIBS=LIBS) +def Binary(env, binary, sources, testSources = None, OBJECTS = []): + objects = Objects(env,sources,testSources,OBJECTS=OBJECTS) program = None if objects: - progEnv = env.Copy() - progEnv.Prepend(LIBS = LIBS) - program = progEnv.Program(target=binary,source=objects) + progEnv = env.Clone() + 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) + env.Alias('install_all', env.Install('$BININSTALLDIR', program)) 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)