diff options
| -rw-r--r-- | src/CHANGES.txt | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 4 | ||||
| -rw-r--r-- | test/SWIG/module-deduced-name.py | 79 |
3 files changed, 82 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 79dfac1..da18539 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -146,6 +146,7 @@ RELEASE 2.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE the initialization of the respective Tools (#2730). - Improved docs for custom Decider functions and custom Scanner objects (#2711, #2713). + - Corrected SWIG module names for generated *.i files (#2707). From Joe Zuntz: diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 23b251b..d51a386 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -66,9 +66,9 @@ def _find_modules(src): try: matches = _reModule.findall(open(src).read()) except IOError: - # If the file's not yet generated, guess the module name from the filename + # If the file's not yet generated, guess the module name from the file stem matches = [] - mnames.append(os.path.splitext(src)[0]) + mnames.append(os.path.splitext(os.path.basename(src))[0]) for m in matches: mnames.append(m[2]) diff --git a/test/SWIG/module-deduced-name.py b/test/SWIG/module-deduced-name.py new file mode 100644 index 0000000..733b6c1 --- /dev/null +++ b/test/SWIG/module-deduced-name.py @@ -0,0 +1,79 @@ +#!/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 under the use of the $SWIGOUTDIR variable, SCons correctly deduces +module names from *.i files. As reported by Antoine Dechaume in #2707, the SWIG +emitter should return the basename of the module only. +""" + +import TestSCons +import os + +test = TestSCons.TestSCons() + +swig = test.where_is('swig') +if not swig: + test.skip_test('Cannot 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('Cannot find %s, skipping test.\n' % Python_h) + +test.write(['SConstruct'], """\ +env = Environment(SWIGFLAGS = '-python -c++', + CPPPATH=[r"%(python_include)s"], + SWIG=[r'%(swig)s'], + SWIGOUTDIR='python/build dir', + LIBPATH=[r'%(python_libpath)s'], + LIBS='%(python_lib)s', + ) + +env.LoadableModule('python_foo_interface', 'interfaces/python_foo_interface.i') + +Command("interfaces/python_foo_interface.i", "interfaces/python_foo_interface.ix", Copy("$TARGET", "$SOURCE")) +""" % locals()) + +test.subdir('interfaces') +test.write(['interfaces/python_foo_interface.ix'], """\ +%module python_foo_interface +""") + +test.run(arguments = '.') + +test.must_not_exist(['python','build dir','interfaces']) +test.must_not_exist(['python','build dir','interfaces','python_foo_interface.py']) +test.must_exist(['python','build dir','python_foo_interface.py']) + +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: |