diff options
| author | William Deegan <bill@baddogconsulting.com> | 2011-01-24 01:32:21 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2011-01-24 01:32:21 (GMT) |
| commit | 014b60fc30a50dde8cb87ca3d17eabbfdcc3a49a (patch) | |
| tree | 7f1fff21e51105c77be4c9ad3bdbb55211594e6b /src | |
| parent | 68fcd2b14042333c40301841406a968564159105 (diff) | |
| download | SCons-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')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3f16e58..248938d 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,6 +7,11 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Antoine Dechaume: + - Handle SWIG file where there is whitespace after the module name + properly. Previously the generated files would include + the whitespace. + From Gary Oberbrunner: - Improve error message for EnumVariables to show legal values. 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. |