Apply patch from bug 2706 and create testcase to check for whitespace after module name in %module directive

3 files changed, 98 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.
diff --git a/test/SWIG/module-spaces.py b/test/SWIG/module-spaces.py
new file mode 100644
index 0000000..a0056f0
--- /dev/null
+++ b/test/SWIG/module-spaces.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify that we correctly parse module names with spaces on the line after
+the module name ; e.g. "%module test                 "
+"""
+
+import os.path
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+swig = test.where_is('swig')
+if not swig:
+    test.skip_test('Can not find installed "swig", skipping test.\n')
+
+python, python_include, python_libpath, python_lib = \
+             test.get_platform_python_info()
+Python_h = os.path.join(python_include, 'Python.h')
+if not os.path.exists(Python_h):
+    test.skip_test('Can not find %s, skipping test.\n' % Python_h)
+
+test.write(['SConstruct'], """\
+env = Environment(SWIGFLAGS = '-python -c++',
+                  CPPPATH=[r'%(python_include)s'],
+                  SWIG=[r'%(swig)s'],
+                  LIBPATH=[r'%(python_libpath)s'],
+                  LIBS='%(python_lib)s',
+		  )
+
+env.LoadableModule('test1.so', ['test1.i', 'test1.cc'])
+""" % locals())
+
+test.write(['test1.cc'], """\
+int test1func()
+{
+  return 0;
+}
+""")
+
+test.write(['test1.h'], """\
+int test1func();
+""")
+
+test.write(['test1.i'], """\
+%module test1       
+
+%{
+#include "test1.h"
+%}
+
+%include "test1.h"
+""")
+
+test.run(arguments = '.')
+
+# If we erroneously think the generated Python module is called "test1".py
+# rather than test1.py, the test will not be up to date
+test.up_to_date(arguments = '.')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: