Add support for additional_include_paths library property

Fixes arduino#501
facchinm · Mar 11, 2020 · 2ffbe85 · 2ffbe85
1 parent 2791756
commit 2ffbe85
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/arduino/libraries/libraries.go b/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
+	LDflags                string
+	IsLegacy               bool
+	Version                *semver.Version
+	License                string
+	AdditionalIncludePaths []*paths.Path
+	Properties             *properties.Map
 }
 
 func (library *Library) String() string {

diff --git a/arduino/libraries/loader.go b/arduino/libraries/loader.go
@@ -105,6 +105,14 @@ func makeNewLibrary(libraryDir *paths.Path, location LibraryLocation) (*Library,
 	library.DotALinkage = libProperties.GetBoolean("dot_a_linkage")
 	library.Precompiled = libProperties.GetBoolean("precompiled")
 	library.LDflags = strings.TrimSpace(libProperties.Get("ldflags"))
+	additionalIncludePathsList := libProperties.Get("additional_include_paths")
+	if additionalIncludePathsList != "" {
+		temp := strings.Split(additionalIncludePathsList, ",")
+		for _, el := range temp {
+			dir := paths.New(libraryDir.Join(el).String())
+			library.AdditionalIncludePaths = append(library.AdditionalIncludePaths, dir)
+		}
+	}
 	library.Properties = libProperties
 
 	return library, nil

diff --git a/legacy/builder/phases/libraries_builder.go b/legacy/builder/phases/libraries_builder.go
@@ -192,6 +192,11 @@ func compileLibrary(ctx *types.Context, library *libraries.Library, buildPath *p
 	}
 
 	if library.Layout == libraries.RecursiveLayout {
+		if library.AdditionalIncludePaths != nil {
+			for _, el := range library.AdditionalIncludePaths {
+				includes = append(includes, utils.WrapWithHyphenI(el.String()))
+			}
+		}
 		libObjectFiles, err := builder_utils.CompileFilesRecursive(ctx, library.SourceDir, libraryBuildPath, buildProperties, includes)
 		if err != nil {
 			return nil, i18n.WrapError(err)

diff --git a/rpc/commands/lib.proto b/rpc/commands/lib.proto
@@ -160,6 +160,7 @@ message Library {
     string version = 21;
     string license = 22;
     map<string, string> properties = 23;
+    string additional_include_paths = 24;
 }
 
 enum LibraryLayout {