dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Travis-CI scripts to test against Arduino v1.0.6

Browse source
This commit is contained in:
Simon John 2014-09-22 22:50:27 +01:00
parent 623b55c55c
commit 5c50797471
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Common.mk
View file

@ -56,7 +56,7 @@ ifneq ($(TEST),)
MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR) MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
endif endif
DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.5 DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.6
ifeq ($(ARDUINO_DIR),) ifeq ($(ARDUINO_DIR),)
ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR) ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
endif endif

1
HISTORY.md
View file

@ -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: 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: 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: 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: 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) - Fix: Make avr-g++ use CXXFLAGS instead of CFLAGS. (https://github.com/sej7278)

6
tests/script/bootstrap/arduino.sh
View file

@ -8,9 +8,9 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
echo "Installing Arduino..." echo "Installing Arduino..."
ARDUINO_BASENAME="arduino-1.0.5" ARDUINO_BASENAME="arduino-1.0.6"
if [ $OS == "cygwin" ]; then if [ $OS == "cygwin" ]; then
ARDUINO_FILE="$ARDUINO_BASENAME-r2-windows".zip ARDUINO_FILE="$ARDUINO_BASENAME-windows".zip
EXTRACT_COMMAND="unzip -q" EXTRACT_COMMAND="unzip -q"
elif [ $OS == "mac" ]; then elif [ $OS == "mac" ]; then
ARDUINO_FILE="$ARDUINO_BASENAME-macosx".zip 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" EXTRACT_COMMAND="tar -xzf"
fi fi
ARDUINO_URL=http://arduino.googlecode.com/files/$ARDUINO_FILE ARDUINO_URL=http://downloads.arduino.cc/$ARDUINO_FILE
_pushd $DEPENDENCIES_FOLDER _pushd $DEPENDENCIES_FOLDER
if ! test -e $ARDUINO_FILE if ! test -e $ARDUINO_FILE