Always add to the build the libraries requested in the active sketch profile.

This will improve sketch compile time.

Author: cmaglie

commands/service_compile.go

@@ -105,10 +105,11 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
 		return &cmderrors.CantOpenSketchError{Cause: err}
 	}
 
+	profile := pme.GetProfile()
 	fqbnIn := req.GetFqbn()
 	if fqbnIn == "" && sk != nil {
-		if pme.GetProfile() != nil {
-			fqbnIn = pme.GetProfile().FQBN
+		if profile != nil {
+			fqbnIn = profile.FQBN
 		} else {
 			fqbnIn = sk.GetDefaultFQBN()
 		}
@@ -224,7 +225,7 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
 	otherLibrariesDirs.Add(s.settings.LibrariesDir())
 
 	var libsManager *librariesmanager.LibrariesManager
-	if pme.GetProfile() != nil {
+	if profile != nil {
 		libsManager = lm
 	}
 
@@ -252,6 +253,7 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
 	if req.GetVerbose() {
 		verbosity = logger.VerbosityVerbose
 	}
+	alwaysBuildProfileLibs := profile != nil
 	sketchBuilder, err := builder.NewBuilder(
 		ctx,
 		sk,
@@ -275,6 +277,7 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
 		paths.NewPathList(req.GetLibrary()...),
 		outStream, errStream, verbosity, req.GetWarnings(),
 		progressCB,
+		alwaysBuildProfileLibs,
 		pme.GetEnvVarsForSpawnedProcess(),
 	)
 	if err != nil {

internal/arduino/builder/builder.go

@@ -138,6 +138,7 @@ func NewBuilder(
 	libraryDirs paths.PathList,
 	stdout, stderr io.Writer, verbosity logger.Verbosity, warningsLevel string,
 	progresCB rpc.TaskProgressCB,
+	alwaysBuildProfileLibs bool,
 	toolEnv []string,
 ) (*Builder, error) {
 	buildProperties := properties.NewMap()
@@ -242,6 +243,7 @@ func NewBuilder(
 			libsManager, libsResolver,
 			useCachedLibrariesResolution,
 			onlyUpdateCompilationDatabase,
+			alwaysBuildProfileLibs,
 			log,
 			diagnosticStore,
 		),

internal/arduino/builder/internal/detector/detector.go

@@ -53,6 +53,7 @@ type SketchLibrariesDetector struct {
 	librariesResolver             *librariesresolver.Cpp
 	useCachedLibrariesResolution  bool
 	onlyUpdateCompilationDatabase bool
+	alwaysBuildProfileLibs        bool
 	importedLibraries             libraries.List
 	librariesResolutionResults    map[string]libraryResolutionResult
 	includeFolders                paths.PathList
@@ -66,6 +67,7 @@ func NewSketchLibrariesDetector(
 	libsResolver *librariesresolver.Cpp,
 	useCachedLibrariesResolution bool,
 	onlyUpdateCompilationDatabase bool,
+	alwaysBuildProfileLibs bool,
 	logger *logger.BuilderLogger,
 	diagnosticStore *diagnostics.Store,
 ) *SketchLibrariesDetector {
@@ -77,6 +79,7 @@ func NewSketchLibrariesDetector(
 		importedLibraries:             libraries.List{},
 		includeFolders:                paths.PathList{},
 		onlyUpdateCompilationDatabase: onlyUpdateCompilationDatabase,
+		alwaysBuildProfileLibs:        alwaysBuildProfileLibs,
 		logger:                        logger,
 		diagnosticStore:               diagnosticStore,
 	}
@@ -284,6 +287,16 @@ func (l *SketchLibrariesDetector) findIncludes(
 			l.queueSourceFilesFromFolder(sourceFileQueue, srcSubfolderPath, true /* recurse */, sketchBuildPath, sketchBuildPath)
 		}
 
+		if l.alwaysBuildProfileLibs {
+			for _, library := range l.librariesManager.FindAllInstalled() {
+				if library.Location == libraries.User {
+					l.logger.Info(i18n.Tr("The library %[1]s has been automatically added from sketch project.", library.Name))
+					l.addAndBuildLibrary(sourceFileQueue, librariesBuildPath, library)
+					l.appendIncludeFolder(cache, mergedfile.SourcePath(), "", library.SourceDir)
+				}
+			}
+		}
+
 		for !sourceFileQueue.empty() {
 			err := l.findIncludesUntilDone(ctx, cache, sourceFileQueue, buildProperties, librariesBuildPath, platformArch)
 			if err != nil {