Skip to content

Commit 4575664

Browse files
ladislasladislas
committed
Update travis ci scripts to download latest version of arduino + improve makefiles for all platforms
1 parent d546360 commit 4575664

File tree

5 files changed

+62
-82
lines changed

5 files changed

+62
-82
lines changed

‎Makefile-CI.mk‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,37 @@
55

66
### PROJECT_DIR
77
### This is the path to where you have created/cloned your project
8-
PROJECT_DIR =
9-
10-
### AVR_GCC_VERSION
11-
### Check if the version is equal or higher than 4.9
12-
AVR_GCC_VERSION := $(shell expr `avr-gcc -dumpversion | cut -f1` \>= 4.9)
13-
8+
# PROJECT_DIR = // set by calling make
9+
#
1410
### ARDMK_DIR
1511
### Path to the Arduino-Makefile directory.
1612
ARDMK_DIR = $(PROJECT_DIR)/Arduino-Makefile
1713

1814
### ARDUINO_DIR
1915
### Path to the Arduino application and ressources directory.
20-
ARDUINO_DIR =
16+
# ARDUINO_DIR = // set by calling make
2117

2218
### USER_LIB_PATH
2319
### Path to where the your project's libraries are stored.
24-
USER_LIB_PATH := $(PROJECT_DIR)/lib
20+
# USER_LIB_PATH := $(PROJECT_DIR)/lib
21+
USER_LIB_PATH := $(realpath $(PROJECT_DIR)/lib)
2522

2623
### BOARD_TAG
2724
### It must be set to the board you are currently using. (i.e uno, mega2560, etc.)
28-
BOARD_TAG = mega2560
25+
BOARD_TAG = mega
26+
BOARD_SUB = atmega2560
27+
28+
### MONITOR_PORT
29+
### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
30+
MONITOR_PORT = /dev/tty.usbmodem*
2931

3032
### MONITOR_BAUDRATE
3133
### It must be set to Serial baudrate value you are using.
3234
MONITOR_BAUDRATE = 115200
3335

3436
### AVR_TOOLS_DIR
3537
### Path to the AVR tools directory such as avr-gcc, avr-g++, etc.
36-
AVR_TOOLS_DIR =
38+
# AVR_TOOLS_DIR = // set by calling make
3739

3840
### AVRDUDE
3941
### Path to avrdude directory.
@@ -47,23 +49,14 @@ CXXFLAGS_STD = -std=gnu++11
4749

4850
### CPPFLAGS
4951
### Flags you might want to set for debugging purpose. Comment to stop.
50-
CXXFLAGS = -pedantic -Wall -Wextra
51-
52-
### If avr-gcc -v is higher than 4.9, activate coloring of the output
53-
ifeq "$(AVR_GCC_VERSION)" "1"
54-
CXXFLAGS += -fdiagnostics-color
55-
endif
56-
57-
### MONITOR_PORT
58-
### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
59-
MONITOR_PORT = /dev/tty.usbmodem*
60-
61-
### don't touch this
62-
CURRENT_DIR = $(shell basename $(CURDIR))
52+
CXXFLAGS += -pedantic -Wall -Wextra
53+
LDFLAGS += -fdiagnostics-color
6354

6455
### OBJDIR
56+
### Don't touch this!
6557
### This is were you put the binaries you just compile using 'make'
66-
OBJDIR = $(PROJECT_DIR)/bin/$(BOARD_TAG)/$(CURRENT_DIR)
58+
CURRENT_DIR = $(shell basename $(CURDIR))
59+
OBJDIR = $(PROJECT_DIR)/build/$(CURRENT_DIR)/$(BOARD_TAG)
6760

6861
### path to Arduino.mk, inside the ARDMK_DIR, don't touch.
6962
include $(ARDMK_DIR)/Arduino.mk

‎Makefile-Linux.mk‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55

66
### PROJECT_DIR
77
### This is the path to where you have created/cloned your project
8-
PROJECT_DIR = $(shell dirname $(shell dirname $(shell pwd)))
9-
10-
### AVR_GCC_VERSION
11-
### Check if the version is equal or higher than 4.9
12-
AVR_GCC_VERSION := $(shell expr `avr-gcc -dumpversion | cut -f1` \>= 4.9)
8+
PROJECT_DIR = $(shell dirname $(shell pwd))
139

1410
### ARDMK_DIR
1511
### Path to the Arduino-Makefile directory.
@@ -33,6 +29,11 @@ USER_LIB_PATH := $(realpath $(PROJECT_DIR)/lib)
3329
BOARD_TAG = mega
3430
BOARD_SUB = atmega2560
3531

