diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-21 01:52:38 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-08-21 01:52:38 (GMT) |
| commit | 678c769bc6189b5b7c301fbecfb37496725f6aee (patch) | |
| tree | 0b0b37051a29dd48d2fb9c9c49a11182a276a0d9 /test/SWIG/subdir.py | |
| parent | a035c43fb34cc888fca250f26f68fc2b03c018ac (diff) | |
| download | SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.zip SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.tar.gz SCons-678c769bc6189b5b7c301fbecfb37496725f6aee.tar.bz2 | |
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/subdir.py')
| -rw-r--r-- | test/SWIG/subdir.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/SWIG/subdir.py b/test/SWIG/subdir.py index 0b9f24d..e23b858 100644 --- a/test/SWIG/subdir.py +++ b/test/SWIG/subdir.py @@ -39,7 +39,7 @@ import TestSCons if sys.platform == 'win32': _dll = '.dll' else: - _dll = '.so' + _dll = '.so' test = TestSCons.TestSCons() @@ -58,14 +58,21 @@ if not os.path.exists(Python_h): # handle testing on other platforms: ldmodule_prefix = '_' +# On Windows, build a 32-bit exe if on 32-bit python. +if sys.platform == 'win32' and sys.maxsize <= 2**32: + swig_arch_var="TARGET_ARCH='x86'," +else: + swig_arch_var="" + test.write('SConstruct', """ env = Environment(SWIGFLAGS='-python', + %(swig_arch_var)s CPPPATH=['%(python_include)s/'], LDMODULEPREFIX='%(ldmodule_prefix)s', LDMODULESUFFIX='%(_dll)s', SWIG=r'%(swig)s', LIBPATH=[r'%(python_libpath)s'], - LIBS='%(python_lib)s', + LIBS='%(python_lib)s' ) env.LoadableModule('sub/_foo', |