Using LibraryLocations and librarymanager functions to load libraries

Author: cmaglie

libraries_loader.go

@@ -42,41 +42,39 @@ import (
 type LibrariesLoader struct{}
 
 func (s *LibrariesLoader) Run(ctx *types.Context) error {
+	lm := librariesmanager.NewLibraryManager()
+	ctx.LibrariesManager = lm
+
 	builtInLibrariesFolders := ctx.BuiltInLibrariesFolders
 	if err := builtInLibrariesFolders.ToAbs(); err != nil {
 		return i18n.WrapError(err)
 	}
-	sortedLibrariesFolders := builtInLibrariesFolders.Clone()
+	lm.AddLibrariesDir(libraries.IDEBuiltIn, builtInLibrariesFolders...)
 
-	actualPlatform := ctx.ActualPlatform
-	platform := ctx.TargetPlatform
 	debugLevel := ctx.DebugLevel
 	logger := ctx.GetLogger()
 
+	actualPlatform := ctx.ActualPlatform
+	platform := ctx.TargetPlatform
 	if actualPlatform != platform {
 		if dir := actualPlatform.GetLibrariesDir(); dir != nil {
-			sortedLibrariesFolders.Add(dir)
+			lm.AddLibrariesDir(libraries.ReferencedPlatformBuiltIn, dir)
 		}
 	}
-
 	if dir := platform.GetLibrariesDir(); dir != nil {
-		sortedLibrariesFolders.Add(dir)
+		lm.AddLibrariesDir(libraries.PlatformBuiltIn, dir)
 	}
 
 	librariesFolders := ctx.OtherLibrariesFolders
 	if err := librariesFolders.ToAbs(); err != nil {
 		return i18n.WrapError(err)
 	}
-	sortedLibrariesFolders.AddAllMissing(librariesFolders)
+	lm.AddLibrariesDir(libraries.Sketchbook, librariesFolders...)
 
-	ctx.LibrariesFolders = sortedLibrariesFolders
-
-	lm := librariesmanager.NewLibraryManager()
-	for _, libraryFolder := range sortedLibrariesFolders {
-		if err := lm.LoadLibrariesFromDir(libraryFolder); err != nil {
-			return i18n.WrapError(err)
-		}
+	if err := lm.RescanLibraries(); err != nil {
+		return i18n.WrapError(err)
 	}
+
 	if debugLevel > 0 {
 		for _, lib := range lm.Libraries {
 			for _, libAlt := range lib.Alternatives {
@@ -91,8 +89,6 @@ func (s *LibrariesLoader) Run(ctx *types.Context) error {
 		}
 	}
 
-	ctx.LibrariesManager = lm
-
 	headerToLibraries := make(map[string][]*libraries.Library)
 	for _, lib := range lm.Libraries {
 		for _, library := range lib.Alternatives {

phases/libraries_builder.go

@@ -52,28 +52,28 @@ func (s *LibrariesBuilder) Run(ctx *types.Context) error {
 	librariesBuildPath := ctx.LibrariesBuildPath
 	buildProperties := ctx.BuildProperties
 	includes := utils.Map(ctx.IncludeFolders.AsStrings(), utils.WrapWithHyphenI)
-	libraries := ctx.ImportedLibraries
+	libs := ctx.ImportedLibraries
 
 	if err := librariesBuildPath.MkdirAll(); err != nil {
 		return i18n.WrapError(err)
 	}
 
-	objectFiles, err := compileLibraries(ctx, libraries, librariesBuildPath, buildProperties, includes)
+	objectFiles, err := compileLibraries(ctx, libs, librariesBuildPath, buildProperties, includes)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
 	ctx.LibrariesObjectFiles = objectFiles
 
 	// Search for precompiled libraries
-	fixLDFLAGforPrecompiledLibraries(ctx, libraries)
+	fixLDFLAGforPrecompiledLibraries(ctx, libs)
 
 	return nil
 }
 
-func fixLDFLAGforPrecompiledLibraries(ctx *types.Context, libraries []*libraries.Library) error {
+func fixLDFLAGforPrecompiledLibraries(ctx *types.Context, libs []*libraries.Library) error {
 
-	for _, library := range libraries {
+	for _, library := range libs {
 		if library.Precompiled {
 			// add library src path to compiler.c.elf.extra_flags
 			// use library.Name as lib name and srcPath/{mcpu} as location

types/context.go

@@ -25,7 +25,6 @@ type Context struct {
 	HardwareFolders         paths.PathList
 	ToolsFolders            paths.PathList
 	BuiltInToolsFolders     paths.PathList
-	LibrariesFolders        paths.PathList
 	BuiltInLibrariesFolders paths.PathList
 	OtherLibrariesFolders   paths.PathList
 	SketchLocation          *paths.Path