Fixed libraries-set selection for discovery

Fix arduino#1740

Author: cmaglie

arduino/libraries/librariesresolver/cpp.go

@@ -20,6 +20,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/arduino/libraries"
 	"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
 	"github.com/arduino/arduino-cli/arduino/utils"
@@ -53,6 +54,49 @@ func (resolver *Cpp) ScanFromLibrariesManager(lm *librariesmanager.LibrariesMana
 	return nil
 }
 
+// ScanIDEBuiltinLibraries reads ide-builtin librariers loaded in the LibrariesManager to find
+// and cache all C++ headers for later retrieval.
+func (resolver *Cpp) ScanIDEBuiltinLibraries(lm *librariesmanager.LibrariesManager) error {
+	for _, libAlternatives := range lm.Libraries {
+		for _, lib := range libAlternatives.Alternatives {
+			if lib.Location == libraries.IDEBuiltIn {
+				resolver.ScanLibrary(lib)
+			}
+		}
+	}
+	return nil
+}
+
+// ScanUserAndUnmanagedLibraries reads user/unmanaged librariers loaded in the LibrariesManager to find
+// and cache all C++ headers for later retrieval.
+func (resolver *Cpp) ScanUserAndUnmanagedLibraries(lm *librariesmanager.LibrariesManager) error {
+	for _, libAlternatives := range lm.Libraries {
+		for _, lib := range libAlternatives.Alternatives {
+			if lib.Location == libraries.User || lib.Location == libraries.Unmanaged {
+				resolver.ScanLibrary(lib)
+			}
+		}
+	}
+	return nil
+}
+
+// ScanPlatformLibraries reads platform-bundled libraries for a specific platform loaded in the LibrariesManager
+// to find and cache all C++ headers for later retrieval.
+func (resolver *Cpp) ScanPlatformLibraries(lm *librariesmanager.LibrariesManager, platform *cores.PlatformRelease) error {
+	for _, libAlternatives := range lm.Libraries {
+		for _, lib := range libAlternatives.Alternatives {
+			if lib.Location != libraries.PlatformBuiltIn && lib.Location != libraries.ReferencedPlatformBuiltIn {
+				continue
+			}
+			if lib.ContainerPlatform != platform {
+				continue
+			}
+			resolver.ScanLibrary(lib)
+		}
+	}
+	return nil
+}
+
 // ScanLibrary reads a library to find and cache C++ headers for later retrieval
 func (resolver *Cpp) ScanLibrary(lib *libraries.Library) error {
 	cppHeaders, err := lib.SourceHeaders()

legacy/builder/libraries_loader.go

@@ -72,9 +72,20 @@ func (s *LibrariesLoader) Run(ctx *types.Context) error {
 	}
 
 	resolver := librariesresolver.NewCppResolver()
-	if err := resolver.ScanFromLibrariesManager(ctx.LibrariesManager); err != nil {
+	if err := resolver.ScanIDEBuiltinLibraries(ctx.LibrariesManager); err != nil {
 		return errors.WithStack(err)
 	}
+	if err := resolver.ScanUserAndUnmanagedLibraries(ctx.LibrariesManager); err != nil {
+		return errors.WithStack(err)
+	}
+	if err := resolver.ScanPlatformLibraries(ctx.LibrariesManager, ctx.TargetPlatform); err != nil {
+		return errors.WithStack(err)
+	}
+	if ctx.ActualPlatform != ctx.TargetPlatform {
+		if err := resolver.ScanPlatformLibraries(ctx.LibrariesManager, ctx.ActualPlatform); err != nil {
+			return errors.WithStack(err)
+		}
+	}
 	ctx.LibrariesResolver = resolver
 
 	return nil