From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Tue, 1 Sep 2009 09:44:50 +0000 (+0000)
Subject: senfutil.Doxygen build fixes
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=de97cc493bbab2ce26c205b2e32be8551c536e59;p=senf.git

senfutil.Doxygen build fixes

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1363 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/site_scons/lib/Doxyfile.yap b/site_scons/lib/Doxyfile.yap
index 44c1bf4..22d5763 100644
--- a/site_scons/lib/Doxyfile.yap
+++ b/site_scons/lib/Doxyfile.yap
@@ -99,6 +99,7 @@ EXPAND_AS_DEFINED      = prefix_ \
 EXTERNAL_GROUPS        = NO
 
 HAVE_DOT               = YES
+CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = NO
 GROUP_GRAPHS           = NO
 GRAPHICAL_HIERARCHY    = NO
@@ -108,7 +109,7 @@ MAX_DOT_GRAPH_DEPTH    = 5
 DOT_MULTI_TARGETS      = YES
 DOT_CLEANUP            = NO
 
-SEARCHENGINE           = YES
+SEARCHENGINE           = NO
 
 ###########################################################################
 # The following options are MANDATORY to integrate with the build system
diff --git a/site_scons/lib/dot b/site_scons/lib/dot
index c6bdbe4..e828655 100755
--- a/site_scons/lib/dot
+++ b/site_scons/lib/dot
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-topdir="`dirname "$0"`"; topdir="`cd "$topdir/.."; pwd`"
+base="`dirname "$0"`"; base="`cd "$base"; pwd`"
 if head -4 "$1" | grep -q nomunge; then
     dot "$@"
     exit $?
 fi
 sed -i -e 's/rankdir=LR/rankdir=TB/' "$1"
-"$topdir/doclib/dot-munge.pl" "$1"
+"$base/dot-munge.pl" "$1"
 unflatten -l2 -c2 -f -o "$1".unflat "$1"
 mv "$1".unflat "$1"
 
diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 55665dc..4028a04 100644
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -95,11 +95,6 @@ def SetupForSENF(env, senf_paths = []):
         LOGLEVELS_        = BuildTypeOptions('LOGLEVELS'),
         )
 
-    rev = 'unknown'
-    if os.path.isdir('.svn'):
-        rev = 'r'+os.popen('svnversion').read().strip().lower()
-    elif os.path.isdir('.git'):
-        rev = 'r'+os.popen('gitsvnversion').read().strip().lower()
     env.SetDefault( 
         CXXFLAGS_final    = [],
         CXXFLAGS_normal   = [],
@@ -121,7 +116,6 @@ def SetupForSENF(env, senf_paths = []):
         DOCLINKS          = [],
         PROJECTEMAIL      = "nobody@nowhere.org",
         COPYRIGHT         = "nobody",
-        REVISION          = rev,
         )
 
     # Interpret command line options