Added support for "precompiled=full" in library.properties

This flag allow the deployment of a pure precompiled library that ships
also the source code of the precompiled part.
This allows to possibly compile-from-source as a fallback if the library
does not provide a precompiled build for the current architecture.

The "precompiled=true" instead has been ported back to the old behaviour
(for libraries that ships a precompiled binary and support source code
that wraps/uses the precompiled part).

Author: cmaglie

arduino/libraries/libraries.go

@@ -55,20 +55,21 @@ type Library struct {
 
 	Types []string `json:"types,omitempty"`
 
-	InstallDir        *paths.Path
-	SourceDir         *paths.Path
-	UtilityDir        *paths.Path
-	Location          LibraryLocation
-	ContainerPlatform *cores.PlatformRelease `json:""`
-	Layout            LibraryLayout
-	RealName          string
-	DotALinkage       bool
-	Precompiled       bool
-	LDflags           string
-	IsLegacy          bool
-	Version           *semver.Version
-	License           string
-	Properties        *properties.Map
+	InstallDir             *paths.Path
+	SourceDir              *paths.Path
+	UtilityDir             *paths.Path
+	Location               LibraryLocation
+	ContainerPlatform      *cores.PlatformRelease `json:""`
+	Layout                 LibraryLayout
+	RealName               string
+	DotALinkage            bool
+	Precompiled            bool
+	PrecompiledWithSources bool
+	LDflags                string
+	IsLegacy               bool
+	Version                *semver.Version
+	License                string
+	Properties             *properties.Map
 }
 
 func (library *Library) String() string {

arduino/libraries/loader.go

@@ -103,7 +103,8 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library,
 	library.Website = strings.TrimSpace(libProperties.Get("url"))
 	library.IsLegacy = false
 	library.DotALinkage = libProperties.GetBoolean("dot_a_linkage")
-	library.Precompiled = libProperties.GetBoolean("precompiled")
+	library.PrecompiledWithSources = libProperties.Get("precompiled") == "full"
+	library.Precompiled = libProperties.Get("precompiled") == "true" || library.PrecompiledWithSources
 	library.LDflags = strings.TrimSpace(libProperties.Get("ldflags"))
 	library.Properties = libProperties
 

legacy/builder/phases/libraries_builder.go

@@ -135,7 +135,14 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
 	objectFiles := paths.NewPathList()
 
 	if library.Precompiled {
-		if precompiledPath := findExpectedPrecompiledLibFolder(ctx, library); precompiledPath != nil {
+		coreSupportPrecompiled := ctx.BuildProperties.ContainsKey("compiler.libraries.ldflags")
+		precompiledPath := findExpectedPrecompiledLibFolder(ctx, library)
+
+		if !coreSupportPrecompiled {
+			logger := ctx.GetLogger()
+			logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "The plaform does not support 'compiler.libraries.ldflags' for precompiled libraries.")
+
+		} else if precompiledPath != nil {
 			// Find all libraries in precompiledPath
 			libs, err := precompiledPath.ReadDir()
 			if err != nil {
@@ -153,14 +160,8 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
 				}
 			}
 
-			key := "compiler.libraries.ldflags"
-			if !ctx.BuildProperties.ContainsKey(key) {
-				logger := ctx.GetLogger()
-				logger.Fprintln(os.Stdout, constants.LOG_LEVEL_INFO, "The plaform doesn't support 'compiler.libraries.ldflags' for precompiled libraries... trying with 'compiler.ldflags'.")
-				key = "compiler.ldflags"
-			}
-			currLDFlags := ctx.BuildProperties.Get(key)
-			ctx.BuildProperties.Set(key, currLDFlags+" \"-L"+precompiledPath.String()+"\" "+libsCmd+" ")
+			currLDFlags := ctx.BuildProperties.Get("compiler.libraries.ldflags")
+			ctx.BuildProperties.Set("compiler.libraries.ldflags", currLDFlags+" \"-L"+precompiledPath.String()+"\" "+libsCmd+" ")
 
 			// TODO: This codepath is just taken for .a with unusual names that would
 			// be ignored by -L / -l methods.
@@ -172,7 +173,10 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
 					objectFiles.Add(lib)
 				}
 			}
-			return objectFiles, nil
+
+			if library.PrecompiledWithSources {
+				return objectFiles, nil
+			}
 		}
 	}