From f35a1dd032df27c4c967daab1005cb345252ca27 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sun, 15 Nov 2020 22:20:40 -0800
Subject: [PATCH] lift size-map and disassemble to the makefile

---
 bin/kaleidoscope-builder  | 25 -------------------------
 etc/sketch-arduino-cli.mk | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index ea96b97f..c51a5b4f 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -48,21 +48,6 @@ _arduino_props() {
 }
 
 
-_set_executable_paths() {
-
-	# Allow the compiler path to be empty for virtual builds
-	# should use compiler.path instead of appending bin, but we don't have substitution het
-	: "${COMPILER_PATH=$(_arduino_prop 'runtime.tools.avr-gcc.path')/bin}"
-
-	# Allow the compiler prefix to be empty for virtual builds
-	COMPILER_PREFIX="${COMPILER_PREFIX-avr-}"
-	: "${AVR_OBJDUMP:=${COMPILER_PATH}/${COMPILER_PREFIX}objdump}"
-	: "${AVR_OBJCOPY:=${COMPILER_PATH}/${COMPILER_PREFIX}objcopy}"
-	: "${AVR_NM:=${COMPILER_PATH}/${COMPILER_PREFIX}nm}"
-	: "${AVR_SIZE:=${COMPILER_PATH}/${COMPILER_PREFIX}size}"
-}
-
-
 _find_sketch() {
 	if [ -z "${SKETCH_FILE_PATH}" ] || [ ! -f "${SKETCH_FILE_PATH}" ]; then
 	# Didn't find a sketch
@@ -147,19 +132,9 @@ cmd_compile() {
 	fi
 }
 
-cmd_size_map() {
-	_set_up_environment
-	"${AVR_NM}" --size-sort -C -r -l -t decimal "${ELF_FILE_PATH}"
-}
-
-cmd_disassemble() {
-	_set_up_environment
-	"${AVR_OBJDUMP}" -C -d "${ELF_FILE_PATH}"
-}
 
 _set_up_environment() {
 	_find_sketch
-	_set_executable_paths
 }
 
 
diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk
index 8cae8fc3..d3c726d9 100644
--- a/etc/sketch-arduino-cli.mk
+++ b/etc/sketch-arduino-cli.mk
@@ -117,8 +117,17 @@ export LIB_FILE_PATH 			:= $(OUTPUT_PATH)/$(OUTPUT_FILE_PREFIX).a
 export LIB_PROPERTIES_PATH := "../.."
 
 
+# We should use compiler.path instead of appending bin, but we 
+# don't have substitution for arduino props yet
 
+export COMPILER_PATH	:=	$(call _arduino_prop,runtime.tools.avr-gcc.path)/bin
 
+# Allow the compiler prefix to be empty for virtual builds
+COMPILER_PREFIX 	?= 	avr-
+AVR_OBJDUMP		:=	${COMPILER_PATH}/${COMPILER_PREFIX}objdump
+AVR_OBJCOPY		:=	${COMPILER_PATH}/${COMPILER_PREFIX}objcopy
+AVR_NM			:=	${COMPILER_PATH}/${COMPILER_PREFIX}nm
+AVR_SIZE		:=	${COMPILER_PATH}/${COMPILER_PREFIX}size
 
 $(SKETCH_FILE_PATH):
 	@echo "Sketch is $(SKETCH_FILE_PATH)"
@@ -145,11 +154,17 @@ decompile: disassemble
 	@: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too.
 
 disassemble: compile
+	${AVR_OBJDUMP} -C -d "${ELF_FILE_PATH}"
 
 size-map: compile
+	${AVR_NM} --size-sort -C -r -l -t decimal "${ELF_FILE_PATH}"
 
 flash: compile
 
+prop:
+	@echo $(BOOTLOADER_PATH)
+	@echo $(GIT_VERSION)
+
 clean:
 	rm -rf -- "${OUTPUT_PATH}/*"