X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsenfutil.py;h=38c82b6409c3cc3d50c24b14f4f0c47b994054e8;hb=941ca33da6ee01d78c07fa6b514de10da1ef3948;hp=25e124915fd04afffd5e7bb6cbfc257f207e5798;hpb=c96297689340465d5f1cb4c677eccea8abdbfc42;p=senf.git diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py index 25e1249..38c82b6 100644 --- a/site_scons/senfutil.py +++ b/site_scons/senfutil.py @@ -1,5 +1,15 @@ -import os.path +import os.path, glob, site_tools.Yaptu from SCons.Script import * +import senfconf + +senfutildir = os.path.dirname(__file__) + +# Fix for SCons 0.97 compatibility +try: + Variables +except NameError: + Variables = Options + BoolVariable = BoolOption def parseLogOption(value): stream, area, level = ( x.strip() for x in value.strip().split('|') ) @@ -22,9 +32,16 @@ class BuildTypeOptions: type = env['final'] and "final" or env['debug'] and "debug" or "normal" return env[self._var + "_" + type] +def loadTools(env): + global senfutildir + tooldir = os.path.join(senfutildir, 'site_tools') + for tool in os.listdir(tooldir): + name, ext = os.path.splitext(tool) + if ext == '.py' and name != "__init__" : env.Tool(name, [ tooldir ]) + def parseArguments(env, *defs): vars = Variables(args=ARGUMENTS) - vars.AddVariables(*defs) + for d in defs : vars.Add(d) vars.Update(env) env.Help(""" Any construction environment variable may be set from the scons @@ -37,7 +54,9 @@ of variables) using Special command line parameters: """) env.Help(vars.GenerateHelpText(env)) - for k,v in vars.UnknownVariables().iteritems(): + try : unknv = vars.UnknownVariables() + except AttributeError: unknv = vars.UnknownOptions() + for k,v in unknv.iteritems(): if k.endswith('+'): env.Append(**{k[:-1]: v}) else: @@ -48,19 +67,17 @@ Special command line parameters: # This looks much more complicated than it is: We do three things here: # a) switch between final or debug options # b) parse the LOGLEVELS parameter into the correct SENF_LOG_CONF syntax -# c) check for a local SENF, set options accordingly and update that SENF if needed +# c) check for a local SENF, set options accordingly +# d) check, wether the boost extensions are needed + +def SetupForSENF(env, senf_path = []): + global senfutildir + senf_path.extend(('senf', os.path.dirname(senfutildir), '/usr/local', '/usr')) + + loadTools(env) -def SetupForSENF(env, senf_paths = []): - senf_paths.extend(('senf', '../senf', os.path.dirname(os.path.dirname(__file__)), - '/usr/local', '/usr')) env.Append( - LIBS = [ 'senf', 'rt', '$BOOSTREGEXLIB', - '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', - '$BOOSTFSLIB' ], - BOOSTREGEXLIB = 'boost_regex', - BOOSTIOSTREAMSLIB = 'boost_iostreams', - BOOSTSIGNALSLIB = 'boost_signals', - BOOSTFSLIB = 'boost_filesystem', + LIBS = [ 'rt' ], CXXFLAGS = [ '-Wno-long-long', '$CXXFLAGS_' ], CXXFLAGS_ = BuildTypeOptions('CXXFLAGS'), @@ -92,6 +109,12 @@ def SetupForSENF(env, senf_paths = []): LOGLEVELS_final = [], LOGLEVELS_normal = [], LOGLEVELS_debug = [], + + PROJECTNAME = "Unnamed project", + DOCLINKS = [], + PROJECTEMAIL = "nobody@nowhere.org", + COPYRIGHT = "nobody", + REVISION = "unknown", ) # Interpret command line options @@ -103,27 +126,46 @@ def SetupForSENF(env, senf_paths = []): # If we have a symbolic link (or directory) 'senf', we use it as our # senf repository - for path in senf_paths: + for path in senf_path: if not path.startswith('/') : sconspath = '#/%s' % path else : sconspath = path if os.path.exists(os.path.join(path,"senf/config.hh")): - print "\nUsing SENF in '%s'\n" \ - % ('/..' in sconspath and os.path.abspath(path) or sconspath) + if not env.GetOption('no_progress'): + print "\nUsing SENF in '%s'\n" \ + % ('/..' in sconspath and os.path.abspath(path) or sconspath) env.Append( LIBPATH = [ sconspath ], CPPPATH = [ sconspath ], - BUNDLEDIR = sconspath ) + BUNDLEDIR = sconspath, + SENFDIR = sconspath, + SENFSYSLAYOUT = False) try: env.MergeFlags(file(os.path.join(path,"senf.conf")).read()) except IOError: - print "(SENF configuration file 'senf.conf' not found, assuming non-final SENF)" + if not env.GetOption('no_progress'): + print "(SENF configuration file 'senf.conf' not found, assuming non-final SENF)" env.Append(CPPDEFINES = [ 'SENF_DEBUG' ]) break elif os.path.exists(os.path.join(path,"include/senf/config.hh")): - print "\nUsing system SENF in '%s/'\n" % sconspath - env.Append(BUNDLEDIR = os.path.join(sconspath,"lib/senf")) + if not env.GetOption('no_progress'): + print "\nUsing system SENF in '%s/'\n" % sconspath + env.Append(BUNDLEDIR = os.path.join(sconspath,"lib/senf"), + SENFDIR = sconspath, + SENFSYSLAYOUT = True) break else: - print "\nSENF library not found .. trying build anyway !!\n" + if not env.GetOption('no_progress'): + print "\nSENF library not found .. trying build anyway !!\n" + + Configure(env) + + # Only add senf after all configure checks have run + env.Append( + CPPPATH = '${NEED_BOOST_EXT and "$SENFDIR/boost_ext" or None}', + LIBS = [ 'senf', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', + '$BOOSTFSLIB' ], + ) + + env.Alias('all', '#') def DefaultOptions(env): @@ -136,3 +178,113 @@ def DefaultOptions(env): LINKFLAGS_normal = [ '-Wl,-S' ], LINKFLAGS_debug = [ '-g' ], ) + + +def Glob(env, exclude=[], subdirs=[]): + testSources = env.Glob("*.test.cc", strings=True) + sources = [ x + for x in env.Glob("*.cc", strings=True) + if x not in testSources and x not in exclude ] + for subdir in subdirs: + 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) + if x not in testSources and x not in exclude ] + sources.sort() + testSources.sort() + return (sources, testSources) + + +def Configure(env): + conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests()) + env.Replace( + BOOST_VERSION = conf.CheckBoostVersion(), + BOOST_VARIANT = conf.CheckBoostVariants( '', 'mt' ), + NEED_BOOST_EXT = not conf.CheckCXXHeader("boost/bimap.hpp"), + ) + conf.Finish() + + +tagfiles = None + +def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=False, senfdoc_path=[], + **kw): + # Additional interesting keyword arguments or environment variables: + # PROJECTNAME, DOCLINKS, PROJECTEMAIL, COPYRIGHT, REVISION + + global senfutildir + global tagfiles + libdir=os.path.join(senfutildir, 'lib') + + if tagfiles is None: + senfdocdir = None + senfdoc_path.extend(('senfdoc', '$SENFDIR', '$SENFDIR/manual', + '$SENFDIR/share/doc/senf', '$SENFDIR/share/doc/libsenf-doc/html')) + for path in senfdoc_path: + path = env.Dir(path).get_path() + if os.path.exists(os.path.join(path, "doc/doclib.tag")): + senfdocdir = path + break + tagfiles = [] + if senfdocdir is None: + if not env.GetOption('no_progress'): + print "(SENF documentation not found)" + 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') : + try: dirs.remove('html') + except ValueError: pass + for d in dirs: + if d.startswith('.') : dirs.remove(d) + + if env.GetOption('clean'): + env.Clean('doc', env.Dir('doc')) + if not mydoxyfile: + env.Clean('doc', "Doxyfile") + + if not mydoxyfile: + # Create Doxyfile NOW + site_tools.Yaptu.yaptuAction("Doxyfile", + os.path.join(libdir, "Doxyfile.yap"), + env) + + envvalues = [ env.Value('$PROJECTNAME'), + env.Value('$DOCLINKS'), + env.Value('$PROJECTEMAIL'), + env.Value('$COPYRIGHT'), + env.Value('$REVISION') ] + + # The other files are created using dependencies + if doxyheader: + doxyheader = env.CopyToDir(env.Dir("doc"), doxyheader) + else: + doxyheader = env.Yaptu("doc/doxyheader.html", os.path.join(libdir, "doxyheader.yap"), **kw) + env.Depends(doxyheader, envvalues) + if doxyfooter: + doxyfooter = env.CopyToDir(env.Dir("doc"), doxyfooter) + else: + doxyfooter = env.Yaptu("doc/doxyfooter.html", os.path.join(libdir, "doxyfooter.yap"), **kw) + env.Depends(doxyfooter, envvalues) + if doxycss: + doxycss = env.CopyToDir(env.Dir("doc"), doxycss) + else: + doxycss = env.CopyToDir(env.Dir("doc"), os.path.join(libdir, "doxy.css")) + + doc = env.Doxygen("Doxyfile", + DOXYOPTS = [ '--html', '--tagfiles', '"$TAGFILES"' ], + DOXYENV = { 'TOPDIR' : env.Dir('#').abspath, + 'LIBDIR' : libdir, + 'REVISION' : '$REVISION', + 'tagfiles' : '$TAGFILES', + 'output_dir' : 'doc', + 'html_dir' : 'html', + 'html' : 'YES', + 'DOXYGEN' : '$DOXYGEN' }, + TAGFILES = tagfiles, + DOCLIBDIR = libdir, + DOXYGENCOM = "$DOCLIBDIR/doxygen.sh $DOXYOPTS $SOURCE") + + env.Depends(doc, [ doxyheader, doxyfooter, doxycss ]) + + return doc