diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-04-15 15:29:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-15 15:29:53 (GMT) |
| commit | aa785cf185918b73976490aa72a280cba2fd5cda (patch) | |
| tree | 8fe1a4b01efc85aff1323752d0bc126b973ec322 /src | |
| parent | d000f3f1fd592cab67661e4ab4d9f928be3c32ea (diff) | |
| parent | d2ac0761b978215d2006c4bf892bfb8b2a42172d (diff) | |
| download | SCons-aa785cf185918b73976490aa72a280cba2fd5cda.zip SCons-aa785cf185918b73976490aa72a280cba2fd5cda.tar.gz SCons-aa785cf185918b73976490aa72a280cba2fd5cda.tar.bz2 | |
Merge pull request #3110 from grbd/master
Add SConstruct.py to the search list
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 19d56da..919ad46 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,6 +7,10 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Richard West: + - Add SConstruct.py, Sconstruct.py, sconstruct.py to the search path for the root SConstruct file. + Allows easier debugging within Visual Studio + From Bernard Blackham: - Fixed handling of side-effects in task master (fixes #3013). diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index f111d35..923ef1e 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -623,7 +623,7 @@ def _SConstruct_exists(dirname='', repositories=[], filelist=None): current directory. """ if not filelist: - filelist = ['SConstruct', 'Sconstruct', 'sconstruct'] + filelist = ['SConstruct', 'Sconstruct', 'sconstruct', 'SConstruct.py', 'Sconstruct.py', 'sconstruct.py'] for file in filelist: sfile = os.path.join(dirname, file) if os.path.isfile(sfile): |