X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2FSENFSCons.py;h=2691664b1c358b45c40dd4e027fc4de7eb0c08fb;hb=9a988902090d28007578e93bffd809f6bd913155;hp=9d243ce7803bc3e22cd3b08f8494fd4744b2c302;hpb=2d51a34f79dd18b23c54172444b2cc7433b8f5f0;p=senf.git
diff --git a/senfscons/SENFSCons.py b/senfscons/SENFSCons.py
index 9d243ce..2691664 100644
--- a/senfscons/SENFSCons.py
+++ b/senfscons/SENFSCons.py
@@ -5,7 +5,7 @@
# \brief Build helpers and utilities
#
# The SENFSCons package contains a number of build helpers and
-# utilities which are used to simplify commmon tasks.
+# utilities which are used to simplify commmon tasks.
#
# The utitlities of this package are grouped into:
#
- \ref use
- help using complex environments and
@@ -28,7 +28,7 @@ import SCons.Options, SCons.Environment, SCons.Script.SConscript, SCons.Node.FS
## \defgroup use Predefined Framework Configurators
#
# The following framework configurators are used in the top level \c
-# SConstruct file to simplify more complex configurations.
+# SConstruct file to simplify more complex configurations.
#
# Each of the framework configurators introduces additional
# configuration parameters to \ref sconfig
@@ -247,7 +247,7 @@ def GlobSources(exclude=[]):
testSources = glob.glob("*.test.cc")
sources = [ x for x in glob.glob("*.cc") if x not in testSources and x not in exclude ]
return (sources, testSources)
-
+
## \brief Add generic standard targets for every module
#
# This target helper should be called in the top-level \c SConstruct file
@@ -255,7 +255,7 @@ def GlobSources(exclude=[]):
# targets. Right now, these are
# \li clean up \c .sconsign, \c .sconf_temp and \c config.log on
# scons -c all
-#
+#
# \ingroup target
def StandardTargets(env):
env.Clean(env.Alias('all'), [ '.sconsign', '.sconf_temp', 'config.log' ])
@@ -399,7 +399,7 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = []):
xref = os.path.join(xmlnode.dir.abspath,type+".xml")
xref_pp = env.Command(xref+'i', [ xref, os.path.join(basedir,'xrefxtract.xslt'), xmlnode ],
[ "test -s $SOURCE && xsltproc -o $TARGET" +
- " --stringparam module $MODULE" +
+ " --stringparam module $MODULE" +
" --stringparam type $TYPE" +
" ${SOURCES[1]} $SOURCE || touch $TARGET" ],
MODULE = xmlnode.dir.dir.dir.name,
@@ -447,12 +447,12 @@ def DoxyXRef(env, docs=None,
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' ${SOURCES[1]} $SOURCE >> $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))
-
+
xref = env.Command("doc/html/xref.html", sources, commands,
TITLE = TITLE)