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

Enable passing individual files to scan_resources

pull/2056/head
Jimmy Brisson 2016-06-28 14:55:23 -05:00
parent ec1ec7c3e2
commit c7acb7c293
1 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/toolchains/__init__.py
View File

@ -22,7 +22,7 @@ from copy import copy
from time import time, sleep from time import time, sleep
from types import ListType from types import ListType
from shutil import copyfile from shutil import copyfile
from os.path import join, splitext, exists, relpath, dirname, basename, split, abspath from os.path import join, splitext, exists, relpath, dirname, basename, split, abspath, isfile, isdir
from inspect import getmro from inspect import getmro
from copy import deepcopy from copy import deepcopy
from tools.config import Config from tools.config import Config
@ -431,13 +431,21 @@ class mbedToolchain:
return False return False
def scan_resources(self, path, exclude_paths=None, base_path=None): def scan_resources(self, path, exclude_paths=None, base_path=None):
labels = self.get_labels()
resources = Resources(path) resources = Resources(path)
if not base_path: if not base_path:
if isfile(path):
base_path = dirname(path)
else:
base_path = path base_path = path
resources.base_path = base_path resources.base_path = base_path
if isfile(path):
self.add_file(path, resources, base_path, exclude_paths=exclude_paths)
else:
self.add_dir(path, resources, base_path, exclude_paths=exclude_paths)
return resources
def add_dir(self, path, resources, base_path, exclude_paths=None):
""" os.walk(top[, topdown=True[, onerror=None[, followlinks=False]]]) """ os.walk(top[, topdown=True[, onerror=None[, followlinks=False]]])
When topdown is True, the caller can modify the dirnames list in-place When topdown is True, the caller can modify the dirnames list in-place
(perhaps using del or slice assignment), and walk() will only recurse into (perhaps using del or slice assignment), and walk() will only recurse into
@ -448,6 +456,7 @@ class mbedToolchain:
bottom-up mode the directories in dirnames are generated before dirpath bottom-up mode the directories in dirnames are generated before dirpath
itself is generated. itself is generated.
""" """
labels = self.get_labels()
for root, dirs, files in walk(path, followlinks=True): for root, dirs, files in walk(path, followlinks=True):
# Check if folder contains .mbedignore # Check if folder contains .mbedignore
if ".mbedignore" in files: if ".mbedignore" in files:
@ -497,13 +506,15 @@ class mbedToolchain:
for file in files: for file in files:
file_path = join(root, file) file_path = join(root, file)
self.add_file(file_path, resources, base_path)
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(file_path):
continue return
_, ext = splitext(file) _, ext = splitext(file_path)
ext = ext.lower() ext = ext.lower()
if ext == '.s': if ext == '.s':
@ -523,7 +534,7 @@ class mbedToolchain:
elif ext == self.LIBRARY_EXT: elif ext == self.LIBRARY_EXT:
resources.libraries.append(file_path) resources.libraries.append(file_path)
resources.lib_dirs.add(root) resources.lib_dirs.add(dirname(file_path))
elif ext == self.LINKER_EXT: elif ext == self.LINKER_EXT:
if resources.linker_script is not None: if resources.linker_script is not None:
@ -548,7 +559,6 @@ class mbedToolchain:
elif ext == '.json': elif ext == '.json':
resources.json_files.append(file_path) resources.json_files.append(file_path)
return resources
def scan_repository(self, path): def scan_repository(self, path):
resources = [] resources = []