aboutsummaryrefslogtreecommitdiffstats
path: root/extras/swig.py
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-17 17:31:03 +0100
committerDavid Robillard <d@drobilla.net>2019-03-17 17:31:03 +0100
commit69deb1ab7f622d04e9f1ef132cf3577abf9053a0 (patch)
treed2dcbaf61f3749f73dc7a5e10d3fc6cd5e6e129a /extras/swig.py
parentb95c23571a94ae9cce8dbbc5aa8a84c398cc10d6 (diff)
downloadjalv-69deb1ab7f622d04e9f1ef132cf3577abf9053a0.tar.gz
jalv-69deb1ab7f622d04e9f1ef132cf3577abf9053a0.tar.bz2
jalv-69deb1ab7f622d04e9f1ef132cf3577abf9053a0.zip
Squashed 'waflib/' changes from 915dcb1..e7a29b6
e7a29b6 Upgrade to waf 2.0.15 8280f9d Add command for running executables from the build directory 8073c1a Make make_simple_dox() safe in case of exception 70d03b8 Avoid use of global counter hacks for configuration display b7d689a Rewrite test framework 94deadf Automatically add options and move add_flags() to options context f4259ee Reduce system include path noise 927b608 Automatically display configuration header c44b8f3 Set line justification from a constant in the wscript a48e26f Automatically detect if wscript has a test hook ef66724 Save runtime variables in the environment 63bcbcd Clean up TestContext b1d9505 Add ExecutionContext for setting runtime environment 387c1df Add show_diff() and test_file_equals() utilities 29d4d29 Fix in-tree library paths 9fde01f Add custom configuration context 6d3612f Add lib_path_name constant git-subtree-dir: waflib git-subtree-split: e7a29b6b9b2f842314244c23c14d8f8f560904e1
Diffstat (limited to 'extras/swig.py')
-rw-r--r--extras/swig.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/swig.py b/extras/swig.py
index fd3d6d2..740ab46 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'