Merge pull request #9633 from orenc17/update_delivery

Improvement to artifact delivery method
pull/9714/head
Martin Kojtal 2019-02-11 17:54:51 +01:00 committed by GitHub
commit 36df2aa868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions

View File

@ -44,11 +44,13 @@ try:
except NameError:
unicode = str
PATH_OVERRIDES = set([
"target.bootloader_img"
"target.bootloader_img",
"target.delivery_dir"
])
DELIVERY_OVERRIDES = set([
"target.deliver_to_target",
"target.deliver_artifacts",
"target.delivery_dir"
])
ROM_OVERRIDES = set([
# managed BL
@ -600,8 +602,12 @@ class Config(object):
def deliver_into(self):
if self.target.deliver_to_target:
label_dir = "TARGET_{}".format(self.target.deliver_to_target)
target_delivery_dir = join(DELIVERY_DIR, label_dir)
if self.target.delivery_dir:
target_delivery_dir = self.target.delivery_dir
else:
label_dir = "TARGET_{}".format(self.target.deliver_to_target)
target_delivery_dir = join(DELIVERY_DIR, label_dir)
if not exists(target_delivery_dir):
os.makedirs(target_delivery_dir)