diff options
author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-20 21:52:38 -0400 |
---|---|---|
committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-20 21:52:38 -0400 |
commit | eca65973b04291cfa2ca2a621b114f3aae3eee21 (patch) | |
tree | 0b0b37051a29dd48d2fb9c9c49a11182a276a0d9 /test/SWIG/implicit-dependencies.py | |
parent | b5cb72d194ec49e1bd30cdb582c366285eaeeb88 (diff) | |
download | scons-eca65973b04291cfa2ca2a621b114f3aae3eee21.tar.gz |
SWIG: improve tool detection, and update SWIG tests to run on Windows.
The tool detection is improved by checking for swig in
env['SWIG'], where it is commonly set, as well as env['ENV']['PATH'].
The tests mostly didn't work on Windows. I updated them all.
Mostly to build 32-bit extensions when using 32-bit python on
Windows, and use .pyd as the python extension on Windows.
Diffstat (limited to 'test/SWIG/implicit-dependencies.py')
-rw-r--r-- | test/SWIG/implicit-dependencies.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/SWIG/implicit-dependencies.py b/test/SWIG/implicit-dependencies.py index 6d402162..465a0d65 100644 --- a/test/SWIG/implicit-dependencies.py +++ b/test/SWIG/implicit-dependencies.py @@ -52,7 +52,7 @@ test.write("dependent.i", """\ """) test.write('SConstruct', """ -foo = Environment(SWIGFLAGS='-python') +foo = Environment(SWIGFLAGS='-python', SWIG='%(swig)s') swig = foo.Dictionary('SWIG') bar = foo.Clone(SWIG = [r'%(python)s', r'wrapper.py', swig]) foo.CFile(target = 'dependent', source = ['dependent.i']) |