Use only original output directories

Author: 0xPxt

dockerized_build.mk

@@ -23,7 +23,7 @@ TESTS_JS_DIR?=
 LEDGER_SRC=$(CURDIR)/app
 FUZZ_COVERAGE_DIR=$(CURDIR)/fuzz/coverage
 DOCKER_APP_SRC=/app
-DOCKER_APP_BIN=$(DOCKER_APP_SRC)/app/bin/app.elf
+DOCKER_APP_BIN=$(DOCKER_APP_SRC)/app/build/$(TARGET)/bin/app.elf
 
 DOCKER_BOLOS_SDKS = NANOS_SDK
 DOCKER_BOLOS_SDKX = NANOX_SDK
@@ -187,6 +187,7 @@ buildAP:
 clean_output:
 	@echo "Removing output files"
 	@rm -f app/output/app* || true
+	@rm -rf app/bin app/debug || true
 
 .PHONY: clean_build
 clean_build:

makefiles/Makefile.devices

@@ -32,7 +32,7 @@ ifeq ($(TARGET_NAME),TARGET_NANOS)
 ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
 endif
-OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_s.elf
+OUTPUT_ELF ?= $(CURDIR)/build/nanos/bin/app.elf
 OUTPUT_INSTALLER := $(CURDIR)/pkg/$(INSTALLER_NAME)_s.sh
 endif
 
@@ -42,7 +42,7 @@ HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
 endif
-OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_x.elf
+OUTPUT_ELF ?= $(CURDIR)/build/nanox/bin/app.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_x.sh
 endif
 
@@ -51,7 +51,7 @@ ifeq ($(TARGET_NAME),TARGET_NANOS2)
 ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
 endif
-OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_s2.elf
+OUTPUT_ELF ?= $(CURDIR)/build/nanos2/bin/app.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_s2.sh
 endif
 #######################################
@@ -60,7 +60,7 @@ HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
 endif
-OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_stax.elf
+OUTPUT_ELF ?= $(CURDIR)/build/stax/bin/app.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_stax.sh
 endif
 #######################################
@@ -69,7 +69,7 @@ HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
 ifeq ($(HAVE_SWAP),1)
 HAVE_APPLICATION_FLAG_LIBRARY = 1
 endif
-OUTPUT_ELF ?= $(CURDIR)/output/$(ELF_NAME)_flex.elf
+OUTPUT_ELF ?= $(CURDIR)/build/flex/bin/app.elf
 OUTPUT_INSTALLER:= $(CURDIR)/pkg/$(INSTALLER_NAME)_flex.sh
 endif
 #######################################

makefiles/Makefile.installer_script

@@ -23,10 +23,10 @@ all: default
 	@echo "LOAD_PARAMS=($$(echo "${APP_LOAD_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER)
 	@echo "DELETE_PARAMS=($$(echo "${COMMON_DELETE_PARAMS}" | sed -e "s|"${APPNAME}"|\""${APPNAME}"\"|"))" >> $(OUTPUT_INSTALLER)
 	@echo "APPHEX=\"" >> $(OUTPUT_INSTALLER)
-	@cat $(CURDIR)/bin/app.hex >> $(OUTPUT_INSTALLER)
+	@cat $(CURDIR)/build/$(TARGET)/bin/app.hex >> $(OUTPUT_INSTALLER)
 	@echo "\"" >> $(OUTPUT_INSTALLER)
 	@cat $(CURDIR)/../deps/ledger-zxlib/scripts/template.sh >> $(OUTPUT_INSTALLER)
 	@chmod +x $(OUTPUT_INSTALLER)
-	@cp $(CURDIR)/bin/* $(CURDIR)/output
+	@cp $(CURDIR)/build/$(TARGET)/bin/* $(CURDIR)/output
 	@cp $(CURDIR)/output/app.elf ${OUTPUT_ELF}
 	@rm $(CURDIR)/output/app.elf