out_dir for do_sconscript is optional

This commit is contained in:
Eryn Wells 2015-10-03 10:49:47 -07:00
parent 1ee16a1747
commit 6087354bc8

View file

@ -2,13 +2,16 @@
# Eryn Wells <eryn@erynwells.me> # Eryn Wells <eryn@erynwells.me>
def do_sconscript(env, src_dir, out_dir): def do_sconscript(env, src_dir, out_dir=None):
''' '''
Look for a SConscript file in `src_dir` and run it. Return any result. Look for a SConscript file in `src_dir` and run it. Return any result.
''' '''
sconscript = src_dir.File('SConscript') sconscript = src_dir.File('SConscript')
print 'Reading {}'.format(sconscript) print 'Reading {}'.format(sconscript)
return env.SConscript(sconscript, {'env': env}, variant_dir=out_dir) kwargs = {}
if out_dir:
kwargs['variant_dir'] = out_dir
return env.SConscript(sconscript, {'env': env}, **kwargs)
# #
# Argument utils # Argument utils