X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=176b8ea670ff190dcc104ed4fc2c6caab5b8221f;hb=1a29b75bf774444ec182dfff8480a0c53597bf85;hp=623bbc7f399601d6beed3133d05a2331311cb92f;hpb=47be4c5261340d3e2ea208bb0b2d96fa256d829a;p=senf.git
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 623bbc7..176b8ea 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
#
@@ -45,198 +46,6 @@ import SCons.Defaults, SCons.Action
# The SENFSCons framework includes a series of builders. Each builder
# is defined in it's own package.
-# Tools to load in MakeEnvironment
-SCONS_TOOLS = [
- "Doxygen",
- "Dia2Png",
-]
-
-opts = None
-finalizers = []
-
-# This is the directory SENFSCons.py resides
-basedir = os.path.abspath(os.path.split(__file__)[0])
-
-## \brief Initialize configuration options
-# \internal
-def InitOpts():
- global opts
- if opts is not None: return
- opts = SCons.Options.Options('SConfig')
- 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(SCons.Options.BoolOption('final','Enable optimization',0))
-
-# A finalizer is any callable object. All finalizers will be called
-# in MakeEnvironment. We use them so every finalizer has knowledge of
-# all frameworks in use (e.g.: the boost runtime depends on the use of
-# stlport).
-
-## \brief Register finalizer
-# \internal
-def Finalizer(f):
- global finalizers
- finalizers.append(f)
-
-## \brief Initialize the use of the Boost library
-#
-# Configure the use of the Boost
-# libraries. Most of these libraries are header-only, some however
-# depend on a built library. The library selection is somewhat
-# involved and depends on the threading model and the type of build
-# (debug or final).
-#
-# \par Configuration Parameters:
-#
-# \c BOOST_INCLUDES | Include directory. |
-# \c BOOST_LIBDIR | Library directory |
-# \c BOOST_VARIANT | Complete variant specification |
-# \c BOOST_TOOLSET | Toolset to use |
-# \c BOOST_RUNTIME | Runtime to use |
-# \c BOOST_DEBUG_RUNTIME | Explicit debug runtime |
-#
-#
-# You can either specify \c BOOST_VARIANT explicitly or specify \c
-# BOOST_TOOLSET and \c BOOST_RUNTIME. If you give \c BOOST_TOOLSET, \c
-# BOOST_RUNTIME defaults to empty and \c BOOST_DEBUG_RUNTIME defaults
-# to \c gd, If \c BOOST_TOOLSET is specified and you have included
-# STLPort support (UseSTLPort()), then \c p is appended to both
-# runtimes.
-#
-# The Boost configuration can get realtively complex. If the boost
-# 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
-# documentation for a definition of the terms used above (toolset,
-# variant, runtime ...).
-#
-# \ingroup use
-def UseBoost():
- global opts
- InitOpts()
- opts.Add('BOOST_INCLUDES', 'Boost include directory', '')
- opts.Add('BOOST_VARIANT', 'The boost variant to use', '')
- opts.Add('BOOST_TOOLSET', 'The boost toolset to use', '')
- 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', '')
- Finalizer(FinalizeBoost)
-
-## \brief Finalize Boost environment
-# \internal
-def FinalizeBoost(env):
- env.Tool('BoostUnitTests', [basedir])
-
- if env['BOOST_TOOLSET']:
- runtime = ""
- if env['final'] : runtime += env.get('BOOST_RUNTIME','')
- else : runtime += env.get('BOOST_DEBUG_RUNTIME','gd')
- if env['STLPORT_LIB'] : runtime += "p"
- if runtime: runtime = "-" + runtime
- env['BOOST_VARIANT'] = "-" + env['BOOST_TOOLSET'] + runtime
-
- env['BOOSTTESTLIB'] = 'libboost_unit_test_framework' + env['BOOST_VARIANT']
-
- env.Append(LIBPATH = [ '$BOOST_LIBDIR' ],
- CPPPATH = [ '$BOOST_INCLUDES' ])
-
-## \brief Use STLPort as STL replacement if available
-#
-# Use STLPort as a replacement
-# for the system STL. STLPort has the added feature of providing fully
-# checked containers and iterators. This can greatly simplify
-# debugging. However, STLPort and Boost interact in a non-trivial way
-# so the configuration is relatively complex. This command does not
-# enforce the use of STLPort, it is only used if available.
-#
-# \par Configuration Parameters:
-#
-# \c STLPORT_INCLUDES | Include directory. |
-# \c STLPORT_LIBDIR | Library directory |
-# \c STLPORT_LIB | Name of STLPort library |
-# \c STLPORT_DEBUGLIB | Name of STLPort debug library |
-#
-#
-# If \c STLPORT_LIB is specified, \c STLPORT_DEBUGLIB defaults to \c
-# STLPORT_LIB with \c _stldebug appended. The STLPort library will
-# only be used, if \c STLPORT_LIB is set in \c SConfig.
-#
-# \ingroup use
-def UseSTLPort():
- global opts
- InitOpts()
- opts.Add('STLPORT_INCLUDES', 'STLport include directory', '')
- opts.Add('STLPORT_LIB', 'Name of the stlport library or empty to not use stlport', '')
- opts.Add('STLPORT_DEBUGLIB', 'Name of the stlport debug library','')
- opts.Add('STLPORT_LIBDIR', 'The directory of the stlport libraries','')
- Finalizer(FinalizeSTLPort)
-
-# \}
-
-## \brief Finalize STLPort environment
-# \internal
-def FinalizeSTLPort(env):
- if env['STLPORT_LIB']:
- if not env['STLPORT_DEBUGLIB']:
- env['STLPORT_DEBUGLIB'] = env['STLPORT_LIB'] + '_stldebug'
- env.Append(LIBPATH = [ '$STLPORT_LIBDIR' ],
- CPPPATH = [ '$STLPORT_INCLUDES' ])
- if env['final']:
- env.Append(LIBS = [ '$STLPORT_LIB' ])
- else:
- env.Append(LIBS = [ '$STLPORT_DEBUGLIB' ],
- CPPDEFINES = [ '_STLP_DEBUG' ])
-
-## \brief Build a configured construction environment
-#
-# This function is called after all frameworks are specified to build
-# a tailored construction environment. You can then use this
-# construction environment just like an ordinary SCons construction
-# environment (which it is ...)
-#
-# This call will set some default compilation parameters depending on
-# the \c final command line option: specifying final=1 will
-# built a release version of the code.
-def MakeEnvironment():
- global opts, finalizers
- InitOpts()
- env = SCons.Environment.Environment(options=opts)
- if SCons.Script.SConscript.Arguments.get('final'):
- env['final'] = 1
- env.Help(opts.GenerateHelpText(env))
-
- # We want to pass the SSH_AUTH_SOCK system env-var so we can ssh
- # into other hosts from within SCons rules. I have used rules like
- # this e.g. to automatically install stuff on a remote system ...
- if os.environ.has_key('SSH_AUTH_SOCK'):
- env.Append( ENV = { 'SSH_AUTH_SOCK': os.environ['SSH_AUTH_SOCK'] } )
-
- for finalizer in finalizers:
- finalizer(env)
-
- for tool in SCONS_TOOLS:
- env.Tool(tool, [basedir])
-
- # These are the default compilation parameters. We should probably
- # make these configurable
- env.Append(CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ],
- LOCALLIBDIR = [ '#' ],
- LIBPATH = [ '$LOCALLIBDIR' ])
-
- if env['final']:
- env.Append(CXXFLAGS = [ '-O3' ],
- CPPDEFINES = [ 'NDEBUG' ])
- else:
- env.Append(CXXFLAGS = [ '-O0', '-g', '-fno-inline' ],
- LINKFLAGS = [ '-g' ])
-
- env.Append(CPPDEFINES = [ '$EXTRA_DEFINES' ],
- LIBS = [ '$EXTRA_LIBS' ])
-
- return env
-
## \brief Find normal and test C++ sources
#
# GlobSources() will return a list of all C++ source files (named
@@ -244,11 +53,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 +98,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, [ 'true' ])
+ #env.Alias(env.File('test'), test)
+
## \brief Build object files
#
@@ -292,192 +144,119 @@ 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, [ 'true' ])
+ #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
-# the given \a doxyfile (which defaults to \c Doxyfile). The Doxygen
-# builder used supports automatic dependency generation (dependencies
-# are automatically generated from the parameters specified in the \a
-# doxyfile), automatic target emitters (the exact targets created are
-# found parsing the \a doxyfile) and lots of other features. See the
-# Doxygen builder documentation
-#
-# If \a extra_sources are given, the generated documentation will
-# depend on them. This can be used to build images or other
-# supplementary files.
-#
-# The doxygen target helper extends the builder with additional
-# functionality:
-#
-# \li Fix tagfiles by removing namespace entries. These entries only
-# work for namespaces completely defined in a single module. As
-# soon as another module (which references the tagfile) has it's
-# own members in that namespace, the crosslinking will break.
-# \li If \c DOXY_HTML_XSL is defined as a construction environment
-# variable, preprocess all generated html files (if html files are
-# 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
-# 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
-# generated files (which are more presentation oriented). if \c
-# DOXY_XREF_TYPES is given, it will specify the cross reference
-# types to support (defaults to \c bug and \c todo). See \xrefitem
-# in the doxygen documentation.
-#
# \ingroup target
def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
- # ARGHHH !!! without the [:] we are changing the target list
- # ||| WITHIN THE DOXYGEN BUILDER
- docs = env.Doxygen(doxyfile)[:]
- xmlnode = None
- htmlnode = None
- tagnode = None
- for doc in docs:
- if isinstance(doc,SCons.Node.FS.Dir): continue
- if doc.name == 'xml.stamp' : xmlnode = doc
- if doc.name == 'html.stamp' : htmlnode = doc
- if doc.name == 'search.idx' : continue
- if os.path.splitext(doc.name)[1] == '.stamp' : continue # ignore other file stamps
- # otherwise it must be the tag file
- tagnode = doc
-
- if tagnode:
- # Postprocess the tag file to remove the (broken) namespace
- # references
- env.AddPostAction(
- docs,
- SCons.Action.Action("xsltproc --nonet -o %(target)s.temp %(template)s %(target)s && mv %(target)s.temp %(target)s"
- % { 'target': tagnode.abspath,
- 'template': os.path.join(basedir,"tagmunge.xsl") }))
-
- if htmlnode and env.get('DOXY_HTML_XSL'):
- xslfile = env.File(env['DOXY_HTML_XSL'])
- reltopdir = '../' * len(htmlnode.dir.abspath[len(env.Dir('#').abspath)+1:].split('/'))
- if reltopdir : reltopdir = reltopdir[:-1]
- else : reltopdir = '.'
- env.AddPostAction(
- 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")
- % (htmlnode.dir.abspath, reltopdir, xslfile.abspath)))
- for doc in docs:
- 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" +
- " --stringparam module $MODULE" +
- " --stringparam type $TYPE" +
- " ${SOURCES[1]} $SOURCE || touch $TARGET" ],
- MODULE = xmlnode.dir.dir.dir.name,
- TYPE = type)
- env.SideEffect(xref, xmlnode)
- env.AddPreAction(docs, "rm -f %s" % (xref,))
- env.AddPostAction(docs, "test -r %s || touch %s" % (xref,xref))
- xrefs.extend(xref_pp)
- docs.extend(xrefs)
-
- env.Depends(docs,extra_sources)
- for doc in docs :
- env.Alias('all_docs', doc)
- env.Clean('all_docs', doc)
- env.Clean('all', doc)
-
- return docs
-
-## \brief Build combined doxygen cross-reference
-#
-# This command will build a complete cross-reference of \c xrefitems
-# accross all modules.
-#
-# Right now, this command is very project specific. It needs to be
-# generalized.
-#
-# \ingroup target
-def DoxyXRef(env, docs=None,
- HTML_HEADER = None, HTML_FOOTER = None,
- TITLE = "Cross-reference of action points"):
- if docs is 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",
- "cat $SOURCES >> $TARGET",
- "echo '' >>$TARGET" ])
-
- # Lastly we create the html file
- sources = [ xref, "%s/xrefhtml.xslt" % basedir ]
- if HTML_HEADER : sources.append(HTML_HEADER)
- if HTML_FOOTER : sources.append(HTML_FOOTER)
-
- 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")
- 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))
-
- xref = env.Command("doc/html/xref.html", sources, commands,
- TITLE = TITLE)
-
- env.Alias('all_docs',xref)
- return xref
-
-
-def DoxySearch(env, docs=None):
- if docs is None:
- docs = env.Alias('all_docs')[0].sources
- indices = [ doc for doc in docs if doc.name == "search.idx" ]
- commands = [ "echo '$TARGET" ]
- root = env.Dir('#').abspath
- commands.extend([ "echo '\"..%s/\",' >>$TARGET" % index.dir.abspath[len(root):]
- for index in indices ])
- commands.append("echo '); } ?>' >>$TARGET" )
- target = env.Command("doc/html/search_paths.php", indices, commands)
- env.Alias('all_docs', target)
- return target
-
+ # There is one small problem we need to solve with this builder: The Doxygen builder reads
+ # the Doxyfile and thus depends on the environment variables set by doclib/doxygen.sh. We
+ # thus have to provide all necessary definitions here manually via DOXYENV !
+
+ if type(doxyfile) is type(""):
+ doxyfile = env.File(doxyfile)
+
+ # Module name is derived from the doxyfile path
+ # Utils/Console/Doxyfile -> Utils_Console
+ module = doxyfile.dir.abspath[len(env.Dir('#').abspath)+1:].replace('/','_')
+ if not module : module = "Main"
+
+ # Rule to generate tagfile
+ # (need to exclude the 'clean' case, otherwise we'll have duplicate nodes)
+ if not env.GetOption('clean'):
+ tagfile = env.Doxygen(doxyfile,
+ DOXYOPTS = [ '--tagfile-name', '"${MODULE}.tag"',
+ '--tagfile' ],
+ DOXYENV = { 'TOPDIR' : env.Dir('#').abspath,
+ 'output_dir' : 'doc',
+ 'html_dir' : 'html',
+ 'html' : 'NO',
+ 'generate_tagfile': 'doc/${MODULE}.tag' },
+ MODULE = module )
+ env.Append(ALL_TAGFILES = tagfile[0].abspath)
+ env.Depends(tagfile, env.File('#/doclib/doxygen.sh'))
+
+ # Rule to generate HTML documentation
+ doc = env.Doxygen(doxyfile,
+ DOXYOPTS = [ '--tagfiles', '"$ALL_TAGFILES"',
+ '--tagfile-name', '"${MODULE}.tag"',
+ '--html' ],
+ MODULE = module,
+ DOXYENV = { 'TOPDIR' : env.Dir('#').abspath,
+ 'tagfiles' : '${ALL_TAGFILES}',
+ 'output_dir' : 'doc',
+ 'html_dir' : 'html',
+ 'html' : 'YES' } )
+ env.Depends(doc, env.File('#/doclib/doxygen.sh'))
+
+ # Copy the extra_sources (the images) into the documentation directory
+ # (need to exclude the 'clean' case otherwise there are multiple ways to clean the copies)
+ if not env.GetOption('clean'):
+ if extra_sources:
+ env.Depends(doc,
+ [ env.CopyToDir( source=source, target=doc[0].dir )
+ for source in extra_sources ])
+
+ # Install documentation into DOCINSTALLDIR
+ l = len(env.Dir('#').abspath)
+ env.Alias('install_all',
+ env.Command('$DOCINSTALLDIR' + doc[0].dir.abspath[l:], doc[0].dir,
+ [ SCons.Defaults.Copy('$TARGET','$SOURCE') ]))
+
+ # Useful aliases
+ env.Alias('all_docs', doc)
+ env.Clean('all_docs', doc)
+ env.Clean('all', doc)
+
+ return doc
## \brief Build library
#
@@ -489,14 +268,22 @@ def DoxySearch(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:
+ 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:
- lib = env.Library(env.File(LibPath(library)),objects)
- env.Default(lib)
- env.Append(ALLLIBS = library)
- return lib
+ 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
#
@@ -508,13 +295,25 @@ 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)
+
+def PhonyTarget(env, target, action, sources=[]):
+ env.AlwaysBuild(env.Alias(target, sources, env.Action(action)))