X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=doclib%2FSConscript;h=2bc4d08c6e29d8ff296d6b7ef0b9fa34e2b34365;hb=17b707d5ed5741bcbeba233eeb1efacecd990176;hp=fc811cd48ecc1ff286cad5e244008462c27d8d2e;hpb=58176d355b73d14490515294555df7ef795529bf;p=senf.git

diff --git a/doclib/SConscript b/doclib/SConscript
index fc811cd..2bc4d08 100644
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -41,7 +41,7 @@
 # If needed, the doxy-header.html and/or doxy-footer.html file will be
 # regenerated. The header and/or footer are generated from templates
 # using a simple python based templating system called yaptu which is
-# included in doclib/.
+# included in site_scons/lib/.
 #
 # 
 # 3. Calling doxygen
@@ -52,7 +52,8 @@
 #
 # * Building prerequisites (e.g. images)
 #
-# * The processing done by the Doxygen builder and doclib/doxygen.sh
+# * The processing done by the Doxygen builder and
+#   site_scon/lib/doxygen.sh
 #
 #
 # 3.1. Building prerequisites
@@ -66,7 +67,7 @@
 # The Doxygen builder will call the doxygen command to build the
 # documentation. 
 #
-# The doxygen command is configured as 'doclib/doxygen.sh' which
+# The doxygen command is configured as 'site_scon/lib/doxygen.sh' which
 # does some additional processing in addition to calling doxygen
 # proper
 #
@@ -81,25 +82,30 @@
 #
 # * a generated tag file is post-processed using an XSLT template
 #
-# (see doclib/doxygen.sh for more information). The Doxygen
+# (see site_scon/lib/doxygen.sh for more information). The Doxygen
 # configuration is set up such, that
 #
-# * doxygen calls 'doclib/filter.pl' on each source file. This filter
-#   will strip excess whitespace from the beginning of lines in
+# * doxygen calls 'site_scons/lib/filter.pl' on each source file. This
+#   filter will strip excess whitespace from the beginning of lines in
 #   '\code' and '<pre>' blocks. Additionally it will expand all tabs,
 #   tab width is 8 spaces (there should be no tabs in the source but
 #   ...)
-# 
-# * doxygen calls 'doclib/dot' to generate the 'dot' images.
 #
-# * 'doclib/dot' calls 'doclib/dot-munge.pl' on the .dot
-#    files. dot-munge.pl changes the font and font-size and adds
+# * 'site_scons/lib/filter.pl' calls 'site_scons/lib/makeDiaImageMap.py'
+#   whenever finding a '\diaimage' command. This will create an image
+#   map (in an encoded form which will be fixed by html-munge.xsl
+#   later)
+#
+# * doxygen calls 'site_scons/lib/dot' to generate the 'dot' images.
+#
+# * 'site_scons/lib/dot' calls 'site_scons/lib/dot-munge.pl' on the
+#    .dot files. dot-munge.pl changes the font and font-size and adds
 #    line-breaks to long labels
 #
-# * 'doclib/dot' calls the real dot binary. If the resulting image is
-#   more than 800 pixels wide, dot is called again, this time using
-#   the oposite rank direction (top-bottom vs. left-right). The image
-#   with the smaller width is selected and returned.
+# * 'site_scons/lib/dot' calls the real dot binary. If the resulting
+#   image is more than 800 pixels wide, dot is called again, this time
+#   using the oposite rank direction (top-bottom vs. left-right). The
+#   image with the smaller width is selected and returned.
 #
 #
 # 4. Fixing broken links
@@ -256,13 +262,12 @@ env.SetDefault(
 )
 
 env.Replace(
-    DOXYGENCOM = "doclib/doxygen.sh $DOXYOPTS $SOURCE",
+    DOXYGENCOM = "site_scons/lib/doxygen.sh $DOXYOPTS $SOURCE",
 )
 
 env.Append( ENV = {
     'TODAY' : str(datetime.date.today()),
-    'TEXINPUTS' : os.environ.get('TEXINPUTS',env.Dir('#/doclib').abspath + ':'),
-    'DOXYGEN' : env.File(env['DOXYGEN']).abspath,
+    'DOXYGEN' : str(env.File(env['DOXYGEN'])),
 })
 
 env.PhonyTarget('linklint', [], [
@@ -289,7 +294,7 @@ footer = env.Command('doxy-footer.html', 'SConscript', writeTemplate,
                      TEMPLATE = Literal(FOOTER))
 
 env.Alias('all_docs',
-          env.Command('search.php', [ 'html-munge.xsl', 'SConscript' ],
+          env.Command('search.php', [ '#/site_scons/lib/html-munge.xsl', 'SConscript' ],
                       [ writeTemplate,
                         'xsltproc --nonet --html --stringparam topdir .. -o - $SOURCE $TARGET 2>/dev/null'
                             + "| sed"
@@ -316,3 +321,5 @@ env.Alias('install_all',
 
 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')