From d8c357f6d6f5c15f887c8c3b5400790c71abf702 Mon Sep 17 00:00:00 2001 From: Simon John Date: Thu, 13 Jun 2013 12:30:09 +0200 Subject: [PATCH] Change the way AUTO_ARDUINO_VERSION is computed adds another pass to sed to remove the '1:' from debian version numbers --- HISTORY.md | 3 ++- arduino-mk/Arduino.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index f2df626..e582bdf 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,7 +4,8 @@ A Makefile for Arduino Sketches 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. ### 0.10.6 (in development) -- fix whitespace and add /dev/null redirection (https://github.com/sej7278) +- Fix whitespace and add /dev/null redirection (https://github.com/sej7278) +- Change the way AUTO_ARDUINO_VERSION is computed (https://github.com/sej7278) ### 0.10.5 (2013-06-11) - Add USB_VID and USB_PID to CPPFLAGS only if the board is Leonardo. diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index e737abf..efa3bd6 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -257,7 +257,7 @@ 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 VERSION_FILE := $(ARDUINO_DIR)/lib/version.txt - AUTO_ARDUINO_VERSION := $(shell [ -e $(VERSION_FILE) ] && cat $(VERSION_FILE) | sed -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/$$/0000/' | head -c3) ifdef AUTO_ARDUINO_VERSION ARDUINO_VERSION = $(AUTO_ARDUINO_VERSION) $(call show_config_variable,ARDUINO_VERSION,[AUTODETECTED])