From 737a3f14cd780710dc53c080603deb4a5dd4e6da Mon Sep 17 00:00:00 2001 From: Simon John Date: Fri, 29 Jul 2016 16:13:36 +0100 Subject: [PATCH] Fix for 1.6.10 version detection Updated HISTORY.md with latest commits --- Arduino.mk | 6 +++--- HISTORY.md | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Arduino.mk b/Arduino.mk index ffda348..eaf937f 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -280,10 +280,10 @@ endif # Arduino version number ifndef ARDUINO_VERSION - # Remove all the decimals, and right-pad with zeros, and finally grab the first 3 bytes. - # Works for 1.0 and 1.0.1 + # Remove all the decimals, remove anything before/including ":", remove anything after/including "+" and finally grab the last 5 bytes. + # Works for 1.0 and 1.0.1 and 1.6.10 and debian-style 2:1.0.5+dfsg2-4 VERSION_FILE := $(ARDUINO_DIR)/lib/version.txt - AUTO_ARDUINO_VERSION := $(shell [ -e $(VERSION_FILE) ] && cat $(VERSION_FILE) | sed -e 's/^[0-9]://g' -e 's/[.]//g' -e 's/$$/0000/' | head -c3) + AUTO_ARDUINO_VERSION := $(shell [ -e $(VERSION_FILE) ] && cat $(VERSION_FILE) | sed -e 's/^[0-9]://g' -e 's/[.]//g' -e 's/\+.*//g' | head -c5) ifdef AUTO_ARDUINO_VERSION ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION) $(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED]) diff --git a/HISTORY.md b/HISTORY.md index 58adad4..220e733 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,7 +5,10 @@ The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list. ### In Development --Tweak: Updated Linux instructions and sync documentation from the old blog(), README.md and Arduino.mk (https://github.com/az-z) +- Tweak: Updated Linux instructions and sync documentation from the old blog(), README.md and Arduino.mk (https://github.com/az-z) +- Fix: Updated CXXFLAGS_STD to match upstream 1.6 (issue #424) (https://github.com/calvinli) +- Fix: Added support for attiny core's use of chip instead of cpu in submenus (https://github.com/straccio) +- Fix: ARDUINO_VERSION can cope with the longer 1.6.10 version string (issue #444) (https://github.com/sej7278) ### 1.5.1 (Debian version: 1.5-3) (2016-02-22)