tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 09b5c613ee
commit 928f02fdbd
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

File diff suppressed because it is too large Load Diff

@ -6,17 +6,17 @@
: "${BOARD:=model01}" : "${BOARD:=model01}"
if [[ -z "${ARCH}" && -n "${FQBN}" ]]; then if [[ -z "${ARCH}" && -n "${FQBN}" ]]; then
ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p') ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p')
fi fi
: "${ARCH:=avr}" : "${ARCH:=avr}"
if [ "${ARCH}" = "virtual" ]; then if [ "${ARCH}" = "virtual" ]; then
: "${FQBN:=keyboardio:virtual:${BOARD}}" : "${FQBN:=keyboardio:virtual:${BOARD}}"
: "${COMPILER_PATH:=/usr/bin/}" : "${COMPILER_PATH:=/usr/bin/}"
COMPILER_PREFIX="" COMPILER_PREFIX=""
fi fi
: "${FQBN:=keyboardio:${ARCH}:${BOARD}}" : "${FQBN:=keyboardio:${ARCH}:${BOARD}}"
@ -30,123 +30,117 @@ fi
uname_S=$(uname -s 2>/dev/null || echo not) uname_S=$(uname -s 2>/dev/null || echo not)
uname_O=$(uname -o 2>/dev/null || echo not) uname_O=$(uname -o 2>/dev/null || echo not)
find_device_port() { find_device_port() {
find_device_vid_pid find_device_vid_pid
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-linux-udev" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-linux-udev"
if [[ "${DEVICE_PORT}" = "" ]]; then if [[ "${DEVICE_PORT}" = "" ]]; then
DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})"
else else
echo "DEVICE_PORT=\"${DEVICE_PORT}\" predefined." echo "DEVICE_PORT=\"${DEVICE_PORT}\" predefined."
fi fi
} }
reset_device_cmd() { reset_device_cmd() {
if [ -z ${NO_RESET} ]; then if [ -z ${NO_RESET} ]; then
stty -F ${DEVICE_PORT} 1200 hupcl stty -F ${DEVICE_PORT} 1200 hupcl
fi fi
} }
find_bootloader_ports() { find_bootloader_ports() {
find_device_vid_pid find_device_vid_pid
: "${BOOTLOADER_VID:=${VID}}" : "${BOOTLOADER_VID:=${VID}}"
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-linux-udev" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-linux-udev"
if [[ "${DEVICE_PORT_BOOTLOADER}" = "" ]]; then if [[ "${DEVICE_PORT_BOOTLOADER}" = "" ]]; then
DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID})" DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID})"
else else
echo "DEVICE_PORT_BOOTLOADER=\"${DEVICE_PORT_BOOTLOADER}\" predefined." echo "DEVICE_PORT_BOOTLOADER=\"${DEVICE_PORT_BOOTLOADER}\" predefined."
fi fi
} }
if [ "${uname_S}" = "Darwin" ]; then if [ "${uname_S}" = "Darwin" ]; then
find_device_port() { find_device_port() {
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos"
DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})" DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID})"
} }
reset_device_cmd() { reset_device_cmd() {
/bin/stty -f ${DEVICE_PORT} 1200 /bin/stty -f ${DEVICE_PORT} 1200
} }
find_bootloader_ports() {
find_bootloader_ports() { find_device_vid_pid
find_device_vid_pid : "${BOOTLOADER_VID:=${VID}}"
: "${BOOTLOADER_VID:=${VID}}" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos"
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-macos" if [[ "${DEVICE_PORT_BOOTLOADER}" = "" ]]; then
if [[ "${DEVICE_PORT_BOOTLOADER}" = "" ]]; then DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID})"
DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID})" else
else echo "DEVICE_PORT_BOOTLOADER=\"${DEVICE_PORT_BOOTLOADER}\" predefined."
echo "DEVICE_PORT_BOOTLOADER=\"${DEVICE_PORT_BOOTLOADER}\" predefined." fi
fi }
}
elif [ "${uname_S}" = "FreeBSD" ]; then elif [ "${uname_S}" = "FreeBSD" ]; then
find_device_port() { find_device_port() {
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-freebsd" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-freebsd"
DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER})" DEVICE_PORT="$(perl ${DEVICE_PORT_PROBER})"
} }
reset_device_cmd() { reset_device_cmd() {
/bin/stty -f ${DEVICE_PORT} 1200 /bin/stty -f ${DEVICE_PORT} 1200
} }
: "${AVR_SIZE:=/usr/local/bin/avr-size}" : "${AVR_SIZE:=/usr/local/bin/avr-size}"
: "${AVR_NM:=/usr/local/bin/avr-nm}" : "${AVR_NM:=/usr/local/bin/avr-nm}"
: "${AVR_OBJDUMP:=/usr/local/bin/avr-objdump}" : "${AVR_OBJDUMP:=/usr/local/bin/avr-objdump}"
find_bootloader_ports() { find_bootloader_ports() {
DEVICE_PORT_PROBER="${KALEIDOSCPE_BIN_DIR}/find-device-port-freebsd" DEVICE_PORT_PROBER="${KALEIDOSCPE_BIN_DIR}/find-device-port-freebsd"
DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER})" DEVICE_PORT_BOOTLOADER="$(perl ${DEVICE_PORT_PROBER})"
} }
if [ "${ARCH}" = "virtual" ]; then if [ "${ARCH}" = "virtual" ]; then
: "${COMPILER_PATH:=/usr/local/bin/}" : "${COMPILER_PATH:=/usr/local/bin/}"
fi fi
elif [ "${uname_O}" = "Cygwin" ]; then elif [ "${uname_O}" = "Cygwin" ]; then
# The Windows arduino-builder.exe doesn't understand being told to exec against Cygwin symlinks # The Windows arduino-builder.exe doesn't understand being told to exec against Cygwin symlinks
CCACHE_NOT_SUPPORTED=1 CCACHE_NOT_SUPPORTED=1
# #
# It's important that all of these be underneath /cygdrive/c so they can be converted to Windows paths that the # It's important that all of these be underneath /cygdrive/c so they can be converted to Windows paths that the
# Windows Arduino binaries can understand. # Windows Arduino binaries can understand.
: "${TMPDIR:=/cygdrive/c/Users/${USER}/AppData/Local/Temp}" : "${TMPDIR:=/cygdrive/c/Users/${USER}/AppData/Local/Temp}"
# We need to prevent Windows executables from being passed parameters that are absolute paths, since they won't # We need to prevent Windows executables from being passed parameters that are absolute paths, since they won't
# be interpretable when of the form /cygdrive/c/foo. To work around this, we set the common path root variables # be interpretable when of the form /cygdrive/c/foo. To work around this, we set the common path root variables
# to use relative paths instead of absolute paths, since those have mostly platform-agnostic behavior. # to use relative paths instead of absolute paths, since those have mostly platform-agnostic behavior.
# #
# Note that this trick requires that all of these paths exist on the same drive letter as the current directory, # Note that this trick requires that all of these paths exist on the same drive letter as the current directory,
# since otherwise even the relative paths would include Cygwin-specific components. So... # since otherwise even the relative paths would include Cygwin-specific components. So...
if [[ $(realpath --relative-base=/cygdrive/c .) == /* ]]; then if [[ $(realpath --relative-base=/cygdrive/c .) == /* ]]; then
echo "kaleidoscope-builder's Cygwin support is currently limited to running from within /cygdrive/c" echo "kaleidoscope-builder's Cygwin support is currently limited to running from within /cygdrive/c"
exit 1 exit 1
fi fi
TMPDIR="$(realpath --relative-to=./ ${TMPDIR})" TMPDIR="$(realpath --relative-to=./ ${TMPDIR})"
find_device_port() { find_device_port() {
find_device_vid_pid find_device_vid_pid
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-windows.ps1" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-windows.ps1"
DEVICE_PORT="$(powershell -noprofile -executionpolicy bypass ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID} -Format Cygwin)" DEVICE_PORT="$(powershell -noprofile -executionpolicy bypass ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID} -Format Cygwin)"
DEVICE_COM_PORT="$(powershell -noprofile -executionpolicy bypass ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID} -Format COM)" DEVICE_COM_PORT="$(powershell -noprofile -executionpolicy bypass ${DEVICE_PORT_PROBER} ${VID} ${SKETCH_PID} -Format COM)"
} }
reset_device_cmd() { reset_device_cmd() {
cmd /c mode ${DEVICE_COM_PORT} baud=1200 cmd /c mode ${DEVICE_COM_PORT} baud=1200
} }
find_bootloader_ports() { find_bootloader_ports() {
find_device_vid_pid find_device_vid_pid
: "${BOOTLOADER_VID:=${VID}}" : "${BOOTLOADER_VID:=${VID}}"
DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-windows.ps1" DEVICE_PORT_PROBER="${KALEIDOSCOPE_BIN_DIR}/find-device-port-windows.ps1"
DEVICE_PORT_BOOTLOADER="$(powershell -noprofile -executionpolicy bypass ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID} -Format COM)" DEVICE_PORT_BOOTLOADER="$(powershell -noprofile -executionpolicy bypass ${DEVICE_PORT_PROBER} ${BOOTLOADER_VID} ${BOOTLOADER_PID} -Format COM)"
} }
fi fi

Loading…
Cancel
Save