FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

pytest: Also add in-source library dependencies to libpath. buildcopy: Renamed to_nodes to to_src_nodes to avoid any confusion.

This commit is contained in:
Calle Rosenquist 2017-09-22 06:51:26 +00:00 committed by Thomas Nagy
parent 6e44206a67
commit 89c755e714
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
waflib/extras/buildcopy.py
View File

@ -30,7 +30,7 @@ def make_buildcopy(self):
""" """
Creates the buildcopy task. Creates the buildcopy task.
""" """
def to_nodes(lst): def to_src_nodes(lst):
"""Find file nodes only in src, TaskGen.to_nodes will not work for this since it gives """Find file nodes only in src, TaskGen.to_nodes will not work for this since it gives
preference to nodes in build. preference to nodes in build.
""" """
@ -57,7 +57,7 @@ def make_buildcopy(self):
return node return node
raise Errors.WafError('buildcopy: File not found in src: %s'%os.path.join(*lst)) raise Errors.WafError('buildcopy: File not found in src: %s'%os.path.join(*lst))
nodes = [ to_nodes(n) for n in getattr(self, 'buildcopy_source', getattr(self, 'source', [])) ] nodes = [ to_src_nodes(n) for n in getattr(self, 'buildcopy_source', getattr(self, 'source', [])) ]
node_pairs = [(n, n.get_bld()) for n in nodes] node_pairs = [(n, n.get_bld()) for n in nodes]
self.create_task('buildcopy', [n[0] for n in node_pairs], [n[1] for n in node_pairs], node_pairs=node_pairs) self.create_task('buildcopy', [n[0] for n in node_pairs], [n[1] for n in node_pairs], node_pairs=node_pairs)

22
waflib/extras/pytest.py
View File

@ -58,7 +58,6 @@ import os
from waflib import Task, TaskGen, Errors, Utils, Logs from waflib import Task, TaskGen, Errors, Utils, Logs
from waflib.Tools import ccroot from waflib.Tools import ccroot
from waflib import Node
def _process_use_rec(self, name): def _process_use_rec(self, name):
""" """
Recursively process ``use`` for task generator with name ``name``.. Recursively process ``use`` for task generator with name ``name``..
@ -88,19 +87,17 @@ def pytest_process_use(self):
""" """
self.pytest_use_not = set() self.pytest_use_not = set()
self.pytest_use_seen = [] self.pytest_use_seen = []
self.pytest_paths = [] self.pytest_paths = [] # strings
self.pytest_libpaths = [] self.pytest_libpaths = [] # strings
self.pytest_dep_nodes = [] self.pytest_dep_nodes = []
names = self.to_list(getattr(self, 'use', [])) names = self.to_list(getattr(self, 'use', []))
for name in names: for name in names:
_process_use_rec(self, name) _process_use_rec(self, name)
def extend_unique(lst, var): def extend_unique(lst, varlst):
ext = [] ext = []
for x in Utils.to_list(var): for x in varlst:
#if isinstance(x, str):
# x = x.abspath()
if x not in lst: if x not in lst:
ext.append(x) ext.append(x)
lst.extend(ext) lst.extend(ext)
@ -110,8 +107,8 @@ def pytest_process_use(self):
for name in self.pytest_use_seen: for name in self.pytest_use_seen:
tg = self.bld.get_tgen_by_name(name) tg = self.bld.get_tgen_by_name(name)
extend_unique(self.pytest_paths, getattr(tg, 'pytest_path', [])) extend_unique(self.pytest_paths, Utils.to_list(getattr(tg, 'pytest_path', [])))
extend_unique(self.pytest_libpaths, getattr(tg, 'pytest_libpath', [])) extend_unique(self.pytest_libpaths, Utils.to_list(getattr(tg, 'pytest_libpath', [])))
if 'py' in tg.features: if 'py' in tg.features:
# Python dependencies are added to PYTHONPATH # Python dependencies are added to PYTHONPATH
@ -121,9 +118,9 @@ def pytest_process_use(self):
# Since buildcopy is used we assume that PYTHONPATH in build should be used, # Since buildcopy is used we assume that PYTHONPATH in build should be used,
# not source # not source
pypath = getattr(tg, 'install_from', tg.path) pypath = getattr(tg, 'install_from', tg.path)
extend_unique(self.pytest_paths, pypath.get_bld().abspath()) extend_unique(self.pytest_paths, [pypath.get_bld().abspath()])
# Add builcopy output nodes to dependencies # Add buildcopy output nodes to dependencies
extend_unique(self.pytest_dep_nodes, [o for task in getattr(tg, 'tasks', []) \ extend_unique(self.pytest_dep_nodes, [o for task in getattr(tg, 'tasks', []) \
for o in getattr(task, 'outputs', [])]) for o in getattr(task, 'outputs', [])])
else: else:
@ -131,7 +128,7 @@ def pytest_process_use(self):
extend_unique(self.pytest_dep_nodes, [s for s in tg.source if s.suffix() == '.py']) extend_unique(self.pytest_dep_nodes, [s for s in tg.source if s.suffix() == '.py'])
pypath = getattr(tg, 'install_from', tg.path) pypath = getattr(tg, 'install_from', tg.path)
extend_unique(self.pytest_paths, pypath.abspath()) extend_unique(self.pytest_paths, [pypath.abspath()])
if getattr(tg, 'link_task', None): if getattr(tg, 'link_task', None):
# For tasks with a link_task (C, C++, D et.c.) include their LIBPATH and if it's # For tasks with a link_task (C, C++, D et.c.) include their LIBPATH and if it's
@ -139,6 +136,7 @@ def pytest_process_use(self):
if not isinstance(tg.link_task, ccroot.stlink_task): if not isinstance(tg.link_task, ccroot.stlink_task):
extend_unique(self.pytest_dep_nodes, tg.link_task.outputs) extend_unique(self.pytest_dep_nodes, tg.link_task.outputs)
extend_unique(self.pytest_libpaths, tg.link_task.env.LIBPATH) extend_unique(self.pytest_libpaths, tg.link_task.env.LIBPATH)
extend_unique(self.pytest_libpaths, [tg.link_task.outputs[0].get_bld().parent.abspath()])
if 'pyext' in tg.features: if 'pyext' in tg.features:
# If the taskgen is extending Python we also want to add it o the PYTHONPATH. # If the taskgen is extending Python we also want to add it o the PYTHONPATH.