diff options
| author | Simon John <git@the-jedi.co.uk> | 2016-07-29 16:13:36 +0100 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2016-07-29 16:13:36 +0100 |
| commit | 737a3f14cd780710dc53c080603deb4a5dd4e6da (patch) | |
| tree | a32276b666951bc093a5fea9c1b73be5a75033a6 | |
| parent | 5a83288e6ac01182fbf2a0cf219cc13370e67c66 (diff) | |
Fix for 1.6.10 version detection
Updated HISTORY.md with latest commits
| -rw-r--r-- | Arduino.mk | 6 | ||||
| -rw-r--r-- | HISTORY.md | 5 |
2 files changed, 7 insertions, 4 deletions
@@ -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]) @@ -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) |