Move PkgDraw tool dependencies to site_scons/lib

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

diff --git a/SConstruct b/SConstruct
index 7eb0637..d498ef0 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -43,10 +43,6 @@ fixlinks     Fix broken links in doxygen documentation
 valgrind     Run all tests under valgrind/memcheck
 """)
 
-env.Replace(
-   PKGDRAW                = 'doclib/pkgdraw',
-)
-
 env.Append(
    ENV                    = { 'PATH' : os.environ.get('PATH') },
    CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],

diff --git a/doclib/SConscript b/doclib/SConscript
index 9a941ee..bb42822 100644 (file)
--- a/doclib/SConscript
+++ b/doclib/SConscript
@@ -261,7 +261,6 @@ env.Replace(
 
 env.Append( ENV = {
     'TODAY' : str(datetime.date.today()),
-    'TEXINPUTS' : os.environ.get('TEXINPUTS',env.Dir('#/doclib').abspath + ':'),
     'DOXYGEN' : str(env.File(env['DOXYGEN'])),
 })
 

diff --git a/doclib/bytefield.sty b/site_scons/lib/bytefield.sty
similarity index 100%
rename from doclib/bytefield.sty
rename to site_scons/lib/bytefield.sty

diff --git a/doclib/pkgdraw b/site_scons/lib/pkgdraw
similarity index 99%
rename from doclib/pkgdraw
rename to site_scons/lib/pkgdraw
index 895330f..6c3bdcf 100755 (executable)
--- a/doclib/pkgdraw
+++ b/site_scons/lib/pkgdraw
@@ -493,6 +493,7 @@ for name in names:
 texf.write(TEX_FOOTER)
 texf.close()
 
+os.environ['TEXINPUTS'] =  "%s:%s" % (os.environ.get('TEXINPUTS',''), os.path.abspath(basedir))
 if os.system("cd %s; %s/textogif -png -dpi 80 -res 0.25 fields >pkgdraw.log 2>&1"
              % (tmpdir, basedir)) != 0:
     sys.stderr.write("Conversion failed. See %s\n" % tmpdir)

diff --git a/doclib/textogif b/site_scons/lib/textogif
similarity index 100%
rename from doclib/textogif
rename to site_scons/lib/textogif

diff --git a/site_scons/site_tools/PkgDraw.py b/site_scons/site_tools/PkgDraw.py
index 4192706..071f3c0 100644 (file)
--- a/site_scons/site_tools/PkgDraw.py
+++ b/site_scons/site_tools/PkgDraw.py
@@ -1,6 +1,8 @@
-import os
+import os, os.path
 import SCons.Builder, SCons.Action
 
+libdir = os.path.join(os.path.dirname(os.path.dirname(__file__)),'lib')
+
 PkgDraw = SCons.Builder.Builder(
     suffix = ".png",
     src_suffix = ".hh",
@@ -9,7 +11,7 @@ PkgDraw = SCons.Builder.Builder(
 
 def generate(env):
     env['BUILDERS']['PkgDraw'] = PkgDraw
-    env['PKGDRAW'] = "pkgdraw"
+    env['PKGDRAW'] = "%s/pkgdraw" % libdir
     env['PKGDRAWCOM'] = "$PKGDRAW $SOURCE $TARGET $PKGDRAWPACKETS -- $CPPFLAGS $_CPPINCFLAGS $_CPPDEFFLAGS"
     env['PKGDRAWPACKETS'] = ''