X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=88dd14f5d27aa99f43f828f523ce8090345b4e0b;hb=456ee576285b76aa46240f8001f426757810dcc1;hp=b501151c8c48fcc3515de8257df9bf0e01f1e5e3;hpb=44c966bc9d744d0926cffd5184fdb77a62564c16;p=senf.git diff --git a/SConstruct b/SConstruct index b501151..88dd14f 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 @@ -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." @@ -112,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'): @@ -124,11 +138,12 @@ 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 = [ '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()), @@ -136,19 +151,25 @@ 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') }, - CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ], + 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 @@ -186,18 +207,18 @@ 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)) @@ -210,6 +231,7 @@ PhonyTarget(env, 'deb', [ checkLocalConf, updateRevision, "$BUILDPACKAGE_COMMAND", + "fakeroot ./debian/rules debclean" ]) PhonyTarget(env, 'debsrc', [ @@ -220,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"', ])