summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2011-01-24 01:32:21 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2011-01-24 01:32:21 (GMT)
commit014b60fc30a50dde8cb87ca3d17eabbfdcc3a49a (patch)
tree7f1fff21e51105c77be4c9ad3bdbb55211594e6b /src/engine/SCons/Tool
parent68fcd2b14042333c40301841406a968564159105 (diff)
downloadSCons-014b60fc30a50dde8cb87ca3d17eabbfdcc3a49a.zip
SCons-014b60fc30a50dde8cb87ca3d17eabbfdcc3a49a.tar.gz
SCons-014b60fc30a50dde8cb87ca3d17eabbfdcc3a49a.tar.bz2
Apply patch from bug 2706 and create testcase to check for whitespace after module name in %module directive
Diffstat (limited to 'src/engine/SCons/Tool')
-rw-r--r--src/engine/SCons/Tool/swig.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py
index c6815f7..23b251b 100644
--- a/src/engine/SCons/Tool/swig.py
+++ b/src/engine/SCons/Tool/swig.py
@@ -53,7 +53,8 @@ def swigSuffixEmitter(env, source):
# Match '%module test', as well as '%module(directors="1") test'
# Also allow for test to be quoted (SWIG permits double quotes, but not single)
-_reModule = re.compile(r'%module(\s*\(.*\))?\s+("?)(.+)\2')
+# Also allow for the line to have spaces after test if not quoted
+_reModule = re.compile(r'%module(\s*\(.*\))?\s+("?)(\S+)\2')
def _find_modules(src):
"""Find all modules referenced by %module lines in `src`, a SWIG .i file.