summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2013-06-08 08:55:06 +0100
committerJosé Fonseca <jfonseca@vmware.com>2013-06-08 08:55:06 +0100
commit0aca2c6b608b80661cb8fd35eb08195ab95743f5 (patch)
treead3278ca30e84a0e292eeca07aa13140bd5b8bce
parent4f905d4900ea962876eb5933dd00d4b251767f71 (diff)
scons: Fix implicit python dependency discovery on Windows.
Probably due to CRLF endings, the discovery of python import statements was not working on Windows builds, causing incremental builds to often fail unless one wiped out the build directory. NOTE: This is a candidate for stable branches.
-rw-r--r--scons/custom.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/scons/custom.py b/scons/custom.py
index 658df97829b..39a5333fd01 100644
--- a/scons/custom.py
+++ b/scons/custom.py
@@ -95,7 +95,7 @@ def createConvenienceLibBuilder(env):
# TODO: handle import statements with multiple modules
# TODO: handle from import statements
-import_re = re.compile(r'^import\s+(\S+)$', re.M)
+import_re = re.compile(r'^\s*import\s+(\S+)\s*$', re.M)
def python_scan(node, env, path):
# http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789
@@ -113,6 +113,7 @@ def python_scan(node, env, path):
if os.path.exists(file):
results.append(env.File(file))
break
+ #print node, map(str, results)
return results
python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py'])