X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=d316b40501605590684ffdcd073596085914d498;hb=1b1d76302a5d61e918ef71f1c8e11f80ac1262e2;hp=8b1074eecc955a81e8fb0014171cd3ee4286b8d2;hpb=5fbfcae374466c0d8d631d93e1fd58a5b7eea7d3;p=senf.git diff --git a/SConstruct b/SConstruct index 8b1074e..d316b40 100644 --- a/SConstruct +++ b/SConstruct @@ -1,6 +1,6 @@ # -*- python -*- -import sys, glob, os.path, datetime, pwd, time, fnmatch +import sys, glob, os.path, datetime, pwd, time, fnmatch, string sys.path.append('senfscons') import SENFSCons @@ -8,8 +8,8 @@ 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): - env.AlwaysBuild(env.Command(target + '.phony', 'SConstruct', env.Action(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): @@ -28,7 +28,20 @@ def updateRevision(target, source, env): 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()) } @@ -39,11 +52,11 @@ def nonemptyFile(f): except OSError: return False def checkLocalConf(target, source, env): - if [ True for f in env['CONFIG_FILES'] if nonemptyFile(f) ]: + 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['CONFIG_FILES']: + for f in env['LOCAL_CONFIG_FILES']: print " ",f print print "Building a debian package would remove those files." @@ -55,6 +68,43 @@ def checkLocalConf(target, source, env): 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" + ########################################################################### # Load utilities and setup libraries and configure build @@ -75,6 +125,7 @@ debsrc Build debian source package debbin Build debian binary package linklint Check links of doxygen documentation with 'linklint' fixlinks Fix broken links in doxygen documentation +valgrind Run all tests under valgrind/memcheck """) if os.environ.get('debian_build'): @@ -87,31 +138,38 @@ 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['CONFIG_FILES'] ] + return [ '-I%s' % os.path.split(f)[1] for f in env['LOCAL_CONFIG_FILES'] ] env.Append( CPPPATH = [ '#/include' ], - LIBS = [ 'iberty', '$BOOSTREGEXLIB', '$BOOSTFSLIB' ], + LIBS = [ 'iberty', 'readline', '$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 - }, - CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ], + '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 $CONFIG_FILES_OPTS", + 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', - 'config.hh', 'local_config.hh' ] + 'config.hh', 'local_config.hh' ], +) + +env.SetDefault( + LIBSENF = "senf" ) Export('env') # Create Doxyfile.local otherwise doxygen will barf on this non-existent file -if not env.GetOption('clean') and not os.path.exists("Doxyfile.local"): +# Create it even when cleaning, to silence the doxygen builder warnings +if not os.path.exists("Doxyfile.local"): Execute(Touch("Doxyfile.local")) # Create local_config.h @@ -131,24 +189,36 @@ if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ env.Clean('all', '.prepare-stamp') -SConscript(glob.glob("*/SConscript")) +# Not nice, but until we get to fixing the dependency jungle +# concerning generated sources ... +scripts = [] +dependencies = [] +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")) + SENFSCons.StandardTargets(env) SENFSCons.GlobalTargets(env) SENFSCons.Doxygen(env) SENFSCons.DoxyXRef(env, - HTML_HEADER = '#/doclib/doxy-header-overview.html', + HTML_HEADER = '#/doclib/doxy-header.html', HTML_FOOTER = '#/doclib/doxy-footer.html') SENFSCons.InstallIncludeFiles(env, [ 'config.hh' ]) # Build combined library 'libsenf' libsenf = env.Library( - SENFSCons.LibPath('senf'), + 'senf${LIBADDSUFFIX}', Flatten([ env.File(SENFSCons.LibPath(lib)).sources for lib in env['ALLLIBS'] ])) env.Default(libsenf) -env.Clean('all', 'libsenf.a') -env.Alias('default', 'libsenf.a') +env.Clean('all', libsenf) +env.Alias('default', libsenf) env.Alias('install_all', env.Install('$LIBINSTALLDIR', libsenf)) @@ -161,6 +231,7 @@ PhonyTarget(env, 'deb', [ checkLocalConf, updateRevision, "$BUILDPACKAGE_COMMAND", + "fakeroot ./debian/rules debclean" ]) PhonyTarget(env, 'debsrc', [ @@ -171,15 +242,16 @@ PhonyTarget(env, 'debsrc', [ PhonyTarget(env, 'debbin', [ checkLocalConf, updateRevision, - "$BUILDPACKAGE_COMMAND -nc", + "$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 linklint_addnames.py linklint/errorX.html.new', + '[ ! -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 linklint_addnames.py linklint/errorAX.html.new', + '[ ! -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"', ]) @@ -190,6 +262,10 @@ PhonyTarget(env, 'fixlinks', [ 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' ]) + env.Clean('all', env.Dir('linklint')) env.Clean('all','.prepare-stamp')