Utils: Add some type traits in type_traits.hh

[senf.git] / doclib / SConscript

diff --git a/doclib/SConscript b/doclib/SConscript
index 66de21b..9cb4bac 100644 (file)
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -216,7 +216,7 @@ def indices():
              if doc.name == "search.idx" ]
 
 def writeTemplate(target = None, source = None, env = None):
-    file(target[0].abspath,"w").write(yaptu.process(str(env['TEMPLATE']), globals(), env.Dictionary()))
+    file(target[0].abspath,"w").write(source[0].read())
 
 writeTemplate = env.Action(writeTemplate, varlist = [ 'TEMPLATE' ])
 
@@ -304,13 +304,22 @@ function paths() {
 }
 ?>"""
 
-env.Command('doxy-header.html', 'SConscript', writeTemplate,
-            TEMPLATE = Literal(HEADER),
-            TITLE = "Documentation and API reference")
-env.Command('doxy-footer.html', 'SConscript', writeTemplate,
-            TEMPLATE = Literal(FOOTER))
+header = yaptu.process(HEADER, globals(), env.Dictionary(),
+                       TITLE = "Documentation and API reference")
+
+footer = yaptu.process(FOOTER, globals(), env.Dictionary())
+
+search_php = yaptu.process(HEADER + SEARCH_PHP.replace('<?','[[').replace('?>',']]') + FOOTER,
+                           globals(), env.Dictionary(),
+                           TITLE = "Search results")
+
+search_paths_php = yaptu.process(SEARCH_PATHS_PHP, globals(), env.Dictionary())
+
+env.Command('doxy-header.html', Value(header), writeTemplate)
+env.Command('doxy-footer.html', Value(footer), writeTemplate)
+
 env.Alias('all_docs',
-          env.Command('search.php', [ 'html-munge.xsl', 'SConscript' ],
+          env.Command('search.php', [ Value(search_php), 'html-munge.xsl' ],
                       [ writeTemplate,
                         'xsltproc --nonet --html --stringparam topdir .. -o - $SOURCE $TARGET 2>/dev/null'
                             + "| sed"
@@ -318,14 +327,10 @@ env.Alias('all_docs',
                             +   r" -e 's/\$$projectname/Overview/g'"
                             +   r" -e 's/\$$title/Search results/g'"
                             +       "> ${TARGETS[0]}.tmp",
-                        'mv ${TARGET}.tmp ${TARGET}' ],
-                      TEMPLATE = Literal(HEADER
-                                         + SEARCH_PHP.replace('<?','[[').replace('?>',']]')
-                                         + FOOTER),
-                      TITLE = "Search results"))
+                        'mv ${TARGET}.tmp ${TARGET}' ] ))
+
 env.Alias('all_docs',
-          env.Command('search_paths.php', 'SConscript', writeTemplate,
-                      TEMPLATE = Literal(SEARCH_PATHS_PHP)))
+          env.Command('search_paths.php', Value(search_paths_php), writeTemplate))
 
 env.Alias('install_all',
           env.Install( '$DOCINSTALLDIR/doclib', [ 'favicon.ico',