Add "components"

pull/7644/head
Jimmy Brisson 2018-07-30 09:17:53 -05:00
parent b53a9ea4c0
commit 79ee1b8e02
3 changed files with 5 additions and 2 deletions

View File

@ -135,7 +135,9 @@ class Resources(object):
# Incremental scan related # Incremental scan related
self._label_paths = [] self._label_paths = []
self._labels = {"TARGET": [], "TOOLCHAIN": [], "FEATURE": []} self._labels = {
"TARGET": [], "TOOLCHAIN": [], "FEATURE": [], "COMPONENT": []
}
self._prefixed_labels = set() self._prefixed_labels = set()
# Path seperator style (defaults to OS-specific seperator) # Path seperator style (defaults to OS-specific seperator)

View File

@ -91,7 +91,7 @@ def cached(func):
# Cumulative attributes can have values appended to them, so they # Cumulative attributes can have values appended to them, so they
# need to be computed differently than regular attributes # need to be computed differently than regular attributes
CUMULATIVE_ATTRIBUTES = ['extra_labels', 'macros', 'device_has', 'features'] CUMULATIVE_ATTRIBUTES = ['extra_labels', 'macros', 'device_has', 'features', 'components']
def get_resolution_order(json_data, target_name, order, level=0): def get_resolution_order(json_data, target_name, order, level=0):

View File

@ -224,6 +224,7 @@ class mbedToolchain:
self.labels = { self.labels = {
'TARGET': self.target.labels, 'TARGET': self.target.labels,
'FEATURE': self.target.features, 'FEATURE': self.target.features,
'COMPONENT': self.target.components,
'TOOLCHAIN': toolchain_labels 'TOOLCHAIN': toolchain_labels
} }