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

Merge branch 'master' into auto-lib

Browse source
This commit is contained in:
ladislas 2014-09-29 14:52:35 +02:00
commit 9599271040
4 changed files with 13 additions and 5 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

2
HISTORY.md
View file

@ -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: 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)
- 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: 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)

8
README.md
View file

@ -20,9 +20,15 @@ in the build process. Changes in `*.h` files lead to recompilation of sources wh
### Through package ### 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`. 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 ### From source
- Download the latest release - Download the latest release

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