X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=2340272c18d65f94832bb1b549893f32d56b29b9;hb=f214d8c456b57c851066b6dd437049938f8a91ee;hp=b992cd6f55da9a6f09f46a785ce9ddeff90fc314;hpb=8bc8b29a3c4c1b32b14e17d17e3f6c3ff565c9e9;p=senf.git diff --git a/SConstruct b/SConstruct index b992cd6..2340272 100644 --- a/SConstruct +++ b/SConstruct @@ -1,109 +1,9 @@ # -*- python -*- import sys, glob, os.path, datetime, pwd, time, fnmatch, string -sys.path.append('senfscons') -import SENFSCons - -########################################################################### - -# This hack is needed for SCons V 0.96.1 compatibility. In current SCons versions -# we can just use 'env.AlwaysBuild(env.Alias(target), [], action)' -def PhonyTarget(env, target, action, sources=[]): - env.AlwaysBuild(env.Command(target + '.phony', [ 'SConstruct' ] + sources, env.Action(action))) - env.Alias(target, target + '.phony') - -def updateRevision(target, source, env): - rev = env['ENV']['REVISION'][1:] - if ':' in rev: - print - print "Working copy not clean. Run 'svn update'" - print - return 1 - if 'm' in rev and not ARGUMENTS.get('force_deb'): - print - print "Working copy contains local changes. Commit first" - print - return 1 - if 's' in rev: - rev = rev[:-1] - if 'm' in rev: - rev = rev[:-1] - url = None - for line in os.popen("svn info"): - elts=line.split(':',1) - if elts[0] == 'URL': - url = elts[1].strip() - version = None - if '/tags/' in url: - version = url.rsplit('/',1)[-1].split('_',1)[0] - if version[0] not in string.digits: - version = None - if version is None: - version = '1:0r%s' % rev - changelog = file('debian/changelog.template').read() % { - 'version': version, - 'rev': rev, - 'user': pwd.getpwuid(os.getuid()).pw_gecos.split(',')[0].strip(), - 'date': time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) } - file('debian/changelog','w').write(changelog) - -def nonemptyFile(f): - try: return os.stat(f).st_size > 0 - except OSError: return False - -def checkLocalConf(target, source, env): - if [ True for f in env['LOCAL_CONFIG_FILES'] if nonemptyFile(f) ]: - print - print "You have made local modifications to one of the following local configuration" - print "files:" - for f in env['LOCAL_CONFIG_FILES']: - print " ",f - print - print "Building a debian package would remove those files." - print - print "To continue, remove the offending file(s) and try again. Alternatively," - print "build a source package using 'scons debsrc' and may then build debian" - print "binary packages from this source-package without disrupting your local" - print "configuration." - print - return 1 - -def getLibDepends(script): - # OUCH ... - return os.popen("perl -0777 -n -e '$,=\" \"; print $1=~m/'\"'\"'([^'\"'\"']*)'\"'\"'/g if /LIBS\s*=\s*\[([^\]]*)\]/' %s" % script).read().split() - -# Original topological sort code written by Ofer Faigon -# (www.bitformation.com) and used with permission -def topological_sort(items, partial_order): - """Perform topological sort. - items is a list of items to be sorted. - partial_order is a list of pairs. If pair (a,b) is in it, it means - that item a should appear before item b. - Returns a list of the items in one of the possible orders, or None - if partial_order contains a loop. - """ - def add_node(graph, node): - if not graph.has_key(node): - graph[node] = [0] - def add_arc(graph, fromnode, tonode): - graph[fromnode].append(tonode) - graph[tonode][0] = graph[tonode][0] + 1 - graph = {} - for v in items: - add_node(graph, v) - for a,b in partial_order: - add_arc(graph, a, b) - roots = [node for (node,nodeinfo) in graph.items() if nodeinfo[0] == 0] - while len(roots) != 0: - root = roots.pop() - yield root - for child in graph[root][1:]: - graph[child][0] = graph[child][0] - 1 - if graph[child][0] == 0: - roots.append(child) - del graph[root] - if len(graph.items()) != 0: - raise RuntimeError, "Loop detected in partial_order" +sys.path.append(Dir('#/senfscons').abspath) +sys.path.append(Dir('#/doclib').abspath) +import SENFSCons, senfutil ########################################################################### # Load utilities and setup libraries and configure build @@ -128,18 +28,6 @@ fixlinks Fix broken links in doxygen documentation valgrind Run all tests under valgrind/memcheck """) -if os.environ.get('debian_build'): - rev = os.popen("dpkg-parsechangelog | awk '/^Version:/{print $2}'").read().strip() -else: - rev = 'r' + os.popen("svnversion").read().strip().lower() - -logname = os.environ.get('LOGNAME') -if not logname: - logname = pwd.getpwuid(os.getuid()).pw_name - -def configFilesOpts(target, source, env, for_signature): - return [ '-I%s' % os.path.split(f)[1] for f in env['LOCAL_CONFIG_FILES'] ] - # Options used to debug inlining: # # INLINE_OPTS = [ '-finline-limit=20000', '--param','large-function-growth=10000', @@ -147,51 +35,26 @@ def configFilesOpts(target, source, env, for_signature): # '-fvisibility-inlines-hidden', '-fno-inline-functions', '-Winline' ] # # BEWARE: You need lots of ram to compile with these settings (approx 1G) -# INLINE_OPTS = [ '-finline-limit=5000' ] env.Append( - CPPPATH = [ '#/include' ], - CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ] + INLINE_OPTS, - LIBS = [ 'readline', 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB' ], - TEST_EXTRA_LIBS = [ '$BOOSTFSLIB' ], - DOXY_XREF_TYPES = [ 'bug', 'fixme', 'todo', 'idea' ], - DOXY_HTML_XSL = '#/doclib/html-munge.xsl', - ENV = { 'TODAY' : str(datetime.date.today()), - 'REVISION' : rev, - 'LOGNAME' : logname, # needed by the debian build scripts - 'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1", - 'SCONS' : 1, - 'PATH' : os.environ.get('PATH') - }, - LOCAL_CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ], - CONFIG_FILES_OPTS = configFilesOpts, - CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ], - BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot -I.svn -I_templates $CONFIG_FILES_OPTS", - TOP_INCLUDES = [ 'Packets', 'PPI', 'Scheduler', 'Socket', 'Utils', 'Console', - 'config.hh', 'local_config.hh' ], + CPPPATH = [ '#/include' ], + CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ] + INLINE_OPTS, + LIBS = [ 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', + '$BOOSTFSLIB' ], + TEST_EXTRA_LIBS = [ ], + ENV = { 'PATH' : os.environ.get('PATH') }, + CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ], ) -def parseLogOption(value): - stream, area, level = ( x.strip() for x in value.strip().split('|') ) - if stream : stream = ''.join('(%s)' % x for x in stream.split('::') ) - else : stream = '(_)' - if area : area = ''.join( '(%s)' % x for x in area.split('::') ) - else : area = '(_)' - return '(( %s,%s,%s ))' % (stream,area,level) - -def expandLogOption(target, source, env, for_signature): - return ' '.join( parseLogOption(x) for x in env.subst('$LOGLEVELS').split() ) - -if env.subst('$LOGLEVELS'): - env.Append( expandLogOption=expandLogOption ) - env.Append( CPPDEFINES = { 'SENF_LOG_CONF': '$expandLogOption' } ) - env.SetDefault( - LIBSENF = "senf" + LIBSENF = "senf" ) +# Parse the log option command line parameter into the SENF_LOG_CONF macro +senfutil.setLogOption(env) + Export('env') # Create Doxyfile.local otherwise doxygen will barf on this non-existent file @@ -213,40 +76,25 @@ if not env.GetOption('clean') and not os.path.exists("local_config.hh"): if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ and not os.environ.get("SCONS") and COMMAND_LINE_TARGETS != [ 'prepare' ]: env.Execute([ "scons prepare" ]) - env.Clean('all', '.prepare-stamp') -# Not nice, but until we get to fixing the dependency jungle -# concerning generated sources ... -scripts = [] -dependencies = [] +# Load SConscripts. Need to load debian and doclib first (they change the global environment) +SConscript("debian/SConscript") +SConscript("doclib/SConscript") +SConscript(list(set(glob.glob("*/SConscript")) - set(("debian/SConscript", "doclib/SConscript")))) -for script in glob.glob("*/SConscript"): - depends = getLibDepends(script) - script = script.split('/',1)[0] - scripts.append(script) - dependencies += [ (dep, script) for dep in depends ] - -for subdir in topological_sort(scripts, dependencies): - SConscript(os.path.join(subdir, "SConscript")) - +# Define the main targets SENFSCons.StandardTargets(env) SENFSCons.GlobalTargets(env) -SENFSCons.Doxygen(env) -SENFSCons.DoxyXRef(env, - HTML_HEADER = '#/doclib/doxy-header.html', - HTML_FOOTER = '#/doclib/doxy-footer.html') -SENFSCons.InstallIncludeFiles(env, [ 'config.hh' ]) +env.Depends( SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION']) ) -# Build combined library 'libsenf' -libsenf = env.Library( - 'senf${LIBADDSUFFIX}', - Flatten([ env.File(SENFSCons.LibPath(lib)).sources for lib in env['ALLLIBS'] ])) +libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS']) env.Default(libsenf) env.Clean('all', libsenf) env.Alias('default', libsenf) +SENFSCons.InstallIncludeFiles(env, [ 'config.hh' ]) env.Alias('install_all', env.Install('$LIBINSTALLDIR', libsenf)) if env.GetOption('clean'): @@ -255,47 +103,19 @@ if env.GetOption('clean'): for pattern in env['CLEAN_PATTERNS'] for f in fnmatch.filter(files,pattern) ]) -PhonyTarget(env, 'deb', [ - checkLocalConf, - updateRevision, - "$BUILDPACKAGE_COMMAND", - "fakeroot ./debian/rules debclean" -]) - -PhonyTarget(env, 'debsrc', [ - updateRevision, - "$BUILDPACKAGE_COMMAND -S", -]) - -PhonyTarget(env, 'debbin', [ - checkLocalConf, - updateRevision, - "$BUILDPACKAGE_COMMAND -b", - "fakeroot ./debian/rules debclean" -]) - -PhonyTarget(env, 'linklint', [ - 'rm -rf linklint', - 'linklint -doc linklint -limit 99999999 `find -type d -name html -printf "/%P/@ "`', - '[ ! -r linklint/errorX.html ] || python doclib/linklint_addnames.py linklint/errorX.html.new', - '[ ! -r linklint/errorX.html.new ] || mv linklint/errorX.html.new linklint/errorX.html', - '[ ! -r linklint/errorAX.html ] || python doclib/linklint_addnames.py linklint/errorAX.html.new', - '[ ! -r linklint/errorAX.html.new ] || mv linklint/errorAX.html.new linklint/errorAX.html', - 'echo -e "\\nLokal link check results: linklint/index.html\\nRemote link check results: linklint/urlindex.html\\n"', -]) - -PhonyTarget(env, 'fixlinks', [ - 'python doclib/fix-links.py -v -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt', -]) - -PhonyTarget(env, 'prepare', []) - -PhonyTarget(env, 'valgrind', [ - 'find -name .test.bin | while read test; do echo; echo "Running $$test"; echo; valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup $$test $BOOSTTESTARGS; [ $$? -ne 99 ] || exit 1; done' - ], [ 'all_tests' ]) +SENFSCons.PhonyTarget(env, 'prepare', [ 'true' ]) -env.Clean('all', env.Dir('linklint')) +SENFSCons.PhonyTarget(env, 'valgrind', [ """ + find -name .test.bin + | while read test; do + echo; + echo "Running $$test"; + echo; + valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup + $$test $BOOSTTESTARGS; + [ $$? -ne 99 ] || exit 1; + done +""".replace("\n"," ") ], [ 'all_tests' ]) -env.Clean('all','.prepare-stamp') if not env.GetOption('clean') and not os.path.exists(".prepare-stamp"): Execute(Touch(".prepare-stamp"))