build_paths -> _build_paths, some ensure-sketch-found

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 0a456150c7
commit 7594ee41f2
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -131,7 +131,7 @@ _set_executable_paths() {
: "${AVR_SIZE:=${COMPILER_PATH}/${COMPILER_PREFIX}size}" : "${AVR_SIZE:=${COMPILER_PATH}/${COMPILER_PREFIX}size}"
} }
build_paths() { _build_paths() {
# We need that echo because we\re piping to cksum # We need that echo because we\re piping to cksum
# shellcheck disable=SC2005 # shellcheck disable=SC2005
SKETCH_IDENTIFIER="$(echo "${SKETCH_FILE_PATH}" | cksum | cut -d ' ' -f 1)-${SKETCH_FILE_NAME}" SKETCH_IDENTIFIER="$(echo "${SKETCH_FILE_PATH}" | cksum | cut -d ' ' -f 1)-${SKETCH_FILE_NAME}"
@ -221,7 +221,8 @@ prompt_before_flashing() {
flash() { flash() {
find_sketch find_sketch
build_paths ensure_sketch_found
_build_paths
# Check to see if we can see a keyboard bootloader port. # Check to see if we can see a keyboard bootloader port.
@ -251,7 +252,8 @@ flash() {
hex_with_bootloader() { hex_with_bootloader() {
find_sketch find_sketch
build_paths ensure_sketch_found
_build_paths
: "${BOOTLOADER_PATH:=$(_arduino_prop 'runtime.platform.path')/bootloaders/$(_arduino_prop 'bootloader.file')}" : "${BOOTLOADER_PATH:=$(_arduino_prop 'runtime.platform.path')/bootloaders/$(_arduino_prop 'bootloader.file')}"
@ -272,7 +274,7 @@ hex_with_bootloader() {
compile() { compile() {
find_sketch find_sketch
ensure_sketch_found ensure_sketch_found
build_paths _build_paths
_set_executable_paths _set_executable_paths
install -d "${OUTPUT_PATH}" install -d "${OUTPUT_PATH}"
@ -349,21 +351,24 @@ _arduino_props() {
size_map() { size_map() {
find_sketch find_sketch
build_paths ensure_sketch_found
_build_paths
_set_executable_paths _set_executable_paths
"${AVR_NM}" --size-sort -C -r -l -t decimal "${ELF_FILE_PATH}" "${AVR_NM}" --size-sort -C -r -l -t decimal "${ELF_FILE_PATH}"
} }
disassemble() { disassemble() {
find_sketch find_sketch
build_paths ensure_sketch_found
_build_paths
_set_executable_paths _set_executable_paths
"${AVR_OBJDUMP}" -C -d "${ELF_FILE_PATH}" "${AVR_OBJDUMP}" -C -d "${ELF_FILE_PATH}"
} }
clean() { clean() {
find_sketch find_sketch
build_paths ensure_sketch_found
_build_paths
if [ -d "$OUTPUT_PATH" ]; then if [ -d "$OUTPUT_PATH" ]; then
rm -rf -- "${OUTPUT_PATH}" rm -rf -- "${OUTPUT_PATH}"
fi fi

Loading…
Cancel
Save