From 146b177ca99f133b6391afc1acbbdd602360a2d0 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sun, 28 Feb 2016 09:22:46 -0800 Subject: [PATCH] Property export env --- site_scons/site_tools/sconscript.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/site_scons/site_tools/sconscript.py b/site_scons/site_tools/sconscript.py index 12c0015..3e9b597 100644 --- a/site_scons/site_tools/sconscript.py +++ b/site_scons/site_tools/sconscript.py @@ -11,19 +11,18 @@ def _do_sconscript(env): original_sconscript = env.SConscript def sconscript(env, sconscript, clone=False, *args, **kwargs): - exports = {'Library': env.Library, - 'StaticLibrary': env.StaticLibrary, - 'SharedLibrary': env.SharedLibrary, - 'Program': env.Program, - - 'Append': env.Append, - 'Replace': env.Replace} + exports = { + 'Library': env.Library, + 'Object': env.Object, + 'SharedObject': env.SharedObject, + 'StaticLibrary': env.StaticLibrary, + 'SharedLibrary': env.SharedLibrary, + 'Program': env.Program, + 'env': env.Clone() if clone else env, + } SCons.Script._SConscript.GlobalDict.update(exports) env.log('Reading {}'.format(sconscript)) - return original_sconscript(sconscript, - {'env': env.Clone() if clone else env}, - *args, - **kwargs) + return original_sconscript(sconscript, {}, *args, **kwargs) return sconscript