diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-12-17 14:31:03 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-12-17 14:31:03 (GMT) |
| commit | 98b9ca9a3abd8c5c5fae9ff92331b63ba4cedd87 (patch) | |
| tree | e57174a1c5d2e8d8f49577d5da14d3a13e1b8f33 | |
| parent | 8617739fb8bfb9fee2252a02d47c5de220921ae4 (diff) | |
| download | SCons-98b9ca9a3abd8c5c5fae9ff92331b63ba4cedd87.zip SCons-98b9ca9a3abd8c5c5fae9ff92331b63ba4cedd87.tar.gz SCons-98b9ca9a3abd8c5c5fae9ff92331b63ba4cedd87.tar.bz2 | |
fix swig test failing on windows due to \r\n line endings
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 309585d..ce54e62 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -139,9 +139,13 @@ def _get_swig_version(env, swig): if pipe.wait() != 0: return out = pipe.stdout.read() - match = re.search(r'SWIG Version\s+(\S+)$', out, re.MULTILINE) + match = re.search(r'SWIG Version\s+(\S+).*', out, re.MULTILINE) if match: + # print "Version is:%s"%match.group(1) return match.group(1) + else: + # print "Unable to detect version: [%s]"%out + pass def generate(env): """Add Builders and construction variables for swig to an Environment.""" |