X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=13be7552fc96a14240e27754115fc74fcee444a9;hb=e21a814c84efb8ba3a6a978c6907f3c401c649ff;hp=623bbc7f399601d6beed3133d05a2331311cb92f;hpb=47be4c5261340d3e2ea208bb0b2d96fa256d829a;p=senf.git diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py index 623bbc7..13be755 100644 --- a/senfscons/SENFSCons.py +++ b/senfscons/SENFSCons.py @@ -292,7 +292,7 @@ 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, LIBS = [], OBJECTS = []): if type(sources) == type(()): testSources = sources[1] sources = sources[0] @@ -307,6 +307,7 @@ def Objects(env, sources, testSources = None, LIBS = []): source = sources, test_source = testSources, LIBS = LIBS, + OBJECTS = OBJECTS, DEPENDS = [ env.File(LibPath(x)) for x in LIBS ]) env.Alias('all_tests', test) # Hmm ... here I'd like to use an Alias instead of a file @@ -342,7 +343,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 @@ -388,7 +389,7 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): 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" + + " | 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';" + @@ -396,7 +397,7 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): "done") % (htmlnode.dir.abspath, reltopdir, xslfile.abspath))) for doc in docs: - env.Depends(doc,xslfile) + env.Depends(doc, xslfile) if xmlnode: xrefs = [] @@ -407,7 +408,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): " --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,7 +417,7 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []): xrefs.extend(xref_pp) docs.extend(xrefs) - env.Depends(docs,extra_sources) + env.Depends(docs, extra_sources) for doc in docs : env.Alias('all_docs', doc) env.Clean('all_docs', doc) @@ -439,7 +441,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 +453,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) @@ -465,20 +486,6 @@ def DoxyXRef(env, docs=None, 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 - - ## \brief Build library # # This target helper will build the given library. The library will be @@ -489,8 +496,8 @@ 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) +def Lib(env, library, sources, testSources = None, LIBS = [], OBJECTS = []): + objects = Objects(env,sources,testSources,LIBS=LIBS,OBJECTS=OBJECTS) lib = None if objects: lib = env.Library(env.File(LibPath(library)),objects) @@ -498,6 +505,15 @@ def Lib(env, library, sources, testSources = None, LIBS = []): env.Append(ALLLIBS = library) return lib +## \brief Build Object from multiple sources +def Object(env, target, sources, testSources = None, LIBS = [], OBJECTS = []): + objects = Objects(env,sources,testSources,LIBS=LIBS,OBJECTS=OBJECTS) + ob = None + if objects: + ob = env.Command(target+".o", objects, "ld -r -o $TARGET $SOURCES") + env.Default(ob) + return ob + ## \brief Build executable # # This target helper will build the given binary. The \a sources, \a @@ -508,13 +524,13 @@ 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, LIBS = [], OBJECTS = []): + objects = Objects(env,sources,testSources,LIBS=LIBS,OBJECTS=OBJECTS) program = None if objects: progEnv = env.Copy() progEnv.Prepend(LIBS = LIBS) - program = progEnv.Program(target=binary,source=objects) + program = progEnv.Program(target=binary,source=objects+OBJECTS) env.Default(program) env.Depends(program, [ env.File(LibPath(x)) for x in LIBS ]) return program