finish removing "BOARD_HARDWARE_PATH"

Makefile

@@ -10,10 +10,7 @@ SKETCHBOOK_DIR ?= $(HOME)/Arduino
 endif
 
 ifneq ("$(wildcard $(SKETCHBOOK_DIR)/hardware/keyboardio/avr/boards.txt)","")
-
 ARDUINO_DIRECTORIES_USER ?= $(SKETCHBOOK_DIR)
-
-
 endif
 
 
@@ -26,7 +23,6 @@ endif
 ifeq ("$(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk","")
    # Determine the path of this Makefile
    MKFILE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-   BOARD_HARDWARE_PATH := $(MKFILE_DIR)/../../../..
 endif
 
 KALEIDOSCOPE_ETC_DIR ?= $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope/etc/

bin/kaleidoscope-builder

@@ -421,12 +421,6 @@ if [ $# -lt 1 ]; then
 	exit 1
 fi
 
-# Temporary migration for old makefiles
-# I'm not thrilled about how we default to system Arduino dirs.
-if [ -n "${BOARD_HARDWARE_PATH}" ]; then
-	ARDUINO_DIRECTORIES_USER="${BOARD_HARDWARE_PATH}/../"
-fi
-
 : "${KALEIDOSCOPE_DIR:=$( cd "$(dirname "$0")"/.. ;  pwd)}"
 # shellcheck disable=SC2034
 : "${KALEIDOSCOPE_BIN_DIR:=${KALEIDOSCOPE_DIR}/bin/}"

bin/run-docker

@@ -33,8 +33,8 @@ tar  -cf "${XFER_DIR}/kaleidoscope.tar"  \
 	--exclude testing/googletest/build  \
 	.
 
-echo "The bundle is coming from ${BOARD_HARDWARE_PATH}/keyboardio"
-(cd "${BOARD_HARDWARE_PATH}/keyboardio" && tar  -cf "${XFER_DIR}/bundle.tar" \
+echo "The bundle is coming from ${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio"
+(cd "${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio" && tar  -cf "${XFER_DIR}/bundle.tar" \
 	--exclude .git --exclude avr/libraries/Kaleidoscope .)
 
 echo "Building the docker image..."

testing/makefiles/libcommon.mk

@@ -1,11 +1,7 @@
 top_dir		:= $(dir $(lastword ${MAKEFILE_LIST}))../..
 build_dir := ${top_dir}/_build
 
-ifndef BOARD_HARDWARE_PATH
-bundle_path = ${top_dir}/..
-else
-bundle_path = ${BOARD_HARDWARE_PATH}/keyboardio/avr/libraries
-endif
+bundle_path = ${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio/avr/libraries
 
 LIB_DIR := ${build_dir}/lib
 OBJ_DIR := ${build_dir}/obj

testing/makefiles/testcase.mk

@@ -31,11 +31,7 @@ endif
 
 TEST_OBJS=$(patsubst $(SRC_DIR)/%.cpp,${OBJ_DIR}/%.o,$(TEST_FILES))
 
-ifndef BOARD_HARDWARE_PATH
-bundle_path = ${top_dir}/..
-else
-bundle_path = ${BOARD_HARDWARE_PATH}/keyboardio/avr/libraries
-endif
+bundle_path = ${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio/avr/libraries
 
 build: ${BIN_DIR}/${BIN_FILE} compile-sketch