Merge remote-tracking branch 'upstream/master'

Author: robertinant

arduino-builder/main.go

@@ -54,7 +54,7 @@ import (
 	"github.com/go-errors/errors"
 )
 
-const VERSION = "1.4.0"
+const VERSION = "1.4.1"
 
 const FLAG_ACTION_COMPILE = "compile"
 const FLAG_ACTION_PREPROCESS = "preprocess"

builder_utils/utils.go

@@ -558,5 +558,10 @@ func GetCachedCoreArchiveFileName(fqbn, coreFolder string) string {
 		coreFolder = absCoreFolder
 	} // silently continue if absolute path can't be detected
 	hash := utils.MD5Sum([]byte(coreFolder))
-	return "core_" + fqbnToUnderscore + "_" + hash + ".a"
+	realName := "core_" + fqbnToUnderscore + "_" + hash + ".a"
+	if len(realName) > 100 {
+		// avoid really long names, simply hash the final part
+		realName = "core_" + utils.MD5Sum([]byte(fqbnToUnderscore+"_"+hash)) + ".a"
+	}
+	return realName
 }

constants/constants.go

@@ -155,11 +155,14 @@ const LOG_LEVEL_INFO = "info"
 const LOG_LEVEL_WARN = "warn"
 const MSG_ARCH_FOLDER_NOT_SUPPORTED = "'arch' folder is no longer supported! See http://goo.gl/gfFJzU for more information"
 const MSG_ARCHIVING_CORE_CACHE = "Archiving built core (caching) in: {0}"
+const MSG_ERROR_ARCHIVING_CORE_CACHE = "Error archiving built core (caching) in {0}: {1}"
+const MSG_CORE_CACHE_UNAVAILABLE = "Unable to cache built core, please tell {0} maintainers to follow http://goo.gl/QdCUjo"
 const MSG_BOARD_UNKNOWN = "Board {0} (platform {1}, package {2}) is unknown"
 const MSG_BOOTLOADER_FILE_MISSING = "Bootloader file specified but missing: {0}"
 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_FIND_INCLUDES_FAILED = "Error while detecting libraries included by {0}"
 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)"

container_find_includes.go

@@ -343,10 +343,8 @@ func findIncludesUntilDone(ctx *types.Context, cache *includeCache, sourceFile t
 				return i18n.WrapError(preproc_err)
 			} else {
 				include = IncludesFinderWithRegExp(ctx, string(preproc_stderr))
-				if include == "" {
-					// No include found? Bail out.
-					os.Stderr.Write(preproc_stderr)
-					return i18n.WrapError(preproc_err)
+				if include == "" && ctx.Verbose {
+					ctx.GetLogger().Println(constants.LOG_LEVEL_DEBUG, constants.MSG_FIND_INCLUDES_FAILED, sourcePath)
 				}
 			}
 		}

phases/core_builder.go

@@ -30,6 +30,7 @@
 package phases
 
 import (
+	"os"
 	"path/filepath"
 
 	"github.com/arduino/arduino-builder/builder_utils"
@@ -124,10 +125,16 @@ func compileCore(ctx *types.Context, buildPath string, buildCachePath string, bu
 
 	// archive core.a
 	if targetArchivedCore != "" {
+		err := builder_utils.CopyFile(archiveFile, targetArchivedCore)
 		if ctx.Verbose {
-			logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_ARCHIVING_CORE_CACHE, targetArchivedCore)
+			if err == nil {
+				logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_ARCHIVING_CORE_CACHE, targetArchivedCore)
+			} else if os.IsNotExist(err) {
+				logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_CORE_CACHE_UNAVAILABLE, ctx.ActualPlatform.PlatformId)
+			} else {
+				logger.Println(constants.LOG_LEVEL_INFO, constants.MSG_ERROR_ARCHIVING_CORE_CACHE, targetArchivedCore, err)
+			}
 		}
-		builder_utils.CopyFile(archiveFile, targetArchivedCore)
 	}
 
 	return archiveFile, variantObjectFiles, nil

test/helper_tools_downloader.go

@@ -112,6 +112,7 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-i686-mingw32.zip"},
 				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-x86_64-apple-darwin.zip"},
 				OsUrl{Os: "arm-linux-gnueabihf", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-armv6-linux-gnueabihf.tar.bz2"},
+				OsUrl{Os: "aarch64-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-arduino11-aarch64-linux-gnu.tar.bz2"},
 			},
 		},
 		Tool{Name: "arduino-preprocessor", Version: "0.1.5",
@@ -121,6 +122,7 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 				OsUrl{Os: "i686-mingw32", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-i686-w64-mingw32.tar.bz2"},
 				OsUrl{Os: "x86_64-apple-darwin", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-x86_64-apple-darwin11.tar.bz2"},
 				OsUrl{Os: "arm-linux-gnueabihf", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-arm-linux-gnueabihf.tar.bz2"},
+				OsUrl{Os: "aarch64-linux-gnu", Url: "https://github.com/arduino/arduino-preprocessor/releases/download/0.1.5/arduino-preprocessor-0.1.5-aarch64-linux-gnu.tar.bz2"},
 			},
 		},
 	}