Author: [email protected]
Date: Thu Apr 2 06:00:28 2009
New Revision: 1671
Modified:
branches/bleeding_edge/SConstruct
Log:
Apply Lei Zhang's patch to add easy import of additional environment
variables in our scons setup.
Here is an example of importing an additional environment variable:
export MYVAR='value'
scons importenv="MYVAR"
Review URL: http://codereview.chromium.org/60046
Modified: branches/bleeding_edge/SConstruct
==============================================================================
--- branches/bleeding_edge/SConstruct (original)
+++ branches/bleeding_edge/SConstruct Thu Apr 2 06:00:28 2009
@@ -507,7 +507,8 @@
result = Options()
result.Add('mode', 'compilation mode (debug, release)', 'release')
result.Add('sample', 'build sample (shell, process)', '')
- result.Add('env', 'override environment settings
(NAME1:value1,NAME2:value2)', '')
+ result.Add('env', 'override environment settings
(NAME0:value0,NAME1:value1,...)', '')
+ result.Add('importenv', 'import environment settings
(NAME0,NAME1,...)', '')
for (name, option) in SIMPLE_OPTIONS.iteritems():
help = '%s (%s)' % (name, ", ".join(option['values']))
result.Add(name, help, option.get('default'))
@@ -626,9 +627,13 @@
options['arch'] = options['simulator']
-def ParseEnvOverrides(arg):
- # The environment overrides are in the format NAME1:value1,NAME2:value2
+def ParseEnvOverrides(arg, imports):
+ # The environment overrides are in the format
NAME0:value0,NAME1:value1,...
+ # The environment imports are in the format NAME0,NAME1,...
overrides = {}
+ for var in imports.split(','):
+ if var in os.environ:
+ overrides[var] = os.environ[var]
for override in arg.split(','):
pos = override.find(':')
if pos == -1:
@@ -726,7 +731,7 @@
env = Environment(options=opts)
Help(opts.GenerateHelpText(env))
VerifyOptions(env)
- env_overrides = ParseEnvOverrides(env['env'])
+ env_overrides = ParseEnvOverrides(env['env'], env['importenv'])
SourceSignatures(env['sourcesignatures'])
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
