Skip to content

Commit 7e6a3e2

Browse files
committed
Merge pull request #399 from sej7278/master
Fixed "make show_boards" regex to allow for hyphens in BOARD_TAG
2 parents 9afa0e7 + 9115d9e commit 7e6a3e2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Arduino.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,7 @@ size: $(TARGET_HEX)
14951495
$(call avr_size,$(TARGET_ELF),$(TARGET_HEX))
14961496

14971497
show_boards:
1498-
@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
1498+
@$(CAT) $(BOARDS_TXT) | grep -E '^[a-zA-Z0-9_\-]+.name' | sort -uf | sed 's/.name=/:/' | column -s: -t
14991499

15001500
monitor:
15011501
ifeq ($(MONITOR_CMD), 'putty')

HISTORY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
2222
- Fix: Ensure AVRDUDE_CONF is set when AVR_TOOLS_DIR is, not just on Windows (Issue #381) (https://github.com/sej7278)
2323
- Fix: Rename VENDOR to ARDMK_VENDOR to workaround tcsh issue (Issue #386) (https://github.com/sej7278)
2424
- Fix: Document OSX 1.0/1.6 ARDUINO_DIR differences (https://github.com/thomaskilian)
25+
- Fix: Fix regex to support BOARD_TAGs with hyphens e.g. attiny44-20 (https://github.com/sej7278)
2526

2627
### 1.5 (2015-04-07)
2728
- New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)

0 commit comments

Comments
 (0)