Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle priority inversion for promoted bundled libraries #123

Merged
merged 2 commits into from
Mar 25, 2016
Merged

Handle priority inversion for promoted bundled libraries #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4debb62
Handle priority inversion for promoted bundled libraries
facchinm Mar 3, 2016
d3b4fb1
Handle promotion based on architecture for all libraries
facchinm Mar 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions src/arduino.cc/builder/includes_to_include_folders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ func resolveLibrary(header string, headerToLibraries map[string][]*types.Library
var library *types.Library

for _, platform := range platforms {
if platform != nil && library == nil {
library = findBestLibraryWithHeader(header, librariesCompatibleWithPlatform(libraries, platform))
if platform != nil {
library = findBestLibraryWithHeader(header, librariesCompatibleWithPlatform(libraries, platform, true))
}
}

Expand All @@ -150,6 +150,12 @@ func resolveLibrary(header string, headerToLibraries map[string][]*types.Library
}

if library == nil {
// reorder libraries to promote fully compatible ones
for _, platform := range platforms {
if platform != nil {
libraries = append(librariesCompatibleWithPlatform(libraries, platform, false), libraries...)
}
}
library = libraries[0]
}

Expand Down Expand Up @@ -218,21 +224,34 @@ func findLibraryIn(libraries []*types.Library, library *types.Library) *types.Li
return nil
}

func libraryCompatibleWithPlatform(library *types.Library, platform *types.Platform) bool {
func libraryCompatibleWithPlatform(library *types.Library, platform *types.Platform) (bool, bool) {
if len(library.Archs) == 0 {
return true
return true, true
}
if utils.SliceContains(library.Archs, constants.LIBRARY_ALL_ARCHS) {
return true, true
}
return utils.SliceContains(library.Archs, platform.PlatformId), false
}

func libraryCompatibleWithAllPlatforms(library *types.Library) bool {
if utils.SliceContains(library.Archs, constants.LIBRARY_ALL_ARCHS) {
return true
}
return utils.SliceContains(library.Archs, platform.PlatformId)
return false
}

func librariesCompatibleWithPlatform(libraries []*types.Library, platform *types.Platform) []*types.Library {
func librariesCompatibleWithPlatform(libraries []*types.Library, platform *types.Platform, reorder bool) []*types.Library {
var compatibleLibraries []*types.Library
for _, library := range libraries {
if libraryCompatibleWithPlatform(library, platform) {
compatibleLibraries = append(compatibleLibraries, library)
compatible, generic := libraryCompatibleWithPlatform(library, platform)
if compatible {
if !generic && len(compatibleLibraries) != 0 && libraryCompatibleWithAllPlatforms(compatibleLibraries[0]) && reorder == true {
//priority inversion
compatibleLibraries = append([]*types.Library{library}, compatibleLibraries...)
} else {
compatibleLibraries = append(compatibleLibraries, library)
}
}
}

Expand Down