X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=0b729ab0a03112e1e91f05882ab5c492619c6a2f;hb=fced83b657fb218b9dd4b4d5b09fd8c543908318;hp=cce33f06282ea850ad4c3973e1495d615fd93ab8;hpb=7225d467b3ceaf96bce7ec914a88acb9608c2f5e;p=senf.git diff --git a/SConstruct b/SConstruct index cce33f0..0b729ab 100644 --- a/SConstruct +++ b/SConstruct @@ -63,7 +63,8 @@ env.Append( 'HOME' : os.environ.get('HOME'), 'SSH_AGENT_PID': os.environ.get('SSH_AGENT_PID'), 'SSH_AUTH_SOCK': os.environ.get('SSH_AUTH_SOCK') }, - CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ], + CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*', + '.sconf_temp' ], BUILDDIR = '${FLAVOR and "#/build/$FLAVOR" or "#"}', CPPPATH = [ '#', '$BUILDDIR', @@ -96,11 +97,11 @@ env.Append( INLINE_OPTS_NORMAL = [ '-finline-limit=5000' ], INLINE_OPTS = [ '$INLINE_OPTS_NORMAL' ], CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS', - '$CXXFLAGS_' ], + '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing' ], CXXFLAGS_ = senfutil.BuildTypeOptions('CXXFLAGS'), CXXFLAGS_final = [ '-O3' ], - CXXFLAGS_normal = [ '-O0', '-g' ], - CXXFLAGS_debug = [ '$CXXFLAGS_normal' ], + CXXFLAGS_normal = [ '-O2', '-g' ], + CXXFLAGS_debug = [ '-O0', '-g' ], CPPDEFINES = [ '$expandLogOption', '$CPPDEFINES_' ], expandLogOption = senfutil.expandLogOption, @@ -154,25 +155,25 @@ Export('env') ########################################################################### # Configure -# Default configuration (boost stuff) -senfutil.Configure(env) - @senfconf.Test def CheckValgrind(context): context.Message( "Checking for valgrind... " ) - ret = context.TryAction(['valgrind --version >$TARGET']) + ret = context.TryAction(['$VALGRIND --version >$TARGET']) context.Result( ret[1].strip() or False ) return ret[0] @senfconf.Test def CheckValgrindWildcards(context): context.Message( "Checking whether valgrind supports '...' wildcards in suppressions... " ) - ret = context.TryAction(['valgrind --suppressions=$SOURCE /bin/true'], + ret = context.TryAction(['$VALGRIND --suppressions=$SOURCE /bin/true'], "{\n test_suppression\n Memcheck:Addr4\n ...\n fun:foo\n}\n", ".sup") context.Result( ret[0] ) return ret[0] +# Default configuration (boost stuff) +senfutil.Configure(env) + conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests()) env.Replace( HAVE_VALGRIND = conf.CheckValgrind() and conf.CheckValgrindWildcards() @@ -222,10 +223,12 @@ if env['sparse_tests']: #### install_all, default, all_tests, all env.Install('${SCONSINSTALLDIR}', [ 'site_scons/__init__.py', 'site_scons/senfutil.py', + 'site_scons/senfconf.py', 'site_scons/yaptu.py' ]) env.InstallDir('${SCONSINSTALLDIR}', [ 'site_scons/site_tools', 'site_scons/lib' ], FILTER_SUFFIXES=[ '','.css','.pl','.py','.sh','.sty','.xml','.xsl','.yap' ]) -env.Install('${INCLUDEINSTALLDIR}', 'boost') +env.Install('${INCLUDEINSTALLDIR}', 'boost_ext') +env.Install('${INCLUDEINSTALLDIR}/senf', 'senf/boost_intrusive') env.Alias('install_all', env.FindInstalledFiles()) env.Alias('default', DEFAULT_TARGETS)