X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=ff96d8dd683e8c27af950f5b23fea9d52f6e6937;hb=8a3c2486ed4e34d016c2b89beb5900fdc9d1b3b2;hp=b0f7742e87d138f3f901eb2e56530f70bdcb5e16;hpb=d33cd468d4ece7c0c98270b4d1a9858e5a94510d;p=senf.git diff --git a/SConstruct b/SConstruct index b0f7742..ff96d8d 100644 --- a/SConstruct +++ b/SConstruct @@ -3,6 +3,12 @@ import sys, glob, os.path, fnmatch import SENFSCons, senfutil +# Fix for SCons 0.97 compatibility +try: + BoolVariable +except NameError: + BoolVariable = BoolOption + ########################################################################### # Load utilities and setup libraries and configure build @@ -10,6 +16,7 @@ env = Environment() # Load all the local SCons tools env.Tool('Doxygen') +env.Tool('Doxygen') env.Tool('Dia2Png') env.Tool('PkgDraw') env.Tool('InstallSubdir') @@ -17,15 +24,18 @@ env.Tool('CopyToDir') env.Tool('Boost') env.Tool('CombinedObject') env.Tool('PhonyTarget') +env.Tool('InstallDir') env.Help(""" Additional top-level build targets: prepare Create all target files not part of the repository +default Build all default targets (like calling scons with no arguments) +examples Build all examples all_tests Build and run unit tests for all modules all_docs Build documentation for all modules all Build everything -install_all Install SENF into $PREFIX +install_all Install SENF into $$PREFIX deb Build debian source and binary package debsrc Build debian source package debbin Build debian binary package @@ -34,35 +44,30 @@ fixlinks Fix broken links in doxygen documentation valgrind Run all tests under valgrind/memcheck """) -class BuildTypeOptions: - def __init__(self, var): - self._var = var - - def __call__(self, target, source, env, for_signature): - type = env['final'] and "final" or env['debug'] and "debug" or "normal" - return env[self._var + "_" + type] - env.Replace( PKGDRAW = 'doclib/pkgdraw', ) env.Append( ENV = { 'PATH' : os.environ.get('PATH') }, - CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', '.sconsign' ], + CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ], - CPPPATH = [ '#/include' ], + CPPPATH = [ '#' ], LOCALLIBDIR = '#', LIBPATH = [ '$LOCALLIBDIR' ], LIBS = [ '$LIBSENF$LIBADDSUFFIX', 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB', '$BOOSTFSLIB' ], TEST_EXTRA_LIBS = [ ], - PREFIX = '/usr/local', - LIBINSTALLDIR = '$PREFIX/lib', - BININSTALLDIR = '$PREFIX/bin', - INCLUDEINSTALLDIR = '$PREFIX/include', - OBJINSTALLDIR = '$LIBINSTALLDIR', - DOCINSTALLDIR = '$PREFIX/doc', + PREFIX = '#/dist', + LIBINSTALLDIR = '$PREFIX${syslayout and "/lib" or ""}', + BININSTALLDIR = '$PREFIX${syslayout and "/bin" or ""}', + INCLUDEINSTALLDIR = '$PREFIX${syslayout and "/include" or ""}', + CONFINSTALLDIR = '${syslayout and "$LIBINSTALLDIR/senf" or "$PREFIX"}', + OBJINSTALLDIR = '$CONFINSTALLDIR', + DOCINSTALLDIR = '$PREFIX${syslayout and "/share/doc/senf" or "/manual"}', + SCONSINSTALLDIR = '$CONFINSTALLDIR/site_scons', + CPP_INCLUDE_EXTENSIONS = [ '.h', '.hh', '.ih', '.mpp', '.cci', '.ct', '.cti' ], CPP_EXCLUDE_EXTENSIONS = [ '.test.hh' ], @@ -76,33 +81,39 @@ env.Append( INLINE_OPTS = [ '$INLINE_OPTS_NORMAL' ], CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS', '$CXXFLAGS_' ], - CXXFLAGS_ = BuildTypeOptions('CXXFLAGS'), + CXXFLAGS_ = senfutil.BuildTypeOptions('CXXFLAGS'), CXXFLAGS_final = [ '-O3' ], CXXFLAGS_normal = [ '-O0', '-g' ], CXXFLAGS_debug = [ '$CXXFLAGS_normal' ], CPPDEFINES = [ '$expandLogOption', '$CPPDEFINES_' ], expandLogOption = senfutil.expandLogOption, - CPPDEFINES_ = BuildTypeOptions('CPPDEFINES'), + CPPDEFINES_ = senfutil.BuildTypeOptions('CPPDEFINES'), CPPDEFINES_final = [ ], CPPDEFINES_normal = [ 'SENF_DEBUG' ], CPPDEFINES_debug = [ '$CPPDEFINES_normal' ], LINKFLAGS = [ '-rdynamic', '$LINKFLAGS_' ], - LINKFLAGS_ = BuildTypeOptions('LINKFLAGS'), + LINKFLAGS_ = senfutil.BuildTypeOptions('LINKFLAGS'), LINKFLAGS_final = [ ], LINKFLAGS_normal = [ '-Wl,-S' ], - LINKFLAGS_debug = [ ], + LINKFLAGS_debug = [ '-g' ], ) env.SetDefault( - LIBSENF = "senf", - final = 0, - debug = 0, + LIBSENF = "senf", + final = False, + debug = False, + syslayout = False ) # Set variables from command line -env.Replace(**ARGUMENTS) +senfutil.parseArguments( + env, + BoolVariable('final', 'Build final (optimized) build', False), + BoolVariable('debug', 'Link in debug symbols', False), + BoolVariable('syslayout', 'Install in to system layout directories (lib/, include/ etc)', False), +) Export('env') @@ -111,26 +122,20 @@ Export('env') if not os.path.exists("Doxyfile.local"): Execute(Touch("Doxyfile.local")) -# Create local_config.h -if not env.GetOption('clean') and not os.path.exists("local_config.hh"): - Execute(Touch("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" ]) -# Load SConscripts. Need to load some first (they change the global environment) -initSConscripts = [ - "debian/SConscript", - "doclib/SConscript", -] +# Load SConscripts -SConscript(initSConscripts) - -if os.path.exists('SConscript.local'): - SConscript('SConscript.local') - -SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts))) +SConscriptChdir(0) +SConscript("debian/SConscript") +SConscriptChdir(1) +if os.path.exists('SConscript.local') : SConscript('SConscript.local') +SConscript("senf/SConscript") +SConscript("Examples/SConscript") +SConscript("HowTos/SConscript") +SConscript("doclib/SConscript") ########################################################################### # Define build targets @@ -139,17 +144,28 @@ SConscript(list(set(glob.glob("*/SConscript")) - set(initSConscripts))) env.Depends(SENFSCons.Doxygen(env), env.Value(env['ENV']['REVISION'])) #### libsenf.a -libsenf = env.Library(env.subst("$LIBSENF$LIBADDSUFFIX"), env['ALLOBJECTS']) +libsenf = env.Library("$LOCALLIBDIR/${LIBSENF}${LIBADDSUFFIX}", env['ALLOBJECTS']) env.Default(libsenf) - -env.InstallSubdir(target = '$INCLUDEINSTALLDIR', source = [ 'config.hh' ]) env.Install('$LIBINSTALLDIR', libsenf) +def create(target, source, env): + file(str(target[0]), 'w').write(source[0].get_contents()+"\n") +env['BUILDERS']['CreateFile'] = Builder(action = create) + +conf = env.CreateFile("${LOCALLIBDIR}/${LIBSENF}${LIBADDSUFFIX}.conf", + env.Value(env.subst("$_CPPDEFFLAGS"))) +env.Default(conf) +env.Install('$CONFINSTALLDIR', conf) + #### install_all, default, all_tests, all +env.Install('${SCONSINSTALLDIR}', 'site_scons/senfutil.py') +env.Install('${SCONSINSTALLDIR}/site_tools', [ 'site_scons/site_tools/Boost.py', + 'site_scons/site_tools/PhonyTarget.py' ]) + env.Alias('install_all', env.FindInstalledFiles()) env.Alias('default', DEFAULT_TARGETS) env.Alias('all_tests', env.FindAllBoostUnitTests()) -env.Alias('all', [ 'default', 'all_tests', 'all_docs' ]) +env.Alias('all', [ 'default', 'all_tests', 'examples', 'all_docs' ]) #### prepare env.PhonyTarget('prepare', [], []) @@ -171,6 +187,7 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """ env.Clean('all', '.prepare-stamp') env.Clean('all', libsenf) env.Clean('all', env.Dir('linklint')) # env.Dir to disambiguate from linklint PhonyTarget +env.Clean('all', env.Dir('dist')) if env.GetOption('clean'): env.Clean('all', [ os.path.join(path,f)