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

Resources: Use path names for ignored dirs 

### Description

Ignored directories are collected for the sake of exporters that use
a blacklist-style approach similar to these build tools. This ignore
list will include `/filer/<gibberish>` when exported from the online
Compiler. This patch fixes that behavoir.

### Pull request type

    [x] Fix
    [ ] Refactor
    [ ] Target update
    [ ] Functionality change
    [ ] Docs update
    [ ] Test update
    [ ] Breaking change
pull/8697/head
Jimmy Brisson 2018-11-09 13:11:40 -06:00
parent 00fcdb87e6
commit b99fd4058b
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/resources/__init__.py
View File

@ -394,7 +394,7 @@ class Resources(object):
root_path = join(relpath(root, base_path)) root_path = join(relpath(root, base_path))
if self._ignoreset.is_ignored(join(root_path,"")): if self._ignoreset.is_ignored(join(root_path,"")):
self.ignore_dir(root_path) self.ignore_dir(join(into_path, root_path))
dirs[:] = [] dirs[:] = []
continue continue
@ -407,11 +407,17 @@ class Resources(object):
if (any(self._not_current_label(d, t) for t if (any(self._not_current_label(d, t) for t
in self._labels.keys())): in self._labels.keys())):
self._label_paths.append((dir_path, base_path, into_path)) self._label_paths.append((dir_path, base_path, into_path))
self.ignore_dir(relpath(dir_path, base_path)) self.ignore_dir(join(
into_path,
relpath(dir_path, base_path)
))
dirs.remove(d) dirs.remove(d)
elif (d.startswith('.') or d in self._legacy_ignore_dirs or elif (d.startswith('.') or d in self._legacy_ignore_dirs or
self._ignoreset.is_ignored(join(root_path, d, ""))): self._ignoreset.is_ignored(join(root_path, d, ""))):
self.ignore_dir(relpath(dir_path, base_path)) self.ignore_dir(join(
into_path,
relpath(dir_path, base_path)
))
dirs.remove(d) dirs.remove(d)
# Add root to include paths # Add root to include paths
@ -452,12 +458,12 @@ class Resources(object):
scanning starting as base_path scanning starting as base_path
""" """
fake_path = join(into_path, relpath(file_path, base_path))
if (self._ignoreset.is_ignored(relpath(file_path, base_path)) or if (self._ignoreset.is_ignored(relpath(file_path, base_path)) or
basename(file_path).startswith(".")): basename(file_path).startswith(".")):
self.ignore_dir(relpath(file_path, base_path)) self.ignore_dir(fake_path)
return return
fake_path = join(into_path, relpath(file_path, base_path))
_, ext = splitext(file_path) _, ext = splitext(file_path)
try: try:
file_type = self._EXT[ext.lower()] file_type = self._EXT[ext.lower()]