X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2FSConscript;h=61b7eba64372d5701bfa4a9aa5c390a4e89ec59b;hb=52a1b4f399650138cdd7f5e111200ac5f6702be3;hp=ddaa95e59329e3bd7bbae29cd935d3a4349d603e;hpb=532dab5ed9c5a51af5736e893e9b4a1af698bac4;p=senf.git diff --git a/doclib/SConscript b/doclib/SConscript index ddaa95e..61b7eba 100644 --- a/doclib/SConscript +++ b/doclib/SConscript @@ -11,9 +11,10 @@ def modules(): global EXTRA_MODULES rv = [] ix = len(env.Dir('#').abspath)+1 + ex = dict((env.Dir(p).abspath,True) for n,p in EXTRA_MODULES) for module in env.Alias('all_docs')[0].sources: if module.name != 'html.stamp' : continue - if not [ x for x in EXTRA_MODULES if env.Dir(x[1]).abspath == module.dir.abspath]: + if not ex.get(module.dir.abspath): rv.append(('lib%s' % module.dir.dir.dir.name, module.dir.abspath[ix:])) rv.sort() return [ (name, env.Dir(path).abspath[ix:]) for name,path in EXTRA_MODULES ] + rv @@ -25,7 +26,7 @@ def indices(): if doc.name == "search.idx" ] def writeTemplate(target = None, source = None, env = None): - file(target[0].abspath,"w").write(yaptu.process(env['TEMPLATE'], globals(), env.Dictionary())) + file(target[0].abspath,"w").write(yaptu.process(str(env['TEMPLATE']), globals(), env.Dictionary())) writeTemplate = env.Action(writeTemplate, varlist = [ 'TEMPLATE' ]) @@ -36,7 +37,7 @@ writeTemplate = env.Action(writeTemplate, varlist = [ 'TEMPLATE' ]) EXTRA_MODULES = [ ('Overview', '#/doc/html'), ('Examples', '#/Examples/doc/html'), - ('SENFScons', '#/senfscons/doc/html') ] + ('SENFSCons', '#/senfscons/doc/html') ] HEADER = """ @@ -44,32 +45,48 @@ HEADER = """$title + """ -OVERVIEW_EXTRA_HEADER=""" -
- -
""" - SEARCH_PHP=""" """ @@ -98,32 +105,36 @@ SEARCH_PHP=""" SEARCH_PATHS_PHP="""""" -env.Command('doxy-header.html', None, writeTemplate, - TEMPLATE = HEADER, +env.Command('doxy-header.html', 'SConscript', writeTemplate, + TEMPLATE = Literal(HEADER), TITLE = "Documentation and API reference") -env.Command('doxy-header-overview.html', None, writeTemplate, - TEMPLATE = HEADER+OVERVIEW_EXTRA_HEADER, +env.Command('doxy-header-overview.html', 'SConscript', writeTemplate, + TEMPLATE = Literal(HEADER+OVERVIEW_EXTRA_HEADER), TITLE = "Introduction and Overview") -env.Command('doxy-footer.html', None, writeTemplate, - TEMPLATE = FOOTER) +env.Command('doxy-footer.html', 'SConscript', writeTemplate, + TEMPLATE = Literal(FOOTER)) env.Alias('all_docs', - env.Command('search.php', 'html-munge.xsl', + env.Command('search.php', [ 'html-munge.xsl', 'SConscript' ], [ writeTemplate, 'xsltproc --nonet --html --stringparam topdir .. -o - $SOURCE $TARGET 2>/dev/null' - + r'| sed -e "s/\[\[//g" > ${TARGET}.tmp', + + "| sed" + + r" -e 's/\[\[//g'" + + r" -e 's/\$$projectname/Overview/g'" + + r" -e 's/\$$title/Search results/g'" + + "> ${TARGETS[0]}.tmp", 'mv ${TARGET}.tmp ${TARGET}' ], - TEMPLATE = (HEADER - + OVERVIEW_EXTRA_HEADER - + SEARCH_PHP.replace('<','[[').replace('>',']]') - + FOOTER), + TEMPLATE = Literal(HEADER + + OVERVIEW_EXTRA_HEADER + + SEARCH_PHP.replace('',']]') + + FOOTER), TITLE = "Search results")) env.Alias('all_docs', - env.Command('search_paths.php', None, writeTemplate, - TEMPLATE = SEARCH_PATHS_PHP)) + env.Command('search_paths.php', 'SConscript', writeTemplate, + TEMPLATE = Literal(SEARCH_PATHS_PHP)))