X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=d87f229e944c7f0b53d9d90749693c0cca20dd4b;hb=801aaf1479e7749b4b7e0de2dbe7a086cc4a4622;hp=623bbc7f399601d6beed3133d05a2331311cb92f;hpb=47be4c5261340d3e2ea208bb0b2d96fa256d829a;p=senf.git

diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 623bbc7..d87f229 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -450,14 +450,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 +483,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 '<?php function paths() { return array(' >$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