32+
### MONITOR_PORT
33+
### The port your board is connected to. Using an '*' tries all the ports and finds the right one. Choose one of the two.
34+
MONITOR_PORT = /dev/ttyUSB*
35+
# MONITOR_PORT = /dev/ttyACM*
36+
3637
### MONITOR_BAUDRATE
3738
### It must be set to Serial baudrate value you are using.
3839
MONITOR_BAUDRATE = 115200
@@ -43,35 +44,28 @@ AVR_TOOLS_DIR = /usr
4344

4445
### AVRDUDE
4546
### Path to avrdude directory.
46-
AVRDUDE = /usr/bin/avrdude
47+
AVRDUDE = /usr/bin/avrdude
4748

4849
### CFLAGS_STD
4950
CFLAGS_STD = -std=gnu11
5051

5152
### CXXFLAGS_STD
52-
CXXFLAGS_STD = -std=gnu++11
53+
### You can choose wich ever you like
54+
# CXXFLAGS_STD = -std=gnu++11
55+
CXXFLAGS_STD = -std=gnu++17
56+
5357

5458
### CPPFLAGS
5559
### Flags you might want to set for debugging purpose. Comment to stop.
56-
CXXFLAGS = -pedantic -Wall -Wextra
57-
58-
### If avr-gcc -v is higher than 4.9, activate coloring of the output
59-
ifeq "$(AVR_GCC_VERSION)" "1"
60-
CXXFLAGS += -fdiagnostics-color
61-
endif
62-
63-
### MONITOR_PORT
64-
### The port your board is connected to. Using an '*' tries all the ports and finds the right one. Choose one of the two.
65-
MONITOR_PORT = /dev/ttyUSB*
66-
# MONITOR_PORT = /dev/ttyACM*
67-
68-
### don't touch this
69-
CURRENT_DIR = $(shell basename $(CURDIR))
60+
CXXFLAGS += -pedantic -Wall -Wextra
61+
LDFLAGS += -fdiagnostics-color
7062

7163
### OBJDIR
64+
### Don't touch this!
7265
### This is were you put the binaries you just compile using 'make'
7366
CURRENT_DIR = $(shell basename $(CURDIR))
74-
OBJDIR = $(PROJECT_DIR)/bin/$(CURRENT_DIR)/$(BOARD_TAG)
67+
OBJDIR = $(PROJECT_DIR)/build/$(CURRENT_DIR)/$(BOARD_TAG)
7568

7669
### path to Arduino.mk, inside the ARDMK_DIR, don't touch.
7770
include $(ARDMK_DIR)/Arduino.mk
71+

‎Makefile-OSX.mk‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55

66
### PROJECT_DIR
77
### This is the path to where you have created/cloned your project
8-
PROJECT_DIR = $(shell dirname $(shell dirname $(shell pwd)))
9-
10-
### AVR_GCC_VERSION
11-
### Check if the version is equal or higher than 4.9
12-
AVR_GCC_VERSION := $(shell expr `avr-gcc -dumpversion | cut -f1` \>= 4.9)
8+
PROJECT_DIR = $(shell dirname $(shell pwd))
139

1410
### ARDMK_DIR
1511
### Path to the Arduino-Makefile directory.
@@ -19,7 +15,7 @@ ARDMK_DIR = $(PROJECT_DIR)/Arduino-Makefile
1915
### Path to the Arduino application and ressources directory.
2016
### For Arduino IDE 1.0.x
2117
# ARDUINO_DIR = /Applications/Arduino.app/Contents/Resources/Java
22-
### For Arduino IDE 1.6.x
18+
### For Arduino IDE 1.6.x ++
2319
ARDUINO_DIR = /Applications/Arduino.app/Contents/Java
2420

2521
### USER_LIB_PATH
@@ -36,6 +32,10 @@ USER_LIB_PATH := $(realpath $(PROJECT_DIR)/lib)
3632
BOARD_TAG = mega
3733
BOARD_SUB = atmega2560
3834

35+
### MONITOR_PORT
36+
### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
37+
MONITOR_PORT = /dev/tty.usbmodem*
38+
3939
### MONITOR_BAUDRATE
4040
### It must be set to Serial baudrate value you are using.
4141
MONITOR_BAUDRATE = 115200
@@ -46,31 +46,27 @@ AVR_TOOLS_DIR = /usr/local
4646

4747
### AVRDUDE
4848
### Path to avrdude directory.
49-
AVRDUDE = /usr/local/bin/avrdude
49+
AVRDUDE = /usr/local/bin/avrdude
5050

