From 9115d9e030757300995616d967709746ab8060f2 Mon Sep 17 00:00:00 2001 From: Simon John Date: Wed, 16 Dec 2015 18:27:31 +0000 Subject: [PATCH] Fixed "make show_boards" regex to allow for hyphens in BOARD_TAG e.g. attiny44-20, thanks to Atmel for the sample chip! --- Arduino.mk | 2 +- HISTORY.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Arduino.mk b/Arduino.mk index 7b1342e..1ba6c6e 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1495,7 +1495,7 @@ size: $(TARGET_HEX) $(call avr_size,$(TARGET_ELF),$(TARGET_HEX)) show_boards: - @$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t + @$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_\-]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t monitor: ifeq ($(MONITOR_CMD), 'putty') diff --git a/HISTORY.md b/HISTORY.md index 62f74dc..39a3522 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -22,6 +22,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is, not just on Windows (Issue #381) (https://github.com/sej7278) - Fix: Rename VENDOR to ARDMK_VENDOR to workaround tcsh issue (Issue #386) (https://github.com/sej7278) - Fix: Document OSX 1.0/1.6 ARDUINO_DIR differences (https://github.com/thomaskilian) +- Fix: Fix regex to support BOARD_TAGs with hyphens e.g. attiny44-20 (https://github.com/sej7278) ### 1.5 (2015-04-07) - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)