From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Fri, 18 Sep 2009 13:03:46 +0000 (+0000)
Subject: BUGFIX: Fix senfutil.Glob() subdir globbing
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=269adf2f5cc1141c91750f8041a8bc170c8f070a;p=senf.git

BUGFIX: Fix senfutil.Glob() subdir globbing
BUGFIX: Fix senfutil.Doxygen() tag file scanning

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

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index bda8b3c..1ac5680 100644
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -178,9 +178,9 @@ def Glob(env, exclude=[], subdirs=[]):
                 for x in env.Glob("*.cc", strings=True) 
                 if x not in testSources and x not in exclude ]
     for subdir in subdirs:
-        testSources += glob.glob(os.path.join(subdir,"*.test.cc"))
+        testSources += env.Glob(os.path.join(subdir,"*.test.cc", strings=True))
         sources += [ x 
-                     for x in env.Glob(os.path.join(subdir,"*.cc"))
+                     for x in env.Glob(os.path.join(subdir,"*.cc", strings=True))
                      if x not in testSources and x not in exclude ]
     sources.sort()
     testSources.sort()
@@ -213,7 +213,9 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
         else:
             for dir, dirs, files in os.walk(senfdocdir):
                 tagfiles.extend([ os.path.join(dir,f) for f in files if f.endswith('.tag') ])
-                if dir.endswith('/doc') : dirs.remove('html')
+                if dir.endswith('/doc') : 
+                    try: dirs.remove('html')
+                    except ValueError: pass
                 for d in dirs: 
                     if d.startswith('.') : dirs.remove(d)