X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2FSConscript;h=61b7eba64372d5701bfa4a9aa5c390a4e89ec59b;hb=52a1b4f399650138cdd7f5e111200ac5f6702be3;hp=c3303e3adf7add427f3d49f4587650ff5ce01581;hpb=801aaf1479e7749b4b7e0de2dbe7a086cc4a4622;p=senf.git diff --git a/doclib/SConscript b/doclib/SConscript index c3303e3..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,20 +45,34 @@ HEADER = """$title +