projects / senf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Merged revisions 262,264-265,267-282,284-298,300-311 via svnmerge from
[senf.git] / doclib / SConscript
diff --git a/doclib/SConscript b/doclib/SConscript
index 297ca82..61b7eba 100644 (file)
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -37,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 = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -53,13 +53,26 @@ div.tabs ul li.$projectname a { background-color: #EDE497; }
 <body>
 
 <div id="head">
-  <div id="search">
-    <form action="@TOPDIR@/doclib/search.php" method="get">
-      Search: <input type="text" name="query" size="20" accesskey="s"/> 
-    </form>
+  <div id="title">
+    <div id="title2">
+      <div id="search">
+        <form action="@TOPDIR@/doclib/search.php" method="get">
+          Search: <input type="text" name="query" size="20" accesskey="s"/> 
+        </form>
+      </div>
+      <h1>SENF Extensible Network Framework</h1>
+    </div>
+  </div>
+  <div id="subtitle">
+    <ul>
+      <li><a href="@TOPDIR@/doc/html/xref.html">Open Issues</a></li>
+      <li><a class="ext" href="http://svn.berlios.de/wsvn/senf/?op=log&rev=0&sc=0&isdir=1">SVN ChangeLog</a></li>
+      <li><a class="ext" href="http://developer.berlios.de/projects/senf">SENF @ BerliOS</a></li>
+      <li><a class="ext" href="http://openfacts.berlios.de/index-en.phtml?title=SENF+Network+Framework">Wiki</a></li>
+      <li><a href="@TOPDIR@/doc/html/index.html">Home</a></li>
+    </ul>
+    <h2>${TITLE}</h2>
   </div>
-  <h1>SENF Extensible Network Framework</h1>
-  <h2>${TITLE}</h2>
 </div>
 
 <div id="content1">
@@ -72,15 +85,7 @@ div.tabs ul li.$projectname a { background-color: #EDE497; }
       </ul>
     </div>"""
 
-OVERVIEW_EXTRA_HEADER="""
-    <div class="tabs">
-      <ul>
-      <li><a href="@TOPDIR@/doc/html/xref.html">Open Issues</a></li>
-        <li><a class="ext" href="http://svn.berlios.de/wsvn/senf/?op=log&rev=0&sc=0&isdir=1">SVN ChangeLog</a></li>
-        <li><a class="ext" href="http://developer.berlios.de/projects/senf">SENF @ BerliOS</a></li>
-        <li><a class="ext" href="http://openfacts.berlios.de/index-en.phtml?title=SENF+Network+Framework">Wiki</a></li>
-      </ul>
-    </div>"""
+OVERVIEW_EXTRA_HEADER=""
 
 FOOTER = """<hr style="width:0px;border:none;clear:both;margin:0;padding:0" />
   </div>
@@ -107,23 +112,23 @@ function paths() {
 }
 ?>"""
 
-env.Command('doxy-header.html', None, writeTemplate,
+env.Command('doxy-header.html', 'SConscript', writeTemplate,
             TEMPLATE = Literal(HEADER),
             TITLE = "Documentation and API reference")
-env.Command('doxy-header-overview.html', None, writeTemplate,
+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,
+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'
                             + "| sed"
                             +   r" -e 's/\[\[/<?/g' -e 's/\]\]/?>/g'"
                             +   r" -e 's/\$$projectname/Overview/g'"
                             +   r" -e 's/\$$title/Search results/g'"
-                            +       "> ${TARGET}.tmp",
+                            +       "> ${TARGETS[0]}.tmp",
                         'mv ${TARGET}.tmp ${TARGET}' ],
                       TEMPLATE = Literal(HEADER
                                          + OVERVIEW_EXTRA_HEADER
@@ -131,5 +136,5 @@ env.Alias('all_docs',
                                          + FOOTER),
                       TITLE = "Search results"))
 env.Alias('all_docs',
-          env.Command('search_paths.php', None, writeTemplate,
+          env.Command('search_paths.php', 'SConscript', writeTemplate,
                       TEMPLATE = Literal(SEARCH_PATHS_PHP)))
SENF git-svn repository