diff options
Diffstat (limited to 'make-scripts/Common.mk')
| -rw-r--r-- | make-scripts/Common.mk | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/make-scripts/Common.mk b/make-scripts/Common.mk index fd775e7..fa3f9f0 100644 --- a/make-scripts/Common.mk +++ b/make-scripts/Common.mk @@ -68,31 +68,6 @@ endif $(call show_config_variable,CURRENT_OS,[AUTODETECTED]) ######################################################################## -# -# Travis-CI -ifneq ($(TEST),) - DEPENDENCIES_DIR = /var/tmp/Arduino-Makefile-testing-dependencies - - DEPENDENCIES_MPIDE_DIR := $(shell find $(DEPENDENCIES_DIR) -name 'mpide-0023-*' -type d -exec ls -dt {} + | head -n 1) - - ifeq ($(MPIDE_DIR),) - MPIDE_DIR = $(DEPENDENCIES_MPIDE_DIR) - endif - - ifndef ARDUINO_IDE_DIR - ifeq ($(CURRENT_OS),MAC) - ARDUINO_IDE_DIR = Arduino.app/Contents/Resources/Java - else - ARDUINO_IDE_DIR := $(shell basename $(basename $(basename $(lastword $(wildcard $(DEPENDENCIES_DIR)/arduino*))))) - endif - endif - DEPENDENCIES_ARDUINO_DIR = $(DEPENDENCIES_DIR)/$(ARDUINO_IDE_DIR) - ifeq ($(ARDUINO_DIR),) - ARDUINO_DIR = $(DEPENDENCIES_ARDUINO_DIR) - endif -endif - -######################################################################## # Arduino Directory ifndef ARDUINO_DIR @@ -110,12 +85,6 @@ else $(call show_config_variable,ARDUINO_DIR,[USER]) endif -ifeq ($(CURRENT_OS),WINDOWS) - ifneq ($(shell echo $(ARDUINO_DIR) | egrep '\\|[[:space:]]|cygdrive'),) - echo $(error On Windows, ARDUINO_DIR and other defines must use forward slash and not contain spaces, special characters or be cygdrive relative) - endif -endif - ######################################################################## # System Python |