diff --git a/Arduino.mk b/Arduino.mk index c1981d0..1981e52 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -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) diff --git a/Common.mk b/Common.mk index 9aa36b8..f425b96 100644 --- a/Common.mk +++ b/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 diff --git a/HISTORY.md b/HISTORY.md index 3717bea..fedb006 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -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) diff --git a/examples/AnalogInOutSerial/Makefile b/examples/AnalogInOutSerial/Makefile index 872d069..3dea6c0 100644 --- a/examples/AnalogInOutSerial/Makefile +++ b/examples/AnalogInOutSerial/Makefile @@ -1,5 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/Blink/Makefile b/examples/Blink/Makefile index d41effa..7678e9b 100644 --- a/examples/Blink/Makefile +++ b/examples/Blink/Makefile @@ -1,6 +1,5 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/BlinkChipKIT/Makefile b/examples/BlinkChipKIT/Makefile index bec2794..87a9f7d 100644 --- a/examples/BlinkChipKIT/Makefile +++ b/examples/BlinkChipKIT/Makefile @@ -1,6 +1,5 @@ BOARD_TAG = mega_pic32 ARDUINO_LIBS = -include ../TestSuiteCommon.mk include ../../chipKIT.mk diff --git a/examples/BlinkInAVRC/Makefile b/examples/BlinkInAVRC/Makefile index 9080b24..a4cd2e4 100644 --- a/examples/BlinkInAVRC/Makefile +++ b/examples/BlinkInAVRC/Makefile @@ -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 diff --git a/examples/BlinkWithoutDelay/Makefile b/examples/BlinkWithoutDelay/Makefile index 872d069..3dea6c0 100644 --- a/examples/BlinkWithoutDelay/Makefile +++ b/examples/BlinkWithoutDelay/Makefile @@ -1,5 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/Fade/Makefile b/examples/Fade/Makefile index 872d069..3dea6c0 100644 --- a/examples/Fade/Makefile +++ b/examples/Fade/Makefile @@ -1,5 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/HelloWorld/Makefile b/examples/HelloWorld/Makefile index 0af2ed4..fb94fdd 100644 --- a/examples/HelloWorld/Makefile +++ b/examples/HelloWorld/Makefile @@ -1,5 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = LiquidCrystal -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/TestSuiteCommon.mk b/examples/TestSuiteCommon.mk deleted file mode 100644 index a66a007..0000000 --- a/examples/TestSuiteCommon.mk +++ /dev/null @@ -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 diff --git a/examples/TinySoftWareSerial/Makefile b/examples/TinySoftWareSerial/Makefile index 991e57e..08f918d 100644 --- a/examples/TinySoftWareSerial/Makefile +++ b/examples/TinySoftWareSerial/Makefile @@ -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 diff --git a/examples/WebServer/Makefile b/examples/WebServer/Makefile index 5fbefae..51b9ac2 100644 --- a/examples/WebServer/Makefile +++ b/examples/WebServer/Makefile @@ -3,5 +3,4 @@ BOARD_TAG = uno ARDUINO_LIBS = Ethernet SPI -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/master_reader/Makefile b/examples/master_reader/Makefile index 8a42a8e..3030deb 100644 --- a/examples/master_reader/Makefile +++ b/examples/master_reader/Makefile @@ -3,5 +3,4 @@ BOARD_TAG = uno ARDUINO_LIBS = Wire -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/examples/toneMelody/Makefile b/examples/toneMelody/Makefile index 872d069..3dea6c0 100644 --- a/examples/toneMelody/Makefile +++ b/examples/toneMelody/Makefile @@ -1,5 +1,4 @@ BOARD_TAG = uno ARDUINO_LIBS = -include ../TestSuiteCommon.mk include ../../Arduino.mk diff --git a/tests/script/runtests.sh b/tests/script/runtests.sh index 5f513da..5313d0f 100755 --- a/tests/script/runtests.sh +++ b/tests/script/runtests.sh @@ -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"