summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorgrbd <garlicbready@googlemail.com>2018-04-15 11:15:48 (GMT)
committergrbd <garlicbready@googlemail.com>2018-04-15 11:15:48 (GMT)
commitd2ac0761b978215d2006c4bf892bfb8b2a42172d (patch)
tree1d61be29f507f32f5fdab0e1525a948421d578bb /src
parent240e270dbbab754ab36ec6cea8cc7ba3faaa242c (diff)
downloadSCons-d2ac0761b978215d2006c4bf892bfb8b2a42172d.zip
SCons-d2ac0761b978215d2006c4bf892bfb8b2a42172d.tar.gz
SCons-d2ac0761b978215d2006c4bf892bfb8b2a42172d.tar.bz2
Added in support for Sconstruct.py
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/engine/SCons/Script/Main.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index be4e0dd..093c628 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,7 +8,7 @@
RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
From Richard West:
- - Add SConstruct.py and sconstruct.py to the search path for the root SConstruct file.
+ - 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:
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 18c493c..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', 'SConstruct.py', 'sconstruct.py']
+ 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):