Removed Travis-CI references from all examples. Regular users
are not affected by test scripts/makefiles. Added makefile and gcc version info to config output. Tested on Arduino 1.0.6
This commit is contained in:
Simon John
parent
ee1855c6b1
commit
6be2614c30
16 changed files with 30 additions and 27 deletions
|
|
@ -1010,6 +1010,14 @@ else
|
|||
$(call show_config_variable,BOOTLOADER_PARENT,[USER])
|
||||
endif
|
||||
|
||||
########################################################################
|
||||
# Tools version info
|
||||
ARDMK_VERSION = 1.3.4
|
||||
$(call show_config_variable,ARDMK_VERSION,[COMPUTED])
|
||||
|
||||
CC_VERSION = $(shell $(CC) -dumpversion)
|
||||
$(call show_config_variable,CC_VERSION,[COMPUTED],($(CC_NAME)))
|
||||
|
||||
# end of config output
|
||||
$(call show_separator)
|
||||
|
||||
|
|
|
|||
17
Common.mk
17
Common.mk
|
|
@ -44,3 +44,20 @@ else
|
|||
endif
|
||||
endif
|
||||
$(call show_config_variable,CURRENT_OS,[AUTODETECTED])
|
||||
|
||||
########################################################################
|
||||
#
|
||||
# Travis-CI
|
||||
ifneq ($(TEST),)
|
||||
DEPENDENCIES_DIR = /var/tmp/Arduino-Makefile-testing-dependencies
|
||||
|
||||
DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_DIR)/mpide-0023-linux64-20130817-test
|
||||
ifeq ($(MPIDE_DIR),)
|
||||
MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
|
||||
endif
|
||||
|
||||
DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/arduino-1.0.5
|
||||
ifeq ($(ARDUINO_DIR),)
|
||||
ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
|
|||
- New: Add information about reporting bugs to the correct project (Issue #231). (https://github.com/sej7278)
|
||||
- New: Add documentation about CFLAGS_STD and CXXFLAGS_STD (Issue #234) (https://github.com/ladislas)
|
||||
- New: Allow "make clean" target to be extended (Issue #239). (https://github.com/sej7278)
|
||||
- New: Add makefile and gcc version info to config output. (https://github.com/sej7278)
|
||||
|
||||
- Tweak: Remove $(EXTRA_XXX) variables (Issue #234) (https://github.com/ladislas)
|
||||
- Tweak: Update Malefile-example.mk with STD flags (https://github.com/ladislas)
|
||||
|
|
@ -21,6 +22,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
|
|||
- Fix: Allow the use of CFLAGS_STD and CXXFLAGS_STD and set defaults (Issue #234) (https://github.com/ladislas)
|
||||
- Fix: Update "make show_boards" regex to work with the Due in 1.5. (https://github.com/sej7278)
|
||||
- Fix: Allow user libaries/sketches to have the same name as system libs. (Issue #244, #229). (https://github.com/sej7278)
|
||||
- Fix: Remove impact of travis-ci from regular users. (Issue #258). (https://github.com/sej7278)
|
||||
|
||||
### 1.3.4 (2014-07-12)
|
||||
- Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS =
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS =
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
BOARD_TAG = mega_pic32
|
||||
ARDUINO_LIBS =
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../chipKIT.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ F_CPU = 8000000L
|
|||
ISP_PROG = stk500v1
|
||||
AVRDUDE_ISP_BAUDRATE = 19200
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include $(ARDMK_DIR)/Arduino.mk
|
||||
include ../../Arduino.mk
|
||||
|
||||
# !!! Important. You have to use make ispload to upload when using ISP programmer
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS =
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS =
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS = LiquidCrystal
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
ARDMK_DIR=../../
|
||||
DEPENDENCIES_FOLDER = /var/tmp/Arduino-Makefile-testing-dependencies
|
||||
DEPENDENCIES_MPIDE_DIR = $(DEPENDENCIES_FOLDER)/mpide-0023-linux64-20130817-test
|
||||
|
||||
ifeq ($(MPIDE_DIR),)
|
||||
MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR)
|
||||
endif
|
||||
|
||||
DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_FOLDER)/arduino-1.0.5
|
||||
|
||||
ifeq ($(ARDUINO_DIR),)
|
||||
ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR)
|
||||
endif
|
||||
|
|
@ -9,7 +9,6 @@ BOARD_TAG = attiny85-8
|
|||
|
||||
ARDUINO_LIBS = SoftwareSerial
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include $(ARDMK_DIR)/Arduino.mk
|
||||
|
||||
# !!! Important. You have to use make ispload to upload when using ISP programmer
|
||||
|
|
|
|||
|
|
@ -3,5 +3,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS = Ethernet SPI
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -3,5 +3,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS = Wire
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
BOARD_TAG = uno
|
||||
ARDUINO_LIBS =
|
||||
|
||||
include ../TestSuiteCommon.mk
|
||||
include ../../Arduino.mk
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ do
|
|||
|
||||
pushd $dir
|
||||
echo "Compiling $example..."
|
||||
make_output=`make clean`
|
||||
make_output=`make`
|
||||
make_output=`make clean TEST=1`
|
||||
make_output=`make TEST=1`
|
||||
if [[ $? -ne 0 ]]; then
|
||||
failures+=("$example")
|
||||
echo "Example $example failed"
|
||||
|
|
|
|||
Loading…
Reference in a new issue