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

Refactor scan resources to account for base_paths

pull/3660/head
Jimmy Brisson 2017-01-04 15:51:53 -06:00 committed by Anna Bridge
parent 182ff5ad67
commit 91fc7f30cd
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/toolchains/__init__.py
View File

@ -512,6 +512,13 @@ class mbedToolchain:
return True return True
return False return False
def add_ignore_patterns(self, root, base_path, patterns):
real_base = relpath(root, base_path)
if real_base == ".":
self.ignore_patterns.extend(patterns)
else:
self.ignore_patterns.extend(join(real_base, pat) for pat in patterns)
# Create a Resources object from the path pointed to by *path* by either traversing a # Create a Resources object from the path pointed to by *path* by either traversing a
# a directory structure, when *path* is a directory, or adding *path* to the resources, # a directory structure, when *path* is a directory, or adding *path* to the resources,
# when *path* is a file. # when *path* is a file.
@ -559,10 +566,11 @@ class mbedToolchain:
lines = [l for l in lines if l != ""] # Strip empty lines lines = [l for l in lines if l != ""] # Strip empty lines
lines = [l for l in lines if not re.match("^#",l)] # Strip comment lines lines = [l for l in lines if not re.match("^#",l)] # Strip comment lines
# Append root path to glob patterns and append patterns to ignore_patterns # Append root path to glob patterns and append patterns to ignore_patterns
self.ignore_patterns.extend([join(root,line.strip()) for line in lines]) self.add_ignore_patterns(root, base_path, lines)
# Skip the whole folder if ignored, e.g. .mbedignore containing '*' # Skip the whole folder if ignored, e.g. .mbedignore containing '*'
if self.is_ignored(join(root,"")): if self.is_ignored(join(relpath(root, base_path),"")):
dirs[:] = []
continue continue
for d in copy(dirs): for d in copy(dirs):
@ -577,7 +585,7 @@ class mbedToolchain:
# Ignore toolchain that do not match the current TOOLCHAIN # Ignore toolchain that do not match the current TOOLCHAIN
(d.startswith('TOOLCHAIN_') and d[10:] not in labels['TOOLCHAIN']) or (d.startswith('TOOLCHAIN_') and d[10:] not in labels['TOOLCHAIN']) or
# Ignore .mbedignore files # Ignore .mbedignore files
self.is_ignored(join(dir_path,"")) or self.is_ignored(join(relpath(root, base_path), d,"")) or
# Ignore TESTS dir # Ignore TESTS dir
(d == 'TESTS')): (d == 'TESTS')):
dirs.remove(d) dirs.remove(d)
@ -606,7 +614,7 @@ class mbedToolchain:
def _add_file(self, file_path, resources, base_path, exclude_paths=None): def _add_file(self, file_path, resources, base_path, exclude_paths=None):
resources.file_basepath[file_path] = base_path resources.file_basepath[file_path] = base_path
if self.is_ignored(file_path): if self.is_ignored(relpath(file_path, base_path)):
return return
_, ext = splitext(file_path) _, ext = splitext(file_path)