Fix CPPDFINES handling in scons

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 17e18b6..0bb858a 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -59,10 +59,8 @@ Some unit tests will only run when executed to 'root'.
 """)
 
 env.Append(
-   ENV                    = { 'PATH' : os.environ.get('PATH'), 
-                              'HOME' : os.environ.get('HOME'),
-                              'SSH_AGENT_PID': os.environ.get('SSH_AGENT_PID'),
-                              'SSH_AUTH_SOCK': os.environ.get('SSH_AUTH_SOCK') },
+   IMPORT_ENV             = [ 'PATH', 'HOME', 'SSH_*', 'SENF*', 'CCACHE_*', 'DISTCC_*' ],
+
    CLEAN_PATTERNS         = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*',
                               '.sconf_temp' ],
 
@@ -106,7 +104,7 @@ env.Append(
    CPPDEFINES             = [ '$expandLogOption', '$CPPDEFINES_' ],
    expandLogOption        = senfutil.expandLogOption,
    CPPDEFINES_            = senfutil.BuildTypeOptions('CPPDEFINES'),
-   CPPDEFINES_final       = [ ],
+   CPPDEFINES_final       = [ 'SENF_PPI_NOTRACE'],
    CPPDEFINES_normal      = [ 'SENF_DEBUG' ],
    CPPDEFINES_debug       = [ '$CPPDEFINES_normal' ],
 
@@ -117,9 +115,6 @@ env.Append(
    LINKFLAGS_debug        = [ '-g' ],
 )
 
-# Add all UNIX env vars starting with 'SENF' to the execution environment
-env.Append( ENV = dict(((k,v) for k,v in os.environ.iteritems() if k.startswith("SENF"))) )
-
 env.SetDefault(
     LIBSENF           = "senf",
     LCOV              = "lcov",
@@ -136,6 +131,10 @@ env.SetDefault(
     FLAVOR            = '',
 )
 
+env.Replace(
+    _defines          = senfutil.expandDefines
+)
+
 # Set variables from command line
 senfutil.parseArguments(
     env,
@@ -145,6 +144,12 @@ senfutil.parseArguments(
     BoolVariable('sparse_tests', 'Link tests against object files and not the senf lib', False)
 )
 
+# Add UNIX env vars matching IMPORT_ENV patterns into the execution environment
+env.Append( ENV = dict(( (k,v) 
+                         for pattern in env['IMPORT_ENV']
+                         for k,v in os.environ.iteritems()
+                         if fnmatch.fnmatchcase(k,pattern) )) )
+
 if 'test_changes' in COMMAND_LINE_TARGETS and not env.has_key('only_tests'):
     import SparseTestHack
     env['only_tests'] = " ".join(x.abspath for x in SparseTestHack.findSCMChanges(env))
@@ -223,10 +228,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)