X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=df81facb8435e987987320d907b2ff80d234710f;hb=f2f5d59e83863f3b513950173baee1b6da2aee3c;hp=b501151c8c48fcc3515de8257df9bf0e01f1e5e3;hpb=44c966bc9d744d0926cffd5184fdb77a62564c16;p=senf.git diff --git a/SConstruct b/SConstruct index b501151..df81fac 100644 --- a/SConstruct +++ b/SConstruct @@ -1,7 +1,8 @@ # -*- python -*- -import sys, glob, os.path, datetime, pwd, time, fnmatch -sys.path.append('senfscons') +import sys, glob, os.path, datetime, pwd, time, fnmatch, string +sys.path.append(Dir('#/senfscons').abspath) +sys.path.append(Dir('#/doclib').abspath) import SENFSCons ########################################################################### @@ -28,7 +29,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 +53,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,43 +69,6 @@ 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 @@ -112,6 +89,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'): @@ -123,12 +101,27 @@ 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['CONFIG_FILES'] ] +def dpkgIgnoredFilesOpts(target, source, env, for_signature): + return [ '-I%s' % (('/' in f) and (os.path.split(os.getcwd())[1])+f or f) + for f in env.subst('$DPKG_IGNORED_FILES').split() ] + +# Options used to debug inlining: +# +# INLINE_OPTS = [ '-finline-limit=20000', '--param','large-function-growth=10000', +# '--param', 'large-function-insns=10000', '--param','inline-unit-growth=10000', +# '-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' ], - LIBS = [ 'iberty', '$BOOSTREGEXLIB', '$BOOSTFSLIB' ], + CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long' ] + INLINE_OPTS, + LIBS = [ 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', + '$BOOSTFSLIB' ], + TEST_EXTRA_LIBS = [ ], DOXY_XREF_TYPES = [ 'bug', 'fixme', 'todo', 'idea' ], DOXY_HTML_XSL = '#/doclib/html-munge.xsl', ENV = { 'TODAY' : str(datetime.date.today()), @@ -136,19 +129,42 @@ env.Append( 'LOGNAME' : logname, # needed by the debian build scripts 'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1", 'SCONS' : 1, + 'PATH' : os.environ.get('PATH'), + 'TEXINPUTS' : os.environ.get('TEXINPUTS',env.Dir('#/doclib').abspath + ':'), }, - 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", - TOP_INCLUDES = [ 'Packets', 'PPI', 'Scheduler', 'Socket', 'Utils', - 'config.hh', 'local_config.hh' ] + LOCAL_CONFIG_FILES = [ '/Doxyfile.local', '/SConfig', '/local_config.hh' ], + DPKG_IGNORED_FILES = [ '$LOCAL_CONFIG_FILES', '.svn', '/_templates' ], + DPKG_IGNORED_FILES_OPTS = dpkgIgnoredFilesOpts, + CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign', '.sconsign.dblite' ], + BUILDPACKAGE_COMMAND = "dpkg-buildpackage -us -uc -rfakeroot $DPKG_IGNORED_FILES_OPTS", + TOP_INCLUDES = [ 'Packets', 'PPI', 'Scheduler', 'Socket', 'Utils', 'Console', + 'config.hh', 'local_config.hh' ], +) + +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" ) 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 @@ -168,48 +184,36 @@ if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \ env.Clean('all', '.prepare-stamp') -# 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 ] +SConscript(glob.glob("*/SConscript")) -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'), - 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.a') -env.Alias('default', 'libsenf.a') +env.Clean('all', libsenf) +env.Alias('default', libsenf) env.Alias('install_all', env.Install('$LIBINSTALLDIR', libsenf)) -env.Clean('all', [ os.path.join(path,f) - for path, subdirs, files in os.walk('.') - for pattern in env['CLEAN_PATTERNS'] - for f in fnmatch.filter(files,pattern) ]) +if env.GetOption('clean'): + env.Clean('all', [ os.path.join(path,f) + for path, subdirs, files in os.walk('.') + 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', [ @@ -220,15 +224,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"', ])