diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index e21f9afe..0883eb42 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -97,21 +97,12 @@ _set_build_paths() { # shellcheck disable=SC2005 SKETCH_IDENTIFIER="$(echo "${SKETCH_FILE_PATH}" | cksum | cut -d ' ' -f 1)-${SKETCH_FILE_NAME}" - : "${KALEIDOSCOPE_TEMP_PATH:=${TMPDIR:-/tmp}/kaleidoscope-${USER}}" - - : "${KALEIDOSCOPE_BUILD_PATH:=${KALEIDOSCOPE_TEMP_PATH}/build}" - : "${KALEIDOSCOPE_OUTPUT_PATH:=${KALEIDOSCOPE_TEMP_PATH}/output}" - : "${SKETCH_BUILD_DIR:=${SKETCH_IDENTIFIER}/build}" : "${SKETCH_OUTPUT_DIR:=${SKETCH_IDENTIFIER}/output}" : "${BUILD_PATH:=${KALEIDOSCOPE_BUILD_PATH}/${SKETCH_BUILD_DIR}}" : "${OUTPUT_PATH:=${KALEIDOSCOPE_OUTPUT_PATH}/${SKETCH_OUTPUT_DIR}}" - - : "${CORE_CACHE_PATH:=${KALEIDOSCOPE_TEMP_PATH}/arduino-cores}" - - : "${LIB_PROPERTIES_PATH:="../.."}" GIT_VERSION="$( cd "${SKETCH_DIR}" diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk index 876500b6..de0eb33f 100644 --- a/etc/sketch-arduino-cli.mk +++ b/etc/sketch-arduino-cli.mk @@ -4,6 +4,9 @@ mkfile_dir := $(dir $(mkfile_path)) export KALEIDOSCOPE_DIR ?= $(abspath $(mkfile_dir)/..) export KALEIDOSCOPE_BIN_DIR ?= $(KALEIDOSCOPE_DIR)/bin + +# Arduino CLI config + export ARDUINO_CONTENT ?= $(KALEIDOSCOPE_DIR)/.arduino export ARDUINO_DIRECTORIES_DATA ?= $(ARDUINO_CONTENT)/data export ARDUINO_DIRECTORIES_DOWNLOADS ?= $(ARDUINO_CONTENT)/downloads @@ -25,6 +28,25 @@ else export ARDUINO_VERBOSE ?= endif +# +# Build path config + +TMPDIR ?= /tmp + +export KALEIDOSCOPE_TEMP_PATH ?= $(TMPDIR)/kaleidoscope-$(USER) +export KALEIDOSCOPE_BUILD_PATH ?= $(KALEIDOSCOPE_TEMP_PATH)/build +export KALEIDOSCOPE_OUTPUT_PATH ?= $(KALEIDOSCOPE_TEMP_PATH)/output +export CORE_CACHE_PATH ?= $(KALEIDOSCOPE_TEMP_PATH)/arduino-cores + + + + + + + + + + .DEFAULT_GOAL := compile all: