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

Make delivery_dir relative to the json it was declared in

pull/9633/head
Oren Cohen 2019-02-07 19:13:01 +02:00
parent 44c1a2cea3
commit e162d69f56
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/config/__init__.py
View File

@ -44,7 +44,8 @@ try:
except NameError: except NameError:
unicode = str unicode = str
PATH_OVERRIDES = set([ PATH_OVERRIDES = set([
"target.bootloader_img" "target.bootloader_img",
"target.delivery_dir"
]) ])
DELIVERY_OVERRIDES = set([ DELIVERY_OVERRIDES = set([
"target.deliver_to_target", "target.deliver_to_target",
@ -601,9 +602,8 @@ class Config(object):
def deliver_into(self): def deliver_into(self):
if self.target.deliver_to_target: if self.target.deliver_to_target:
delivery_target = Target.get_target(self.target.deliver_to_target) if self.target.delivery_dir:
if hasattr(delivery_target, "delivery_dir"): target_delivery_dir = self.target.delivery_dir
target_delivery_dir = join(ROOT, delivery_target.delivery_dir)
else: else:
label_dir = "TARGET_{}".format(self.target.deliver_to_target) label_dir = "TARGET_{}".format(self.target.deliver_to_target)
target_delivery_dir = join(DELIVERY_DIR, label_dir) target_delivery_dir = join(DELIVERY_DIR, label_dir)