diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2015-03-28 17:10:22 +0530 |
|---|---|---|
| committer | Sudar Muthu <sudar@sudarmuthu.com> | 2015-03-28 17:10:22 +0530 |
| commit | 1dfcb941b3dbd96acceb68a452aa91dce384947b (patch) | |
| tree | 50048e4af8df9fb2534b133fb5de2f6ffd1e2b1b | |
| parent | ab068291723dea83a97be9b9e32a61a01452c435 (diff) | |
| parent | 8d52840eb86fa45158a8b7387931ea5e43e2b4a6 (diff) | |
Merge pull request #333 from sej7278/master
Add = to PARSE_BOARD regex to make it less greedy.
| -rw-r--r-- | Arduino.mk | 14 | ||||
| -rw-r--r-- | HISTORY.md | 2 |
2 files changed, 12 insertions, 4 deletions
@@ -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]) @@ -552,7 +558,7 @@ endif ifndef PARSE_BOARD # result = $(call READ_BOARD_TXT, 'boardname', 'parameter') - PARSE_BOARD = $(shell grep -v '^\#' $(BOARDS_TXT) | grep $(1).$(2) | cut -d = -f 2 ) + PARSE_BOARD = $(shell grep -v '^\#' $(BOARDS_TXT) | grep $(1).$(2)= | cut -d = -f 2 ) endif # If NO_CORE is set, then we don't have to parse boards.txt file @@ -30,6 +30,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Tweak: Ability to override `USB_TYPE` in Teensy.md (Issue #313) (https://github.com/Poofjunior) - Tweak: Integration instructions for CodeBlocks IDE (Issue #321) (https://github.com/fbielejec) - Tweak: Add BOARD_SUB to OBJDIR if defined in 1.5+ (https://github.com/sej7278) +- Tweak: Add = to PARSE_BOARD regex to make it less greedy and not match vid.0, vid.1 and vid (https://github.com/sej7278) - Fix: Improved Windows (Cygwin/MSYS) support (https://github.com/PeterMosmans) - Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas) @@ -47,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) |