Commit 2ffbe85

committed

Add support for additional_include_paths library property

Fixes #501

1 parent 2791756 commit 2ffbe85Copy full SHA for 2ffbe85

File tree

+29

-14

lines changed

+29

-14

lines changed

Lines changed: 15 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,20 +55,21 @@ type Library struct {`
`55`	`55`
`56`	`56`	Types []string `json:"types,omitempty"`
`57`	`57`
`58`		`- InstallDir *paths.Path`
`59`		`- SourceDir *paths.Path`
`60`		`- UtilityDir *paths.Path`
`61`		`- Location LibraryLocation`
`62`		- ContainerPlatform *cores.PlatformRelease `json:""`
`63`		`- Layout LibraryLayout`
`64`		`- RealName string`
`65`		`- DotALinkage bool`
`66`		`- Precompiled bool`
`67`		`- LDflags string`
`68`		`- IsLegacy bool`
`69`		`- Version *semver.Version`
`70`		`- License string`
`71`		`- Properties *properties.Map`
	`58`	`+ InstallDir *paths.Path`
	`59`	`+ SourceDir *paths.Path`
	`60`	`+ UtilityDir *paths.Path`
	`61`	`+ Location LibraryLocation`
	`62`	+ ContainerPlatform *cores.PlatformRelease `json:""`
	`63`	`+ Layout LibraryLayout`
	`64`	`+ RealName string`
	`65`	`+ DotALinkage bool`
	`66`	`+ Precompiled bool`
	`67`	`+ LDflags string`
	`68`	`+ IsLegacy bool`
	`69`	`+ Version *semver.Version`
	`70`	`+ License string`
	`71`	`+ AdditionalIncludePaths []*paths.Path`
	`72`	`+ Properties *properties.Map`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`func (library *Library) String() string {`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,14 @@ func makeNewLibrary(libraryDir paths.Path, location LibraryLocation) (Library,`
`105`	`105`	`library.DotALinkage = libProperties.GetBoolean("dot_a_linkage")`
`106`	`106`	`library.Precompiled = libProperties.GetBoolean("precompiled")`
`107`	`107`	`library.LDflags = strings.TrimSpace(libProperties.Get("ldflags"))`
	`108`	`+ additionalIncludePathsList := libProperties.Get("additional_include_paths")`
	`109`	`+ if additionalIncludePathsList != "" {`
	`110`	`+ temp := strings.Split(additionalIncludePathsList, ",")`
	`111`	`+ for _, el := range temp {`
	`112`	`+ dir := paths.New(libraryDir.Join(el).String())`
	`113`	`+ library.AdditionalIncludePaths = append(library.AdditionalIncludePaths, dir)`
	`114`	`+ }`
	`115`	`+ }`
`108`	`116`	`library.Properties = libProperties`
`109`	`117`
`110`	`118`	`return library, nil`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,11 @@ func compileLibrary(ctx types.Context, library libraries.Library, buildPath *p`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`if library.Layout == libraries.RecursiveLayout {`
	`195`	`+ if library.AdditionalIncludePaths != nil {`
	`196`	`+ for _, el := range library.AdditionalIncludePaths {`
	`197`	`+ includes = append(includes, utils.WrapWithHyphenI(el.String()))`
	`198`	`+ }`
	`199`	`+ }`
`195`	`200`	`libObjectFiles, err := builder_utils.CompileFilesRecursive(ctx, library.SourceDir, libraryBuildPath, buildProperties, includes)`
`196`	`201`	`if err != nil {`
`197`	`202`	`return nil, i18n.WrapError(err)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ message Library {`
`160`	`160`	`string version = 21;`
`161`	`161`	`string license = 22;`
`162`	`162`	`map<string, string> properties = 23;`
	`163`	`+ string additional_include_paths = 24;`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`enum LibraryLayout {`

Comments

(0)