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

Enhanced config detection messages

Browse source
This commit is contained in:
Sudar 2013-06-09 17:13:04 +05:30
parent 70986c14f6
commit 2d77e43216
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arduino-mk/Arduino.mk
View file

@ -244,7 +244,7 @@ ifndef ARDUINO_DIR
endif endif
else else
$(call show_config_variable,ARDUINO_DIR) $(call show_config_variable,ARDUINO_DIR,[USER])
endif endif
######################################################################## ########################################################################
@ -269,7 +269,7 @@ ifndef ARDUINO_VERSION
$(call show_config_variable,ARDUINO_VERSION,[DEFAULT]) $(call show_config_variable,ARDUINO_VERSION,[DEFAULT])
endif endif
else else
$(call show_config_variable,ARDUINO_VERSION) $(call show_config_variable,ARDUINO_VERSION,[USER])
endif endif
######################################################################## ########################################################################
@ -297,7 +297,7 @@ ifdef ARDUINO_DIR
endif # BUNDLED_AVR_TOOLS_DIR endif # BUNDLED_AVR_TOOLS_DIR
else else
$(call show_config_variable,AVR_TOOLS_DIR) $(call show_config_variable,AVR_TOOLS_DIR,[USER])
endif #ndef AVR_TOOLS_DIR endif #ndef AVR_TOOLS_DIR
ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries
@ -339,7 +339,7 @@ ifdef ARDMK_DIR
ARDMK_PATH = $(ARDMK_DIR)/bin ARDMK_PATH = $(ARDMK_DIR)/bin
$(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR)) $(call show_config_variable,ARDMK_PATH,[COMPUTED],(relative to ARDMK_DIR))
else else
$(call show_config_variable,ARDMK_PATH) $(call show_config_variable,ARDMK_PATH,[USER])
endif endif
else else
echo $(error "ARDMK_DIR is not defined") echo $(error "ARDMK_DIR is not defined")
@ -377,7 +377,7 @@ ifndef USER_LIB_PATH
USER_LIB_PATH = $(ARDUINO_SKETCHBOOK)/libraries USER_LIB_PATH = $(ARDUINO_SKETCHBOOK)/libraries
$(call show_config_variable,USER_LIB_PATH,[DEFAULT],(in user sketchbook)) $(call show_config_variable,USER_LIB_PATH,[DEFAULT],(in user sketchbook))
else else
$(call show_config_variable,USER_LIB_PATH) $(call show_config_variable,USER_LIB_PATH,[USER])
endif endif
######################################################################## ########################################################################
@ -397,7 +397,7 @@ else
# Strip the board tag of any extra whitespace, since it was causing the makefile to fail # Strip the board tag of any extra whitespace, since it was causing the makefile to fail
# https://github.com/sudar/Arduino-Makefile/issues/57 # https://github.com/sudar/Arduino-Makefile/issues/57
BOARD_TAG := $(strip $(BOARD_TAG)) BOARD_TAG := $(strip $(BOARD_TAG))
$(call show_config_variable,BOARD_TAG) $(call show_config_variable,BOARD_TAG,[USER])
endif endif
ifndef BOARDS_TXT ifndef BOARDS_TXT
@ -552,7 +552,7 @@ ifndef MONITOR_BAUDRATE
$(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch)) $(call show_config_variable,MONITOR_BAUDRATE,[DETECTED], (in sketch))
endif endif
else else
$(call show_config_variable,MONITOR_BAUDRATE, [SPECIFIED]) $(call show_config_variable,MONITOR_BAUDRATE, [USER])
endif endif
ifndef MONITOR_CMD ifndef MONITOR_CMD
@ -651,7 +651,6 @@ get_arduino_port = $(if $(wildcard $(ARDUINO_PORT)),$(firstword $(wildcard $(ARD
ifneq (,$(findstring AVR,$(shell $(SIZE) --help))) ifneq (,$(findstring AVR,$(shell $(SIZE) --help)))
# We have a patched version of binutils that mentions AVR - pass the MCU # We have a patched version of binutils that mentions AVR - pass the MCU
# and the elf to get nice output. # and the elf to get nice output.
#avr_size = $(SIZE) --mcu=$(MCU) --format=avr $(1)
avr_size = $(SIZE) $(SIZEFLAGS) --format=avr $(1) avr_size = $(SIZE) $(SIZEFLAGS) --format=avr $(1)
$(call show_config_info,Size utility: AVR-aware for enhanced output,[AUTODETECTED]) $(call show_config_info,Size utility: AVR-aware for enhanced output,[AUTODETECTED])
else else