Rename ROOT to KALEIDOSCOPE_DIR, which is what it appears to actually be.

pull/932/head
Jesse Vincent 4 years ago
parent ea0abc8833
commit 660747c916
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -418,7 +418,7 @@ compile () {
-tools "${ARDUINO_PATH}/tools-builder" \ -tools "${ARDUINO_PATH}/tools-builder" \
-fqbn "${FQBN}" \ -fqbn "${FQBN}" \
-libraries "." \ -libraries "." \
-libraries "${ROOT}" \ -libraries "${KALEIDOSCOPE_DIR}" \
-libraries "${BOARD_HARDWARE_PATH}/.." \ -libraries "${BOARD_HARDWARE_PATH}/.." \
${local_LIBS} \ ${local_LIBS} \
${EXTRA_BUILDER_ARGS} \ ${EXTRA_BUILDER_ARGS} \
@ -656,8 +656,8 @@ fi
## ##
## - if there is only one argument, that's a command ## - if there is only one argument, that's a command
ROOT="$(cd "$(dirname "$0")"/..; pwd)" KALEIDOSCOPE_DIR="$(cd "$(dirname "$0")"/..; pwd)"
export ROOT
# shellcheck disable=SC2155 # shellcheck disable=SC2155
export SOURCEDIR="$(pwd)" export SOURCEDIR="$(pwd)"
@ -677,7 +677,7 @@ if [ -e "${SOURCEDIR}/kaleidoscope-builder.conf" ]; then
fi fi
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${ROOT}/etc/kaleidoscope-builder.conf" . "${KALEIDOSCOPE_DIR}/etc/kaleidoscope-builder.conf"
if [ -n "${VERBOSE}" ] && [[ "${VERBOSE}" -gt 0 ]]; then if [ -n "${VERBOSE}" ] && [[ "${VERBOSE}" -gt 0 ]]; then
ARDUINO_VERBOSE="-verbose" ARDUINO_VERBOSE="-verbose"

@ -198,8 +198,6 @@ elif [ "${uname_O}" = "Cygwin" ]; then
ARDUINO_PATH="$(realpath --relative-to=./ ${ARDUINO_PATH})" ARDUINO_PATH="$(realpath --relative-to=./ ${ARDUINO_PATH})"
ARDUINO_PACKAGE_PATH="$(realpath --relative-to=./ ${ARDUINO_PACKAGE_PATH})" ARDUINO_PACKAGE_PATH="$(realpath --relative-to=./ ${ARDUINO_PACKAGE_PATH})"
ARDUINO_LOCAL_LIB_PATH="$(realpath --relative-to=./ ${ARDUINO_LOCAL_LIB_PATH})" ARDUINO_LOCAL_LIB_PATH="$(realpath --relative-to=./ ${ARDUINO_LOCAL_LIB_PATH})"
ROOT="$(realpath --relative-to=./ ${ROOT})"
export ROOT
TMPDIR="$(realpath --relative-to=./ ${ARDUINO_PATH})" TMPDIR="$(realpath --relative-to=./ ${ARDUINO_PATH})"
find_device_port() { find_device_port() {

Loading…
Cancel
Save