start to move target dependencies into the makefile

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 9677426b82
commit 83bbfcf864
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -175,8 +175,27 @@ build_paths() {
: "${CCACHE_WRAPPER_PATH:=${KALEIDOSCOPE_TEMP_PATH}/ccache/bin}" : "${CCACHE_WRAPPER_PATH:=${KALEIDOSCOPE_TEMP_PATH}/ccache/bin}"
: "${CORE_CACHE_PATH:=${KALEIDOSCOPE_TEMP_PATH}/arduino-cores}" : "${CORE_CACHE_PATH:=${KALEIDOSCOPE_TEMP_PATH}/arduino-cores}"
: "${LIB_PROPERTIES_PATH:="../.."}"
GIT_VERSION="$(
cd "${SKETCH_DIR}"
if [ -d .git ]; then echo -n '-g' && git describe --abbrev=4 --dirty --always; fi
)"
LIB_VERSION="$(
cd "${SKETCH_DIR}"
(grep version= "${LIB_PROPERTIES_PATH}/library.properties" 2>/dev/null || echo version=0.0.0) | cut -d= -f2
)${GIT_VERSION}"
: "${OUTPUT_FILE_PREFIX:=${SKETCH_BASE_NAME}-${LIB_VERSION}}"
: "${HEX_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.hex}"
: "${HEX_FILE_WITH_BOOTLOADER_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}-with-bootloader.hex}"
: "${ELF_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.elf}"
: "${LIB_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.a}"
mkdir -p "$CORE_CACHE_PATH" mkdir -p "$CORE_CACHE_PATH"
mkdir -p "$BUILD_PATH" mkdir -p "$BUILD_PATH"
} }
@ -240,8 +259,14 @@ find_sketch() {
return return
fi fi
done done
SKETCH_NOT_FOUND=1
}
ensure_sketch_found() {
if [ -n "${SKETCH_NOT_FOUND}" ]; then
echo "I couldn't find your sketch (.ino file)" >&2 echo "I couldn't find your sketch (.ino file)" >&2
exit 1 exit 1
fi
} }
@ -263,7 +288,8 @@ prompt_before_flashing() {
flash() { flash() {
compile "$@" find_sketch
build_paths
: "${VID:=$(_arduino_prop 'build.vid')}" : "${VID:=$(_arduino_prop 'build.vid')}"
: "${SKETCH_PID:=$(_arduino_prop 'build.pid')}" : "${SKETCH_PID:=$(_arduino_prop 'build.pid')}"
@ -297,7 +323,8 @@ flash() {
hex_with_bootloader() { hex_with_bootloader() {
compile find_sketch
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')}"
@ -317,27 +344,11 @@ hex_with_bootloader() {
compile() { compile() {
find_sketch find_sketch
set_executable_paths ensure_sketch_found
build_paths build_paths
set_executable_paths
enable_ccache enable_ccache
: "${LIB_PROPERTIES_PATH:="../.."}"
GIT_VERSION="$(
cd "${SKETCH_DIR}"
if [ -d .git ]; then echo -n '-g' && git describe --abbrev=4 --dirty --always; fi
)"
LIB_VERSION="$(
cd "${SKETCH_DIR}"
(grep version= "${LIB_PROPERTIES_PATH}/library.properties" 2>/dev/null || echo version=0.0.0) | cut -d= -f2
)${GIT_VERSION}"
: "${OUTPUT_FILE_PREFIX:=${SKETCH_BASE_NAME}-${LIB_VERSION}}"
: "${HEX_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.hex}"
: "${HEX_FILE_WITH_BOOTLOADER_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}-with-bootloader.hex}"
: "${ELF_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.elf}"
: "${LIB_FILE_PATH:=${OUTPUT_PATH}/${OUTPUT_FILE_PREFIX}.a}"
install -d "${OUTPUT_PATH}" install -d "${OUTPUT_PATH}"
echo "Building ${SKETCH_FILE_PATH}" echo "Building ${SKETCH_FILE_PATH}"
@ -409,14 +420,16 @@ _arduino_props() {
} }
size_map() { size_map() {
compile find_sketch
build_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() {
compile find_sketch
build_paths
set_executable_paths
"${AVR_OBJDUMP}" -C -d "${ELF_FILE_PATH}" "${AVR_OBJDUMP}" -C -d "${ELF_FILE_PATH}"
} }
@ -591,6 +604,7 @@ fi
SKETCH="$1" SKETCH="$1"
shift shift
cmds="" cmds=""
# shellcheck disable=2034 # shellcheck disable=2034

@ -9,8 +9,12 @@ all:
decompile: disassemble decompile: disassemble
@: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too. @: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too.
xbuild: compile disassemble: compile
@: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too.
size-map: compile
flash: compile
%: %:
@BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" $(KALEIDOSCOPE_BUILDER_DIR)/kaleidoscope-builder $@ @BOARD_HARDWARE_PATH="$(BOARD_HARDWARE_PATH)" $(KALEIDOSCOPE_BUILDER_DIR)/kaleidoscope-builder $@

Loading…
Cancel
Save