Because of how makefile rules are evaluated, the previous code was

detecting the device port at evaluation time rather than execution time.

This meant that we were doing the "where is the board" check for any
compilation target, even if we'd never flash.

Arduino's board probing is somewhat heavyweight and can take a couple of
seconds.

We move that logic into a shell expression executed at runtime.

On my laptop, this shaves 10 seconds off make -j 9 simulator tests,
which is pretty nice since that used to take about 30 seconds.

But on a plain `make simulator-tests`, it shaved a full minute from the
2 minute and 30 second runtime.
master
Jesse Vincent 2 years ago
parent 9bf6eba010
commit cf798497e2
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -191,9 +191,8 @@ endif
#TODO (arduino team) I'd love to do this with their json output
#but it's short some of the data we kind of need
flashing_instructions = $(call _arduino_prop,build.flashing_instructions)
_device_port = $(shell $(ARDUINO_CLI) board list --format=text | grep $(FQBN) |cut -d' ' -f 1)
flashing_instructions = $(call _arduino_prop,build.flashing_instructions)
flash: ${HEX_FILE_PATH}
ifneq ($(flashing_instructions),)
@ -206,10 +205,10 @@ endif
$(info )
@$(shell read _)
# If we have a device serial port available, try to trigger a Kaliedoscope reset
ifneq ($(_device_port),)
-$(QUIET) DEVICE=$(_device_port) $(KALEIDOSCOPE_DIR)/bin/focus-send "device.reset"
-$(QUIET) DEVICE=$(shell $(ARDUINO_CLI) board list --format=text | grep $(FQBN) |cut -d' ' -f 1) && \
[ -e $$DEVICE ] && \
$(KALEIDOSCOPE_DIR)/bin/focus-send "device.reset" && \
sleep 2
endif
$(QUIET) $(ARDUINO_CLI) upload --fqbn $(FQBN) \
$(shell $(ARDUINO_CLI) board list --format=text | grep $(FQBN) |cut -d' ' -f 1 | xargs -n 1 echo "--port" ) \
--input-dir "${OUTPUT_PATH}" \

Loading…
Cancel
Save