Now we know that arduino 1.6.1 uses the ~/.arduino15 directory
we can find preferences.txt Still need to find out where it looks on OSX/Cygwin
This commit is contained in:
parent
ce235b6bb3
commit
8d52840eb8
2 changed files with 10 additions and 3 deletions
12
Arduino.mk
12
Arduino.mk
|
@ -329,10 +329,16 @@ endif
|
|||
|
||||
ifndef ARDUINO_SKETCHBOOK
|
||||
ifndef ARDUINO_PREFERENCES_PATH
|
||||
ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
|
||||
AUTO_ARDUINO_PREFERENCES := $(firstword \
|
||||
$(call dir_if_exists,$(HOME)/.arduino15/preferences.txt) )
|
||||
# TODO: add mac/windows version once known
|
||||
else
|
||||
AUTO_ARDUINO_PREFERENCES := $(firstword \
|
||||
$(call dir_if_exists,$(HOME)/.arduino/preferences.txt) \
|
||||
$(call dir_if_exists,$(HOME)/Library/Arduino/preferences.txt) )
|
||||
endif
|
||||
|
||||
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])
|
||||
|
|
|
@ -48,6 +48,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
|
|||
- Fix: Removed some double quotes that were breaking variable expansion. (https://github.com/sej7278)
|
||||
- Fix: Fixed PLATFORM_LIB support for 1.5+ and removed duplicate libs (https://github.com/sej7278)
|
||||
- Fix: Added ARCHITECTURE to ALTERNATE_CORE_PATH to support 1.5+ cores like arduino-tiny (https://github.com/sej7278)
|
||||
- Fix: Can now find IDE 1.5+ preferences.txt on Linux at least (https://github.com/sej7278)
|
||||
|
||||
### 1.3.4 (2014-07-12)
|
||||
- Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)
|
||||
|
|
Loading…
Reference in a new issue