5151
### CFLAGS_STD
5252
CFLAGS_STD = -std=gnu11
5353

5454
### CXXFLAGS_STD
55-
CXXFLAGS_STD = -std=gnu++11
55+
### You can choose wich ever you like
56+
# CXXFLAGS_STD = -std=gnu++11
57+
CXXFLAGS_STD = -std=gnu++17
5658

5759
### CPPFLAGS
5860
### Flags you might want to set for debugging purpose. Comment to stop.
59-
CXXFLAGS = -pedantic -Wall -Wextra
60-
61-
### If avr-gcc -v is higher than 4.9, activate coloring of the output
62-
ifeq "$(AVR_GCC_VERSION)" "1"
63-
CXXFLAGS += -fdiagnostics-color
64-
endif
65-
66-
### MONITOR_PORT
67-
### The port your board is connected to. Using an '*' tries all the ports and finds the right one.
68-
MONITOR_PORT = /dev/tty.usbmodem*
61+
CXXFLAGS += -pedantic -Wall -Wextra
62+
LDFLAGS += -fdiagnostics-color
6963

7064
### OBJDIR
65+
### Don't touch this!
7166
### This is were you put the binaries you just compile using 'make'
7267
CURRENT_DIR = $(shell basename $(CURDIR))
73-
OBJDIR = $(PROJECT_DIR)/bin/$(CURRENT_DIR)/$(BOARD_TAG)
68+
OBJDIR = $(PROJECT_DIR)/build/$(CURRENT_DIR)/$(BOARD_TAG)
7469

7570
### path to Arduino.mk, inside the ARDMK_DIR, don't touch.
7671
include $(ARDMK_DIR)/Arduino.mk
72+

‎script/bootstrap.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SRC="$CWD/src"
77
TEST="$CWD/test"
88
ARDMK="$CWD/Arduino-Makefile"
99

10-
AVR_GCC="/usr/local/share/avr-gcc"
11-
ARDUINO="/usr/local/share/arduino"
10+
AVR_GCC="/usr/share/avr-gcc"
11+
ARDUINO="/usr/share/arduino"
1212

1313
source "$SCRIPTS_DIR/install.sh"

‎script/install.sh‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,23 @@
22

33
echo "Installing dependencies needed to build the sources and tests..."
44

5-
ARDUINO_BASENAME="arduino-1.0.6"
6-
ARDUINO_FILE="$ARDUINO_BASENAME-linux64.tgz"
7-
ARDUINO_URL="http://arduino.cc/download.php?f=/$ARDUINO_FILE"
8-
9-
AVR_GCC_BASENAME="arduino-1.5.8"
10-
AVR_GCC_FILE="$AVR_GCC_BASENAME-linux64.tgz"
11-
AVR_GCC_URL="http://arduino.cc/download.php?f=/$AVR_GCC_FILE"
12-
13-
echo "Installing Arduino 1.0.6..."
5+
ARDUINO_BASENAME="arduino-1.8.9"
6+
ARDUINO_FILE="$ARDUINO_BASENAME-linux64.tar.xz"
7+
ARDUINO_URL="https://downloads.arduino.cc/$ARDUINO_FILE"
148

9+
echo "Downloading $ARDUINO_BASENAME from $ARDUINO_URL"
1510
wget "$ARDUINO_URL" -O "$ARDUINO_FILE"
16-
tar -xzf "$ARDUINO_FILE"
17-
sudo mv "$ARDUINO_BASENAME/" "$ARDUINO"
1811

19-
echo "Installing avr-gcc from Arduino 1.5.8..."
12+
echo "Unzipping $ARDUINO_BASENAME"
13+
tar xf "$ARDUINO_FILE"
2014

21-
wget "$AVR_GCC_URL" -O "$AVR_GCC_FILE"
22-
tar -xzf "$AVR_GCC_FILE"
23-
sudo mv "$AVR_GCC_BASENAME/hardware/tools/avr" "$AVR_GCC"
15+
echo "Installing avr-gcc to $AVR_GCC"
16+
sudo mv "$ARDUINO_BASENAME/hardware/tools/avr" "$AVR_GCC"
17+
18+
echo "Install Arduino to $ARDUINO"
19+
sudo mv "$ARDUINO_BASENAME/" "$ARDUINO"
2420

2521
echo "Installation of dependencies is complete, we are now going to run some tests..."
2622

2723
source "$SCRIPTS_DIR/runtests.sh"
24+

0 commit comments

Comments
 (0)