X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2FSConscript;h=b83c09c0e6db97e4e6eb9c0a8a21a724835ffd3a;hb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;hp=2bc4d08c6e29d8ff296d6b7ef0b9fa34e2b34365;hpb=b4514718b95485f26acb25e8aafceac0df29e89f;p=senf.git

diff --git a/doclib/SConscript b/doclib/SConscript
index 2bc4d08..b83c09c 100644
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -210,7 +210,7 @@ div.tabs li.$projectname a { background-color: #EDE497; }
       <li><a class="ext" href="http://openfacts2.berlios.de/wikien/index.php/BerliosProject:SENF_Network_Framework">Wiki</a></li>
       <li><a class="ext" href="http://developer.berlios.de/projects/senf">BerliOS</a></li>
       <li><a class="ext" href="http://svn.berlios.de/wsvn/senf/?op=log&rev=0&sc=0&isdir=1">ChangeLog</a></li>
-      <li><a class="ext" href="http://svn.berlios.de/viewcvs/senf/trunk/">Browse SVN</a></li>
+      <li><a class="ext" href="http://svn.berlios.de/wsvn/senf/trunk/">Browse SVN</a></li>
       <li><a class="ext" href="http://developer.berlios.de/bugs/?group_id=7489">Bug Tracker</a></li>
     </ul>
   </div>
@@ -238,7 +238,8 @@ FOOTER = """<hr style="width:0px;border:none;clear:both;margin:0;padding:0" />
 <div id="footer">
   <span>
     <a href="mailto:senf-dev@lists.berlios.de">Contact: senf-dev@lists.berlios.de</a> |
-    Copyright &copy; 2006 Fraunhofer Gesellschaft, SatCom, Stefan Bund
+    &copy; 2006-2010 <a href="http://www.fokus.fraunhofer.de/en/net/index.html">
+    Fraunhofer Institute for Open Communication Systems, Network Research</a>
   </span>
 </div>
 </body></html>"""
@@ -261,30 +262,23 @@ env.SetDefault(
     DOXYGEN = "doxygen"
 )
 
-env.Replace(
-    DOXYGENCOM = "site_scons/lib/doxygen.sh $DOXYOPTS $SOURCE",
-)
-
 env.Append( ENV = {
     'TODAY' : str(datetime.date.today()),
-    'DOXYGEN' : str(env.File(env['DOXYGEN'])),
 })
 
 env.PhonyTarget('linklint', [], [
-    'rm -rf linklint',
-    'linklint -doc linklint -limit 99999999 `find -type d -name html -printf "/%P/@ "`',
-    '[ ! -r linklint/errorX.html ] || python doclib/linklint_addnames.py <linklint/errorX.html >linklint/errorX.html.new',
-    '[ ! -r linklint/errorX.html.new ] || mv linklint/errorX.html.new linklint/errorX.html',
-    '[ ! -r linklint/errorAX.html ] || python doclib/linklint_addnames.py <linklint/errorAX.html >linklint/errorAX.html.new',
-    '[ ! -r linklint/errorAX.html.new ] || mv linklint/errorAX.html.new linklint/errorAX.html',
-    'echo -e "\\nLokal link check results: linklint/index.html\\nRemote link check results: linklint/urlindex.html\\n"',
+    'rm -rf doc/linklint',
+    'linklint -doc doc/linklint -limit 99999999 `find -type d -name html -printf "/%P/@ "`',
+    '[ ! -r doc/linklint/errorX.html ] || python doclib/linklint_addnames.py <doc/linklint/errorX.html >doc/linklint/errorX.html.new',
+    '[ ! -r doc/linklint/errorX.html.new ] || mv doc/linklint/errorX.html.new doc/linklint/errorX.html',
+    '[ ! -r doc/linklint/errorAX.html ] || python doclib/linklint_addnames.py <doc/linklint/errorAX.html >doc/linklint/errorAX.html.new',
+    '[ ! -r doc/linklint/errorAX.html.new ] || mv doc/linklint/errorAX.html.new doc/linklint/errorAX.html',
 ])
 
 env.PhonyTarget('fixlinks', [], [
-    'python doclib/fix-links.py -v -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt',
+    'python doclib/fix-links.py -v -s .svn -s linklint -s debian doc/linklint/errorX.txt doc/linklint/errorAX.txt',
 ])
 
-
 header = env.Command('doxy-header.html', 'SConscript', writeTemplate,
                      TEMPLATE = Literal(HEADER),
                      TITLE = "Documentation and API reference")
@@ -323,3 +317,5 @@ env.Clean('all', 'doxy-header.html') # I should not need this but I do ...
 env.Clean('all_docs', 'doxy-header.html') # I should not need this but I do ...
 
 env.Install('${DOCINSTALLDIR}', 'index.html')
+
+env.Depends(SENFSCons.Doxygen(env, output_directory="../doc"), env.Value(env['ENV']['REVISION']))