diff options
author | Greg Noel <GregNoel@tigris.org> | 2009-01-04 08:24:11 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2009-01-04 08:24:11 (GMT) |
commit | c72683e53169e438837955dfcfcc3a21cf988d64 (patch) | |
tree | 66ae1607da773bf1241535070543cf2b61b90553 | |
parent | a46317bc7a48afe35b6d591146d231871837a5ae (diff) | |
download | SCons-c72683e53169e438837955dfcfcc3a21cf988d64.zip SCons-c72683e53169e438837955dfcfcc3a21cf988d64.tar.gz SCons-c72683e53169e438837955dfcfcc3a21cf988d64.tar.bz2 |
First part of issue 2278: handle quoted module names in SWIG source
-rw-r--r-- | src/engine/SCons/Tool/swig.py | 16 | ||||
-rw-r--r-- | test/SWIG/module-quoted.py | 92 |
2 files changed, 105 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 16f938e..eb4ca79 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -51,7 +51,17 @@ def swigSuffixEmitter(env, source): return '$SWIGCFILESUFFIX' # Match '%module test', as well as '%module(directors="1") test' -_reModule = re.compile(r'%module(?:\s*\(.*\))?\s+(.+)') +# Also allow for test to be quoted (SWIG permits double quotes, but not single) +_reModule = re.compile(r'%module(\s*\(.*\))?\s+("?)(.+)\2') + +def _find_modules(src): + """Find all modules referenced by %module lines in `src`, a SWIG .i file. + Returns a list of all modules.""" + mnames = [] + matches = _reModule.findall(open(src).read()) + for m in matches: + mnames.append(m[2]) + return mnames def _swigEmitter(target, source, env): swigflags = env.subst("$SWIGFLAGS", target=target, source=source) @@ -61,12 +71,12 @@ def _swigEmitter(target, source, env): mnames = None if "-python" in flags and "-noproxy" not in flags: if mnames is None: - mnames = _reModule.findall(open(src).read()) + mnames = _find_modules(src) target.extend(map(lambda m, d=target[0].dir: d.File(m + ".py"), mnames)) if "-java" in flags: if mnames is None: - mnames = _reModule.findall(open(src).read()) + mnames = _find_modules(src) java_files = map(lambda m: [m + ".java", m + "JNI.java"], mnames) java_files = SCons.Util.flatten(java_files) outdir = env.subst('$SWIGOUTDIR', target=target, source=source) diff --git a/test/SWIG/module-quoted.py b/test/SWIG/module-quoted.py new file mode 100644 index 0000000..97a38b0 --- /dev/null +++ b/test/SWIG/module-quoted.py @@ -0,0 +1,92 @@ +#!/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 quoted module names; e.g. %module "test" +(SWIG permits double-quoted names but not single-quoted ones.) +""" + +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_include_dir = test.get_python_inc() + +python_frameworks_flags = test.get_python_frameworks_flags() + +Python_h = os.path.join(python_include_dir, '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_dir)s", + SWIG=r'%(swig)s', + FRAMEWORKS='%(python_frameworks_flags)s', + ) + +import sys +if sys.version[0] == '1': + # SWIG requires the -classic flag on pre-2.0 Python versions. + env.Append(SWIGFLAGS = ' -classic') + +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() |