move ArchiveCompiledFiles in the builder

Author: alessio-perugini

Diff for: arduino/builder/archive_compiled_files.go

@@ -0,0 +1,65 @@
+package builder
+
+import (
+	"github.com/arduino/arduino-cli/arduino/builder/internal/utils"
+	"github.com/arduino/go-paths-helper"
+	"github.com/pkg/errors"
+)
+
+// ArchiveCompiledFiles fixdoc
+func (b *Builder) archiveCompiledFiles(buildPath *paths.Path, archiveFile *paths.Path, objectFilesToArchive paths.PathList) (*paths.Path, error) {
+	archiveFilePath := buildPath.JoinPath(archiveFile)
+
+	if b.onlyUpdateCompilationDatabase {
+		if b.logger.Verbose() {
+			b.logger.Info(tr("Skipping archive creation of: %[1]s", archiveFilePath))
+		}
+		return archiveFilePath, nil
+	}
+
+	if archiveFileStat, err := archiveFilePath.Stat(); err == nil {
+		rebuildArchive := false
+		for _, objectFile := range objectFilesToArchive {
+			objectFileStat, err := objectFile.Stat()
+			if err != nil || objectFileStat.ModTime().After(archiveFileStat.ModTime()) {
+				// need to rebuild the archive
+				rebuildArchive = true
+				break
+			}
+		}
+
+		// something changed, rebuild the core archive
+		if rebuildArchive {
+			if err := archiveFilePath.Remove(); err != nil {
+				return nil, errors.WithStack(err)
+			}
+		} else {
+			if b.logger.Verbose() {
+				b.logger.Info(tr("Using previously compiled file: %[1]s", archiveFilePath))
+			}
+			return archiveFilePath, nil
+		}
+	}
+
+	for _, objectFile := range objectFilesToArchive {
+		properties := b.buildProperties.Clone()
+		properties.Set("archive_file", archiveFilePath.Base())
+		properties.SetPath("archive_file_path", archiveFilePath)
+		properties.SetPath("object_file", objectFile)
+
+		command, err := utils.PrepareCommandForRecipe(properties, "recipe.ar.pattern", false)
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+
+		verboseInfo, _, _, err := utils.ExecCommand(b.logger.Verbose(), b.logger.Stdout(), b.logger.Stderr(), command, utils.ShowIfVerbose /* stdout */, utils.Show /* stderr */)
+		if b.logger.Verbose() {
+			b.logger.Info(string(verboseInfo))
+		}
+		if err != nil {
+			return nil, errors.WithStack(err)
+		}
+	}
+
+	return archiveFilePath, nil
+}

Diff for: arduino/builder/core.go

@@ -134,13 +134,7 @@ func (b *Builder) compileCore() (*paths.Path, paths.PathList, error) {
 		return nil, nil, errors.WithStack(err)
 	}
 
-	archiveFile, verboseInfo, err := utils.ArchiveCompiledFiles(
-		b.coreBuildPath, paths.New("core.a"), coreObjectFiles, b.buildProperties,
-		b.onlyUpdateCompilationDatabase, b.logger.Verbose(), b.logger.Stdout(), b.logger.Stderr(),
-	)
-	if b.logger.Verbose() {
-		b.logger.Info(string(verboseInfo))
-	}
+	archiveFile, err := b.archiveCompiledFiles(b.coreBuildPath, paths.New("core.a"), coreObjectFiles)
 	if err != nil {
 		return nil, nil, errors.WithStack(err)
 	}

Diff for: arduino/builder/internal/utils/utils.go

@@ -566,66 +566,3 @@ func compileFileWithRecipe(
 
 	return objectFile, verboseInfo.Bytes(), verboseStdout.Bytes(), errOut.Bytes(), nil
 }
-
-// ArchiveCompiledFiles fixdoc
-func ArchiveCompiledFiles(
-	buildPath *paths.Path, archiveFile *paths.Path, objectFilesToArchive paths.PathList, buildProperties *properties.Map,
-	onlyUpdateCompilationDatabase, verbose bool,
-	stdoutWriter, stderrWriter io.Writer,
-) (*paths.Path, []byte, error) {
-	verboseInfobuf := &bytes.Buffer{}
-	archiveFilePath := buildPath.JoinPath(archiveFile)
-
-	if onlyUpdateCompilationDatabase {
-		if verbose {
-			verboseInfobuf.WriteString(tr("Skipping archive creation of: %[1]s", archiveFilePath))
-		}
-		return archiveFilePath, verboseInfobuf.Bytes(), nil
-	}
-
-	if archiveFileStat, err := archiveFilePath.Stat(); err == nil {
-		rebuildArchive := false
-		for _, objectFile := range objectFilesToArchive {
-			objectFileStat, err := objectFile.Stat()
-			if err != nil || objectFileStat.ModTime().After(archiveFileStat.ModTime()) {
-				// need to rebuild the archive
-				rebuildArchive = true
-				break
-			}
-		}
-
-		// something changed, rebuild the core archive
-		if rebuildArchive {
-			if err := archiveFilePath.Remove(); err != nil {
-				return nil, nil, errors.WithStack(err)
-			}
-		} else {
-			if verbose {
-				verboseInfobuf.WriteString(tr("Using previously compiled file: %[1]s", archiveFilePath))
-			}
-			return archiveFilePath, verboseInfobuf.Bytes(), nil
-		}
-	}
-
-	for _, objectFile := range objectFilesToArchive {
-		properties := buildProperties.Clone()
-		properties.Set("archive_file", archiveFilePath.Base())
-		properties.SetPath("archive_file_path", archiveFilePath)
-		properties.SetPath("object_file", objectFile)
-
-		command, err := PrepareCommandForRecipe(properties, "recipe.ar.pattern", false)
-		if err != nil {
-			return nil, verboseInfobuf.Bytes(), errors.WithStack(err)
-		}
-
-		verboseInfo, _, _, err := ExecCommand(verbose, stdoutWriter, stderrWriter, command, ShowIfVerbose /* stdout */, Show /* stderr */)
-		if verbose {
-			verboseInfobuf.WriteString(string(verboseInfo))
-		}
-		if err != nil {
-			return nil, verboseInfobuf.Bytes(), errors.WithStack(err)
-		}
-	}
-
-	return archiveFilePath, verboseInfobuf.Bytes(), nil
-}

Diff for: arduino/builder/libraries.go

@@ -202,14 +202,7 @@ func (b *Builder) compileLibrary(library *libraries.Library, includes []string)
 			return nil, errors.WithStack(err)
 		}
 		if library.DotALinkage {
-			archiveFile, verboseInfo, err := utils.ArchiveCompiledFiles(
-				libraryBuildPath, paths.New(library.DirName+".a"), libObjectFiles, b.buildProperties,
-				b.onlyUpdateCompilationDatabase, b.logger.Verbose(),
-				b.logger.Stdout(), b.logger.Stderr(),
-			)
-			if b.logger.Verbose() {
-				b.logger.Info(string(verboseInfo))
-			}
+			archiveFile, err := b.archiveCompiledFiles(libraryBuildPath, paths.New(library.DirName+".a"), libObjectFiles)
 			if err != nil {
 				return nil, errors.WithStack(err)
 			}