X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2FSENFSCons.py;h=fb3d6c98161a226a03ea4e9a28b84ef5fdcc2c0d;hb=2017d34cab7de03c786310b3a08424a339f4476d;hp=7ff62727c576dd10f288ea0127005c08e8efabf3;hpb=e7184facd970e81cf2c0de5e9688bb7b6b70a305;p=senf.git

diff --git a/site_scons/SENFSCons.py b/site_scons/SENFSCons.py
index 7ff6272..fb3d6c9 100644
--- a/site_scons/SENFSCons.py
+++ b/site_scons/SENFSCons.py
@@ -4,21 +4,29 @@ import SCons.Defaults, SCons.Action
 from SCons.Script import *
 
 def Glob(env, exclude=[], subdirs=[]):
-    testSources = glob.glob("*.test.cc")
-    sources = [ x for x in glob.glob("*.cc") if x not in testSources and x not in exclude ]
+    testSources = env.Glob("*.test.cc",strings=True)
+    sources = [ x
+                for x in env.Glob("*.cc",strings=True) \
+                    + env.Glob("*.c",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"))
-        sources += [ x for x in glob.glob(os.path.join(subdir,"*.cc"))
+        testSources += env.Glob(os.path.join(subdir,"*.test.cc"),strings=True)
+        sources += [ x
+                     for x in env.Glob(os.path.join(subdir,"*.cc"),strings=True) \
+                         + env.Glob(os.path.join(subdir,"*.c"),strings=True)
                      if x not in testSources and x not in exclude ]
     includes = []
-    for d in [ '.' ] + subdirs:
-        for f in os.listdir(d):
-            ext = '.' + f.split('.',1)[-1]
-            p = os.path.join(d,f)
+    for d in [ '' ] + [ x+'/' for x in subdirs ]:
+        for p in env.Glob("%s*" % d, strings=True) + env.Glob("%s*" % d, strings=True, ondisk=False):
+            ext = '.' + p.split('.',1)[-1]
             if ext in env['CPP_INCLUDE_EXTENSIONS'] \
                and ext not in env['CPP_EXCLUDE_EXTENSIONS'] \
                and p not in exclude:
                 includes.append(p)
+    includes = list(set(includes))
+    sources.sort()
+    testSources.sort()
+    includes.sort()
     return ( sources, testSources, includes )
 
 def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "doc"):
@@ -40,7 +48,8 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "
                  'LIBDIR'          : env.Dir('#/site_scons/lib').abspath,
                  'output_dir'      : '$OUTPUT_DIRECTORY',
                  'html_dir'        : 'html',
-                 'html'            : 'NO' }
+                 'html'            : 'NO',
+                 'DOXYGEN'         : '$DOXYGEN' }
         denv.update(kw)
         return { 'DOXYENV'         : denv,
                  'MODULE'          : module,
@@ -49,14 +58,14 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "
                  };
     opts = [ '--tagfile-name', '"${MODULE}.tag"',
              '--output-dir', '$OUTPUT_DIRECTORY' ]
-
+    
     # Rule to generate tagfile
     # (need to exclude the 'clean' case, otherwise we'll have duplicate nodes)
     if not env.GetOption('clean'):
         tagfile = env.Doxygen(doxyfile, DOXYOPTS = opts + [ '--tagfile' ],
                               **vars(generate_tagfile='${OUTPUT_DIRECTORY}/${MODULE}.tag'))
         env.Append(ALL_TAGFILES = [ tagfile[0].abspath ])
