From dcad55050058bba3c52589c76b7c314105956560 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 3 Oct 2015 10:39:03 -0700 Subject: [PATCH] Move do_sconscript to site_init --- SConstruct | 10 ---------- site_scons/site_init.py | 9 ++++++++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/SConstruct b/SConstruct index fafc38a..a06af1b 100644 --- a/SConstruct +++ b/SConstruct @@ -20,16 +20,6 @@ SRC_DIR = Dir('#src') TEST_DIR = Dir('#test') -def do_sconscript(env, src_dir, out_dir): - sconscript = src_dir.File('SConscript') - print 'Reading {}'.format(sconscript) - # Swapping env and build_env here is a bit wacky. Doing so means that env is - # always the Environment that the SConscript should be building with, while - # build_env is the Environment we're using to put everything together. - env.SConscript(sconscript, - {'env': env.Clone(), 'build_env': env}, - variant_dir=out_dir) - modes = { 'debug': erw.DebugEnvironment(succinct=not BUILD_CMDS), 'beta': erw.BetaEnvironment(succinct=not BUILD_CMDS), diff --git a/site_scons/site_init.py b/site_scons/site_init.py index 1c64046..cfe68e7 100644 --- a/site_scons/site_init.py +++ b/site_scons/site_init.py @@ -1,7 +1,14 @@ # site_init.py # Eryn Wells -import erw + +def do_sconscript(env, src_dir, out_dir): + ''' + Look for a SConscript file in `src_dir` and run it. Return any result. + ''' + sconscript = src_dir.File('SConscript') + print 'Reading {}'.format(sconscript) + return env.SConscript(sconscript, {'env': env}, variant_dir=out_dir) # # Argument utils