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

Merge pull request #1888 from sg-/feature-label 

Feature label
pull/1890/head
Martin Kojtal 2016-06-09 15:40:46 +01:00
parent 91b96131bc d71f015659
commit 24e767c10f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hal/targets.json
View File

@ -7,6 +7,7 @@
"is_disk_virtual": false, "is_disk_virtual": false,
"macros": [], "macros": [],
"device_has": [], "device_has": [],
"features": [],
"detect_code": [], "detect_code": [],
"public": false "public": false
}, },

3
workspace_tools/toolchains/__init__.py
View File

@ -281,6 +281,7 @@ class mbedToolchain:
# Target and Toolchain symbols # Target and Toolchain symbols
labels = self.get_labels() labels = self.get_labels()
self.symbols = ["TARGET_%s" % t for t in labels['TARGET']] self.symbols = ["TARGET_%s" % t for t in labels['TARGET']]
self.symbols.extend(["FEATURE_%s" % t for t in labels['FEATURE']])
self.symbols.extend(["TOOLCHAIN_%s" % t for t in labels['TOOLCHAIN']]) self.symbols.extend(["TOOLCHAIN_%s" % t for t in labels['TOOLCHAIN']])
# Config support # Config support
@ -314,6 +315,7 @@ class mbedToolchain:
toolchain_labels.remove('mbedToolchain') toolchain_labels.remove('mbedToolchain')
self.labels = { self.labels = {
'TARGET': self.target.get_labels(), 'TARGET': self.target.get_labels(),
'FEATURE': self.target.features,
'TOOLCHAIN': toolchain_labels 'TOOLCHAIN': toolchain_labels
} }
return self.labels return self.labels
@ -364,6 +366,7 @@ class mbedToolchain:
if ((d.startswith('.') or d in self.legacy_ignore_dirs) or if ((d.startswith('.') or d in self.legacy_ignore_dirs) or
(d.startswith('TARGET_') and d[7:] not in labels['TARGET']) or (d.startswith('TARGET_') and d[7:] not in labels['TARGET']) or
(d.startswith('FEATURE_') and d[8:] not in labels['FEATURE']) or
(d.startswith('TOOLCHAIN_') and d[10:] not in labels['TOOLCHAIN'])): (d.startswith('TOOLCHAIN_') and d[10:] not in labels['TOOLCHAIN'])):
dirs.remove(d) dirs.remove(d)