From ce235b6bb3465452ebbe6ae257639cc550654287 Mon Sep 17 00:00:00 2001 From: Simon John Date: Fri, 27 Mar 2015 16:11:27 +0000 Subject: [PATCH] Add = to PARSE_BOARD regex to make it less greedy. For instance in the Sparkfun 1.6 core, we have: promicro16.build.vid.0=0x1B4F promicro16.build.vid.1=0x1B4F promicro16.build.vid=0x1B4F So we end up matching all 3 instead of just the last one. Adding the = means we're looking for promicro16.build.vid= so not catching the .0 or .1 version. --- Arduino.mk | 2 +- HISTORY.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Arduino.mk b/Arduino.mk index cc156fc..1d5c6d2 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -552,7 +552,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 diff --git a/HISTORY.md b/HISTORY.md index dd55e65..10816e8 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -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)