aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Common.mk2
-rw-r--r--HISTORY.md1
-rw-r--r--tests/script/bootstrap/arduino.sh6
3 files changed, 5 insertions, 4 deletions
diff --git a/Common.mk b/Common.mk
index f425b96..0c1bc0b 100644
--- a/Common.mk
+++ b/Common.mk
@@ -56,7 +56,7 @@ ifneq ($(TEST),)
MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
endif
- DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.5
+ DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.6
ifeq ($(ARDUINO_DIR),)
ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
endif
diff --git a/HISTORY.md b/HISTORY.md
index fedb006..74ed45a 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -16,6 +16,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Tweak: Update Malefile-example.mk with STD flags (https://github.com/ladislas)
- Tweak: Allow remove of any OBJDIR with `$(REMOVE) $(OBJDIR)`. (https://github.com/ladislas)
- Tweak: Add cpp to extensions supported by "make generate_assembly". (https://github.com/sej7278)
+- Tweak: Update travis-ci to test against Arduino 1.0.6. (https://github.com/sej7278)
- Fix: Change "tinyladi" username to "ladislas" in HISTORY.md. (https://github.com/ladislas)
- Fix: Make avr-g++ use CXXFLAGS instead of CFLAGS. (https://github.com/sej7278)
diff --git a/tests/script/bootstrap/arduino.sh b/tests/script/bootstrap/arduino.sh
index 3c7e9d7..0260448 100644
--- a/tests/script/bootstrap/arduino.sh
+++ b/tests/script/bootstrap/arduino.sh
@@ -8,9 +8,9 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
echo "Installing Arduino..."
- ARDUINO_BASENAME="arduino-1.0.5"
+ ARDUINO_BASENAME="arduino-1.0.6"
if [ $OS == "cygwin" ]; then
- ARDUINO_FILE="$ARDUINO_BASENAME-r2-windows".zip
+ ARDUINO_FILE="$ARDUINO_BASENAME-windows".zip
EXTRACT_COMMAND="unzip -q"
elif [ $OS == "mac" ]; then
ARDUINO_FILE="$ARDUINO_BASENAME-macosx".zip
@@ -20,7 +20,7 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
EXTRACT_COMMAND="tar -xzf"
fi
- ARDUINO_URL=http://arduino.googlecode.com/files/$ARDUINO_FILE
+ ARDUINO_URL=http://downloads.arduino.cc/$ARDUINO_FILE
_pushd $DEPENDENCIES_FOLDER
if ! test -e $ARDUINO_FILE