dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve detection of ard-reset-arduino location

Browse source 
Find location of ard-reset-arduino before prefixing it with
PYTHON_CMD (so that 'which' failure can be detected). Also
display the resulting RESET_CMD, or user-provided RESET_CMD.
This commit is contained in:
Kevin P. Fleming 2020-10-20 06:47:20 -04:00
parent d664c9b6b2
commit 55e003ff6c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Arduino.mk
View file

@ -863,12 +863,13 @@ endif
# Reset # Reset
ifndef RESET_CMD ifndef RESET_CMD
ARD_RESET_ARDUINO := $(PYTHON_CMD) $(shell which ard-reset-arduino 2> /dev/null) ARD_RESET_ARDUINO_PATH := $(shell which ard-reset-arduino 2> /dev/null)
ifndef ARD_RESET_ARDUINO ifndef ARD_RESET_ARDUINO_PATH
# same level as *.mk in bin directory when checked out from git # same level as *.mk in bin directory when checked out from git
# or in $PATH when packaged # or in $PATH when packaged
ARD_RESET_ARDUINO = $(PYTHON_CMD) $(ARDMK_DIR)/bin/ard-reset-arduino ARD_RESET_ARDUINO_PATH = $(ARDMK_DIR)/bin/ard-reset-arduino
endif endif
ARD_RESET_ARDUINO := $(PYTHON_CMD) $(ARD_RESET_ARDUINO_PATH)
ifneq (,$(findstring CYGWIN,$(shell uname -s))) ifneq (,$(findstring CYGWIN,$(shell uname -s)))
# confirm user is using default cygwin unix Python (which uses ttySx) and not Windows Python (which uses COMx) # confirm user is using default cygwin unix Python (which uses ttySx) and not Windows Python (which uses COMx)
ifeq ($(PYTHON_CMD),/usr/bin/python) ifeq ($(PYTHON_CMD),/usr/bin/python)
@ -879,6 +880,9 @@ ifndef RESET_CMD
else else
RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(call get_monitor_port) RESET_CMD = $(ARD_RESET_ARDUINO) $(ARD_RESET_OPTS) $(call get_monitor_port)
endif endif
$(call show_config_variable,RESET_CMD,[COMPUTED],(from PYTHON_CMD, ARD_RESET_OPTS and MONITOR_PORT))
else
$(call show_config_variable,RESET_CMD,[USER])
endif endif
ifneq ($(CATERINA),) ifneq ($(CATERINA),)