-        env.Depends(tagfile, [ env.File('#/site_scons/lib/doxygen.sh'), 
+        env.Depends(tagfile, [ env.File('#/site_scons/lib/doxygen.sh'),
                                env.File('#/site_scons/lib/tag-munge.xsl') ])
 
         env.Install(env.Dir('$DOCINSTALLDIR').Dir(tagfile[0].dir.get_path(env.Dir('#'))),
@@ -88,15 +97,16 @@ def Doxygen(env, doxyfile = "Doxyfile", extra_sources = [], output_directory = "
     return doc
 
 def AllIncludesHH(env, exclude=[]):
-    exclude = exclude[:] + ['all_includes.hh'] # Make a copy !!
-    headers = [ f for f in glob.glob("*.hh")
-                if f not in exclude and not f.endswith('.test.hh') ]
-    headers.sort()
+    exclude = exclude + ['all_includes.hh']
+    headers = [ f for f in env.Glob("*.hh", source=True)
+                if f.name not in exclude and not f.name.endswith('.test.hh') ]
+    headers.sort(key=lambda x:x.name)
     target = env.File("all_includes.hh")
-    file(target.abspath,"w").write("".join([ '#include "%s"\n' % f
-                                             for f in headers ]))
-    env.Clean(env.Alias('all'), target)
-
+    allinch = env.CreateFile(target,
+                             env.Value("".join([ '#include <%s>\n' % f.srcnode().get_path(env.Dir('#'))
+                                                 for f in headers ])))
+    env.Default(allinch)
+    env.Depends(allinch, headers)
 
 INDEXPAGE="""
 /** \mainpage ${TITLE}
@@ -117,7 +127,7 @@ INDEXPAGE="""
 
 def IndexPage(env, name, title, text=""):
     SUBPAGES = []
-    for dox in sorted(glob.glob("*/Mainpage.dox")):
+    for dox in sorted(env.Glob("*/Mainpage.dox",strings=True)):
         subtitle = ([None] + [ line.split('\\mainpage',1)[-1].strip() for line in file(dox)
                                if '\\mainpage' in line ])[-1]
         if subtitle:
@@ -127,7 +137,6 @@ def IndexPage(env, name, title, text=""):
     env.Clean('all',name)
     env.Clean('all_docs',name)
 
-
 ###########################################################################
 # The following functions serve as simple macros for most SConscript files
 #
@@ -139,7 +148,7 @@ def AutoRules(env, exclude=[], subdirs=[], doc_extra_sources = []):
     import SENFSCons
 
     sources, tests, includes = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
-    subscripts               = env.Glob("*/SConscript")
+    subscripts               = sorted(env.Glob("*/SConscript", strings=True))
     doxyfile                 = env.Glob("Doxyfile")
 
     if sources               : env.Append(ALLOBJECTS = env.Object(sources))
@@ -153,17 +162,32 @@ def AutoPacketBundle(env, name, exclude=[], subdirs=[], doc_extra_sources=[]):
     import SENFSCons
 
     sources, tests, includes = SENFSCons.Glob(env, exclude=((exclude)), subdirs=((subdirs)) )
-    subscripts               = env.Glob("*/SConscript")
+    subscripts               = sorted(env.Glob("*/SConscript", strings=True))
     doxyfile                 = env.Glob("Doxyfile")
 
-    objects = env.Object(sources)
-    cobject = env.CombinedObject('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', objects, NAME=((name)))
+    objects  = env.Object         (sources)
+    cobject  = env.CombinedObject ('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', objects, NAME=((name)))
+    sobundle = env.SharedLibrary  ('${LOCALLIBDIR}/${NAME}${OBJADDSUFFIX}', sources, NAME=((name)),
+                                   LIBS=[], SHLIBPREFIX='')
 
     env.Default(cobject)
+    env.Default(sobundle)
     env.Append(ALLOBJECTS = objects, PACKET_BUNDLES = cobject)
     env.Install('$OBJINSTALLDIR', cobject)
+    env.Install('$OBJINSTALLDIR', sobundle)
 
     if tests                 : env.BoostUnitTest('test', tests + cobject)
     if includes              : env.InstallSubdir('$INCLUDEINSTALLDIR', includes)
     if doxyfile              : SENFSCons.Doxygen(env, extra_sources=((doc_extra_sources)) )
     if subscripts            : SConscript(subscripts)
+
+
+def BuildExample(env, sconstruct):
+    dir     = env.File( ((sconstruct)) ).dir
+    example = env.Command( dir.File('.example.phony'), env.Alias('default'),
+                           [ '$SCONS -C $EXAMPLEDIR' ],
+                           CONCURRENCY_LEVEL=1, EXAMPLEDIR=dir )
+    env.Alias('examples', example)
+
+    if env.GetOption('clean') and ('all' in BUILD_TARGETS or 'examples' in BUILD_TARGETS):
+        env.Clone(CONCURRENCY_LEVEL=1, EXAMPLEDIR=dir).Execute([ '$SCONS -C $EXAMPLEDIR -c' ])