ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rewrite include finction to only heed nearest library

pull/9561/head
Jimmy Brisson 2019-01-31 11:31:33 -06:00
parent 92475ae96c
commit 0265b57d35
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/resources/__init__.py
View File

@ -268,15 +268,19 @@ class Resources(object):
def _include_file(self, ref): def _include_file(self, ref):
_, path = ref _, path = ref
starts_with_included = any( starts_with_excluded = [
path.startswith(dirname(e.path)) len(dirname(e.path)) for e in self._excluded_libs
for e in self._libs_filtered if path.startswith(dirname(e.path))
) ]
starts_with_excluded = any( if not starts_with_excluded:
path.startswith(dirname(e.path)) return True
for e in self._excluded_libs starts_with_included = [
) len(dirname(e.path)) for e in self._libs_filtered
return starts_with_included or not starts_with_excluded if path.startswith(dirname(e.path))
]
if not starts_with_included:
return False
return max(starts_with_included) > max(starts_with_excluded)
def get_file_refs(self, file_type): def get_file_refs(self, file_type):
"""Return a list of FileRef for every file of the given type""" """Return a list of FileRef for every file of the given type"""