From c56ceac6435881936ffbc9ca9855f790cba06c65 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 26 Jan 2018 21:05:38 +0200 Subject: [PATCH] Allow to override PROGNAME --- builder/frameworks/espidf.py | 2 -- builder/main.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 4eb5bc9..1c806a8 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -34,8 +34,6 @@ platform = env.PioPlatform() FRAMEWORK_DIR = platform.get_package_dir("framework-espidf") assert FRAMEWORK_DIR and isdir(FRAMEWORK_DIR) -FRAMEWORK_VERSION = platform.get_package_version( - "framework-espidf") def parse_mk(path): diff --git a/builder/main.py b/builder/main.py index 0dee70e..9043c57 100644 --- a/builder/main.py +++ b/builder/main.py @@ -168,7 +168,7 @@ target_elf = env.BuildProgram() if "nobuild" in COMMAND_LINE_TARGETS: target_firm = join("$BUILD_DIR", "${PROGNAME}.bin") else: - target_firm = env.ElfToBin(target_elf) + target_firm = env.ElfToBin(join("$BUILD_DIR", "${PROGNAME}"), target_elf) AlwaysBuild(env.Alias("nobuild", target_firm)) target_buildprog = env.Alias("buildprog", target_firm, target_firm)