diff options
| author | Sudar <sudar@sudarmuthu.com> | 2014-09-29 15:55:20 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-09-29 15:55:20 +0530 |
| commit | 2c5a66a973aedfb3325aaf600a40a1df784c436b (patch) | |
| tree | 9c827a7b1cd4355583d6b0ca5422a612c198ad82 | |
| parent | 623b55c55cce9c9abc460dd174cc9701acc4361d (diff) | |
| parent | 88c81b6d95efeed84e5b39188028ca1ec039db13 (diff) | |
Merge pull request #270 from sej7278/travis106
Update Travis-CI scripts to test against Arduino v1.0.6
| -rw-r--r-- | Common.mk | 2 | ||||
| -rw-r--r-- | HISTORY.md | 2 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | tests/script/bootstrap/arduino.sh | 6 |
4 files changed, 13 insertions, 5 deletions
@@ -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 @@ -16,6 +16,8 @@ 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) +- Tweak: Updated package instructions for Arch/Fedora/Raspbian. (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) @@ -20,9 +20,15 @@ in the build process. Changes in `*.h` files lead to recompilation of sources wh ### Through package -If you're using FreeBSD, Debian or Ubuntu, you can find this in the `arduino-mk` +If you're using FreeBSD, Debian, Raspbian or Ubuntu, you can find this in the `arduino-mk` package which can be installed using `apt-get` or `aptitude`. +Arch Linux users can use the unofficial AUR package [arduino-mk](https://aur.archlinux.org/packages/arduino-mk/) +and install using `yaourt -S arduino-mk` + +Fedora Linux users can use our packaging instructions [here](https://github.com/sudar/Arduino-Makefile/tree/master/packaging/fedora) +to build an RPM. + ### From source - Download the latest release 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 |
