Merge remote-tracking branch 'upstream/master'

Author: robertinant

README.md

@@ -57,19 +57,23 @@ See [Doing continuous integration with arduino builder](https://github.com/ardui
 
 You need [Go 1.6.3](https://golang.org/dl/#go1.6.3).
 
-Repo root contains the script `setup_go_env_vars`. Use it as is or as a template for setting up Go environment variables.
-
 To install `codereview/patch` you have to install [Mercurial](https://www.mercurial-scm.org/) first.
 
-Once done, run the following commands:
+To set things up, run the following inside the cloned arduino-builder
+directory:
 
 ```
+export GOPATH=$(pwd)
 go get github.com/go-errors/errors
 go get github.com/stretchr/testify
 go get github.com/jstemmer/go-junit-report
 go build arduino.cc/arduino-builder
 ```
 
+After installing dependencies, you do not need to run the `go get`
+commands again, but you will have to set `GOPATH` again for every shell
+you want to build in.
+
 ### TDD
 
 In order to run the tests, type:

setup_go_env_vars

@@ -158,6 +158,7 @@ const MSG_BUILD_OPTIONS_CHANGED = "Build options changed, rebuilding all"
 const MSG_CANT_FIND_SKETCH_IN_PATH = "Unable to find {0} in {1}"
 const MSG_FQBN_INVALID = "{0} is not a valid fully qualified board name. Required format is targetPackageName:targetPlatformName:targetBoardName."
 const MSG_INVALID_QUOTING = "Invalid quoting: no closing [{0}] char found."
+const MSG_IGNORED_BUILTIN_TOOLS_TXT = "Skipping {0}; please consider removing that file since it may hurt older Arduino installations"
 const MSG_LIB_LEGACY = "(legacy)"
 const MSG_LIBRARIES_MULTIPLE_LIBS_FOUND_FOR = "Multiple libraries were found for \"{0}\""
 const MSG_LIBRARIES_NOT_USED = " Not used: {0}"

src/arduino.cc/builder/constants/constants.go

@@ -52,6 +52,16 @@ func (s *ToolsLoader) Run(ctx *types.Context) error {
 		if err != nil {
 			return i18n.WrapError(err)
 		}
+		builtinHardwareFolder := ""
+		if len(ctx.BuiltInLibrariesFolders) > 0 {
+			builtinHardwareFolder, err = filepath.Abs(filepath.Join(ctx.BuiltInLibrariesFolders[0], ".."))
+		}
+
+		if builtinToolsVersionsFile != constants.EMPTY_STRING && !strings.Contains(builtinToolsVersionsFile, builtinHardwareFolder) {
+			ctx.GetLogger().Println(constants.LOG_LEVEL_WARN, constants.MSG_IGNORED_BUILTIN_TOOLS_TXT, builtinToolsVersionsFile)
+			builtinToolsVersionsFile = constants.EMPTY_STRING
+		}
+
 		if builtinToolsVersionsFile != constants.EMPTY_STRING {
 			err = loadToolsFrom(&tools, builtinToolsVersionsFile)
 			if err != nil {