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

User-defined or calculated bootloader parent directory, allows for

Browse source 
relative paths as defined in boards.txt  e.g. "atmega"

Also added [USER] to ARDUINO_SKETCHBOOK detection

Fixes #126
This commit is contained in:
Simon John 2013-12-17 09:15:33 +00:00
parent 38255ed0f0
commit fc92c24cc0
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arduino-mk/Arduino.mk
View file

@ -339,7 +339,7 @@ ifndef ARDUINO_SKETCHBOOK
$(call show_config_variable,ARDUINO_SKETCHBOOK,[DEFAULT]) $(call show_config_variable,ARDUINO_SKETCHBOOK,[DEFAULT])
endif endif
else else
$(call show_config_variable,ARDUINO_SKETCHBOOK) $(call show_config_variable,ARDUINO_SKETCHBOOK,[USER])
endif endif
######################################################################## ########################################################################
@ -851,6 +851,14 @@ ifneq (,$(strip $(SYS_LIB_NAMES)))
$(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info, $(lib),[SYSTEM])) $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info, $(lib),[SYSTEM]))
endif endif
# either calculate parent dir from arduino dir, or user-defined path
ifndef BOOTLOADER_PARENT
BOOTLOADER_PARENT = $(ARDUINO_DIR)/hardware/arduino/bootloaders
$(call show_config_variable,BOOTLOADER_PARENT,[COMPUTED],(from ARDUINO_DIR))
else
$(call show_config_variable,BOOTLOADER_PARENT,[USER])
endif
# end of config output # end of config output
$(call show_separator) $(call show_separator)
@ -1030,11 +1038,10 @@ ifndef AVRDUDE_ISP_FUSES_PRE
endif endif
# Bootloader file settings # Bootloader file settings
# TODO: Handle relative bootloader file path as well
ifndef AVRDUDE_ISP_BURN_BOOTLOADER ifndef AVRDUDE_ISP_BURN_BOOTLOADER
ifneq ($(strip $(BOOTLOADER_PATH)),) ifneq ($(strip $(BOOTLOADER_PATH)),)
ifneq ($(strip $(BOOTLOADER_FILE)),) ifneq ($(strip $(BOOTLOADER_FILE)),)
AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i
endif endif
endif endif
endif endif