diff options
author | David Robillard <d@drobilla.net> | 2019-03-17 17:31:04 +0100 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2019-03-17 17:31:04 +0100 |
commit | 1c6fb2b3543d1229eadaa2af007383fbcf82289d (patch) | |
tree | d2dcbaf61f3749f73dc7a5e10d3fc6cd5e6e129a /extras/swig.py | |
parent | 9ced2d582681fa87b78ed67f186ed94f4bec1178 (diff) | |
download | serd-1c6fb2b3543d1229eadaa2af007383fbcf82289d.tar.gz serd-1c6fb2b3543d1229eadaa2af007383fbcf82289d.tar.bz2 serd-1c6fb2b3543d1229eadaa2af007383fbcf82289d.zip |
Squashed 'waflib/' changes from 915dcb17..e7a29b6b
e7a29b6b Upgrade to waf 2.0.15
8280f9de Add command for running executables from the build directory
8073c1ad Make make_simple_dox() safe in case of exception
70d03b82 Avoid use of global counter hacks for configuration display
b7d689a4 Rewrite test framework
94deadf0 Automatically add options and move add_flags() to options context
f4259ee4 Reduce system include path noise
927b6082 Automatically display configuration header
c44b8f3b Set line justification from a constant in the wscript
a48e26fd Automatically detect if wscript has a test hook
ef66724d Save runtime variables in the environment
63bcbcd3 Clean up TestContext
b1d95050 Add ExecutionContext for setting runtime environment
387c1dfa Add show_diff() and test_file_equals() utilities
29d4d293 Fix in-tree library paths
9fde01f4 Add custom configuration context
6d3612fd Add lib_path_name constant
git-subtree-dir: waflib
git-subtree-split: e7a29b6b9b2f842314244c23c14d8f8f560904e1
Diffstat (limited to 'extras/swig.py')
-rw-r--r-- | extras/swig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/swig.py b/extras/swig.py index fd3d6d2c..740ab46d 100644 --- a/extras/swig.py +++ b/extras/swig.py @@ -17,10 +17,10 @@ tasks have to be added dynamically: SWIG_EXTS = ['.swig', '.i'] -re_module = re.compile('%module(?:\s*\(.*\))?\s+(.+)', re.M) +re_module = re.compile(r'%module(?:\s*\(.*\))?\s+(.+)', re.M) re_1 = re.compile(r'^%module.*?\s+([\w]+)\s*?$', re.M) -re_2 = re.compile('[#%]include [<"](.*)[">]', re.M) +re_2 = re.compile(r'[#%](?:include|import(?:\(module=".*"\))+|python(?:begin|code)) [<"](.*)[">]', re.M) class swig(Task.Task): color = 'BLUE' |