diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-11-13 15:01:44 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-11-13 15:01:44 (GMT) |
| commit | 4a0683af8a414b8143dbc369d59f4349d99089ac (patch) | |
| tree | 3d4643d1382f4fb3c0cf79b97a7caa10a6023711 /src/engine/SCons/Tool/swig.py | |
| parent | c2d974ea65afe9ab1968a16c797155fd799527ca (diff) | |
| parent | 04b306103a2c37b90f2d764112c0cb5527313849 (diff) | |
| download | SCons-4a0683af8a414b8143dbc369d59f4349d99089ac.zip SCons-4a0683af8a414b8143dbc369d59f4349d99089ac.tar.gz SCons-4a0683af8a414b8143dbc369d59f4349d99089ac.tar.bz2 | |
Merged in williamblevins/scons_20150323 (pull request #244)
Diffstat (limited to 'src/engine/SCons/Tool/swig.py')
| -rw-r--r-- | src/engine/SCons/Tool/swig.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 44686ef..309585d 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -39,7 +39,6 @@ import subprocess import SCons.Action import SCons.Defaults -import SCons.Scanner import SCons.Tool import SCons.Util import SCons.Node @@ -177,11 +176,6 @@ def generate(env): env['_SWIGINCFLAGS'] = '$( ${_concat(SWIGINCPREFIX, SWIGPATH, SWIGINCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)' env['SWIGCOM'] = '$SWIG -o $TARGET ${_SWIGOUTDIR} ${_SWIGINCFLAGS} $SWIGFLAGS $SOURCES' - expr = '^[ \t]*%[ \t]*(?:include|import|extern)[ \t]*(<|"?)([^>\s"]+)(?:>|"?)' - scanner = SCons.Scanner.ClassicCPP("SWIGScan", ".i", "SWIGPATH", expr) - - env.Append(SCANNERS = scanner) - def exists(env): swig = env.get('SWIG') or env.Detect(['swig']) return swig |