diff options
| author | David Robillard <d@drobilla.net> | 2019-03-17 17:31:03 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-03-17 17:31:03 +0100 |
| commit | 46ac21b8c413f73ad723499aa76ecea2f59cb57d (patch) | |
| tree | d2dcbaf61f3749f73dc7a5e10d3fc6cd5e6e129a /extras/cython.py | |
| parent | a7f9adc02eaf813925bfe7437526afa827589365 (diff) | |
| download | ingen-46ac21b8c413f73ad723499aa76ecea2f59cb57d.tar.gz ingen-46ac21b8c413f73ad723499aa76ecea2f59cb57d.tar.bz2 ingen-46ac21b8c413f73ad723499aa76ecea2f59cb57d.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/cython.py')
| -rw-r--r-- | extras/cython.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/extras/cython.py b/extras/cython.py index 481d6f4c..591c274d 100644 --- a/extras/cython.py +++ b/extras/cython.py @@ -8,8 +8,9 @@ from waflib.TaskGen import extension cy_api_pat = re.compile(r'\s*?cdef\s*?(public|api)\w*') re_cyt = re.compile(r""" - (?:from\s+(\w+)\s+)? # optionally match "from foo" and capture foo - c?import\s(\w+|[*]) # require "import bar" and capture bar + ^\s* # must begin with some whitespace characters + (?:from\s+(\w+)(?:\.\w+)*\s+)? # optionally match "from foo(.baz)" and capture foo + c?import\s(\w+|[*]) # require "import bar" and capture bar """, re.M | re.VERBOSE) @extension('.pyx') @@ -85,12 +86,12 @@ class cython(Task.Task): node = self.inputs[0] txt = node.read() - mods = [] + mods = set() for m in re_cyt.finditer(txt): if m.group(1): # matches "from foo import bar" - mods.append(m.group(1)) + mods.add(m.group(1)) else: - mods.append(m.group(2)) + mods.add(m.group(2)) Logs.debug('cython: mods %r', mods) incs = getattr(self.generator, 'cython_includes', []) @@ -99,7 +100,7 @@ class cython(Task.Task): found = [] missing = [] - for x in mods: + for x in sorted(mods): for y in incs: k = y.find_resource(x + '.pxd') if k: |