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 mbed_os root

pull/9633/head
Oren Cohen 2019-02-07 14:56:57 +02:00
parent 04a22a2e69
commit 44c1a2cea3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/config/__init__.py
View File

@ -37,7 +37,7 @@ from ..utils import (json_file_to_dict, intelhex_offset, integer,
from ..arm_pack_manager import Cache
from ..targets import (CUMULATIVE_ATTRIBUTES, TARGET_MAP, generate_py_target,
get_resolution_order, Target)
from ..settings import DELIVERY_DIR
from ..settings import DELIVERY_DIR, ROOT
try:
unicode
@ -603,7 +603,7 @@ class Config(object):
if self.target.deliver_to_target:
delivery_target = Target.get_target(self.target.deliver_to_target)
if hasattr(delivery_target, "delivery_dir"):
target_delivery_dir = delivery_target.delivery_dir
target_delivery_dir = join(ROOT, delivery_target.delivery_dir)
else:
label_dir = "TARGET_{}".format(self.target.deliver_to_target)
target_delivery_dir = join(DELIVERY_DIR, label_dir)