import sys, os.path, fnmatch
import SENFSCons, senfutil, senfconf
-
###########################################################################
# Load utilities and setup libraries and configure build
CPPDEFINES = [ '$expandLogOption', '$CPPDEFINES_' ],
expandLogOption = senfutil.expandLogOption,
CPPDEFINES_ = senfutil.BuildTypeOptions('CPPDEFINES'),
- CPPDEFINES_final = [ 'SENF_PPI_NOTRACE'],
+ CPPDEFINES_final = [ 'SENF_PPI_NOTRACE', 'BOOST_NO_MT' ],
CPPDEFINES_normal = [ 'SENF_DEBUG' ],
CPPDEFINES_debug = [ '$CPPDEFINES_normal' ],
GENHTML = "genhtml",
VALGRIND = "valgrind",
SCONSBIN = env.File("#/tools/scons"),
- SCONSARGS = [ '-Q', '-j$CONCURRENCY_LEVEL', 'debug=$debug', 'final=$final' ] + \
- [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ],
+ SCONSARGS = ([ '-Q', '-j$CONCURRENCY_LEVEL' ] +
+ [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ]),
SCONS = "@$SCONSBIN $SCONSARGS",
CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1,
TOPDIR = env.Dir('#').abspath,
FLAVOR = '',
)
+env.Replace(
+ _defines = senfutil.expandDefines
+)
+
# Set variables from command line
senfutil.parseArguments(
env,
context.Result( ret[0] )
return ret[0]
-# Default configuration (boost stuff)
-senfutil.Configure(env)
+def customChecks(conf):
+ conf.env.Replace(
+ HAVE_VALGRIND = conf.CheckValgrind() and conf.CheckValgrindWildcards()
+ )
-conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
-env.Replace(
- HAVE_VALGRIND = conf.CheckValgrind() and conf.CheckValgrindWildcards()
-)
-conf.Finish()
+senfutil.Configure(env, customChecks)
# Only add this here, after all configure checks have run