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

Add custom_targets.json file contents to targets 

Avoid duplication of update_target_data() code
Keep "custom_targets.json" filename definition in Targets()
pull/4103/head
Andrew Leech 2017-04-07 11:31:44 +10:00 committed by Andrew Leech
parent 2c4475cacc
commit bf08b108aa
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/options.py
View File

@ -130,9 +130,8 @@ def mcu_is_enabled(parser, mcu):
def extract_mcus(parser, options): def extract_mcus(parser, options):
try: try:
extra_targets = [join(src, "custom_targets.json") for src in options.source_dir] for source_dir in options.source_dir:
for filename in extra_targets: Target.add_extra_targets(source_dir)
Target.add_extra_targets(filename)
update_target_data() update_target_data()
except KeyError: except KeyError:
pass pass

41
tools/targets/__init__.py
View File

@ -125,6 +125,9 @@ class Target(namedtuple("Target", "name json_data resolution_order resolution_or
# Current/new location of the 'targets.json' file # Current/new location of the 'targets.json' file
__targets_json_location = None __targets_json_location = None
# Extra custom targets files
__extra_target_json_files = []
@staticmethod @staticmethod
def _merge_dict(dct, merge_dct): def _merge_dict(dct, merge_dct):
""" Recursive dict merge. Inspired by `dict.update()` however instead of """ Recursive dict merge. Inspired by `dict.update()` however instead of
@ -148,13 +151,18 @@ class Target(namedtuple("Target", "name json_data resolution_order resolution_or
"""Load the description of JSON target data""" """Load the description of JSON target data"""
targets = json_file_to_dict(Target.__targets_json_location or targets = json_file_to_dict(Target.__targets_json_location or
Target.__targets_json_location_default) Target.__targets_json_location_default)
for extra_target in Target.__extra_target_json_files:
Target._merge_dict(targets, json_file_to_dict(extra_target))
return targets return targets
@staticmethod @staticmethod
@cached def add_extra_targets(source_dir):
def add_extra_targets(extra): extra_targets_file = os.path.join(source_dir, "custom_targets.json")
if os.path.exists(extra): if os.path.exists(extra_targets_file):
Target._merge_dict(targets, json_file_to_dict(extra)) Target.__extra_target_json_files.append(extra_targets_file)
CACHES.clear()
@staticmethod @staticmethod
def set_targets_json_location(location=None): def set_targets_json_location(location=None):
@ -531,14 +539,20 @@ class RTL8195ACode:
################################################################################ ################################################################################
# Instantiate all public targets # Instantiate all public targets
TARGETS = [Target.get_target(name) for name, value def update_target_data():
in Target.get_json_target_data().items() TARGETS[:] = [Target.get_target(tgt) for tgt, obj
if value.get("public", True)] in Target.get_json_target_data().items()
if obj.get("public", True)]
# Map each target name to its unique instance
TARGET_MAP.clear()
TARGET_MAP.update(dict([(tgt.name, tgt) for tgt in TARGETS]))
TARGET_NAMES[:] = TARGET_MAP.keys()
# Map each target name to its unique instance TARGETS = []
TARGET_MAP = dict([(t.name, t) for t in TARGETS]) TARGET_MAP = dict()
TARGET_NAMES = []
TARGET_NAMES = TARGET_MAP.keys() update_target_data()
# Some targets with different name have the same exporters # Some targets with different name have the same exporters
EXPORT_MAP = {} EXPORT_MAP = {}
@ -563,10 +577,3 @@ def set_targets_json_location(location=None):
# "from tools.targets import TARGET_NAMES" # "from tools.targets import TARGET_NAMES"
update_target_data() update_target_data()
def update_target_data():
TARGETS[:] = [Target.get_target(tgt) for tgt, obj
in Target.get_json_target_data().items()
if obj.get("public", True)]
TARGET_MAP.clear()
TARGET_MAP.update(dict([(tgt.name, tgt) for tgt in TARGETS]))
TARGET_NAMES[:] = TARGET_MAP.keys()