diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-07-04 20:49:28 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-07-04 20:49:28 (GMT) |
| commit | b82ceff0a9c3b2cdb1f67c8c56bdbbd8dad7861d (patch) | |
| tree | 288b5889cd069cb83d7c8cd2839c750d815b265d /src/engine/SCons/Script | |
| parent | 7fd29a508fe8a47667ae1853ee393f05e29c6c8c (diff) | |
| parent | 1c43f7f384bf30f6cce14dc9d3d1e485891c7ddd (diff) | |
| download | SCons-b82ceff0a9c3b2cdb1f67c8c56bdbbd8dad7861d.zip SCons-b82ceff0a9c3b2cdb1f67c8c56bdbbd8dad7861d.tar.gz SCons-b82ceff0a9c3b2cdb1f67c8c56bdbbd8dad7861d.tar.bz2 | |
Merged in techtonik/scons (pull request #147).
Fix mailing list addrs and bug tracker references, and a few other
doc fixes.
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index fb58e9b..439b869 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -1025,13 +1025,17 @@ def _main(parser): # in case they disabled the warning in the SConscript files. if python_version_deprecated(): msg = "Support for pre-%s Python version (%s) is deprecated.\n" + \ - " If this will cause hardship, contact dev@scons.tigris.org." + " If this will cause hardship, contact scons-dev@scons.org" deprecated_version_string = ".".join(map(str, deprecated_python_version)) SCons.Warnings.warn(SCons.Warnings.PythonVersionWarning, msg % (deprecated_version_string, python_version_string())) if not options.help: - SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment()) + # [ ] Clarify why we need to create Builder here at all, and + # why it is created in DefaultEnvironment + # https://bitbucket.org/scons/scons/commits/d27a548aeee8ad5e67ea75c2d19a7d305f784e30 + if SCons.SConf.NeedConfigHBuilder(): + SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment()) # Now re-parse the command-line options (any to the left of a '--' # argument, that is) with any user-defined command-line options that |