diff options
| author | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2013-07-09 16:50:19 -0400 |
|---|---|---|
| committer | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2013-07-09 17:03:02 -0400 |
| commit | 3c00739165ddfdcf2db4271794d3e9a04d316589 (patch) | |
| tree | 6ad5e3f6b4691068dc8af3d9fe57039e503c04db | |
| parent | 474da2ced413a892f455ebf99a8029b3cd753d79 (diff) | |
Don't require an IDE preferences file, fallback to default sketchbook.
It should be possible to use the Makefile without ever running the
Arduino or chipKIT IDE. This change only looks for the preferences file
if the sketchbook path is not defined, and even then, will use the
default skethbook path if the preferences file is unavailable.
| -rw-r--r-- | arduino-mk/Arduino.mk | 37 | ||||
| -rw-r--r-- | arduino-mk/chipKIT.mk | 2 |
2 files changed, 17 insertions, 22 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 7c45bc5..6954b06 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -285,30 +285,27 @@ endif # Arduino Sketchbook folder # -ifndef ARDUINO_PREFERENCES_PATH - - AUTO_ARDUINO_PREFERENCES := $(firstword \ - $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \ - $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) ) - ifdef AUTO_ARDUINO_PREFERENCES - ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES) - $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED]) - else - echo $(error "ARDUINO_PREFERENCES is not defined") - endif - -else - $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[USER]) -endif ifndef ARDUINO_SKETCHBOOK - ifeq ($(ARDUINO_PREFERENCES_PATH),) - echo $(error No ARDUINO_PREFERENCES_PATH detected, cannot autodetect ARDUINO_SKETCHBOOK) + ifndef ARDUINO_PREFERENCES_PATH + + AUTO_ARDUINO_PREFERENCES := $(firstword \ + $(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \ + $(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) ) + ifdef AUTO_ARDUINO_PREFERENCES + ARDUINO_PREFERENCES_PATH = $(AUTO_ARDUINO_PREFERENCES) + $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[AUTODETECTED]) + endif + + else + $(call show_config_variable,ARDUINO_PREFERENCES_PATH,[USER]) endif - ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ - $(ARDUINO_PREFERENCES_PATH) | \ - sed -e 's/sketchbook.path=//' ) + ifneq ($(ARDUINO_PREFERENCES_PATH),) + ARDUINO_SKETCHBOOK = $(shell grep --max-count=1 --regexp="sketchbook.path=" \ + $(ARDUINO_PREFERENCES_PATH) | \ + sed -e 's/sketchbook.path=//' ) + endif ifneq ($(ARDUINO_SKETCHBOOK),) $(call show_config_variable,ARDUINO_SKETCHBOOK,[AUTODETECTED],(from arduino preferences file)) diff --git a/arduino-mk/chipKIT.mk b/arduino-mk/chipKIT.mk index f861a2c..a256790 100644 --- a/arduino-mk/chipKIT.mk +++ b/arduino-mk/chipKIT.mk @@ -62,8 +62,6 @@ ifndef MPIDE_PREFERENCES_PATH ifdef AUTO_MPIDE_PREFERENCES_PATH MPIDE_PREFERENCES_PATH = $(AUTO_MPIDE_PREFERENCES_PATH) $(call show_config_variable,MPIDE_PREFERENCES_PATH,[autodetected]) - else - echo $(error "MPIDE_PREFERENCES_PATH is not defined") endif endif |