From 340217ecf9b2139bf26ffd7620f22c5307a210f7 Mon Sep 17 00:00:00 2001
From: Alessio Perugini <alessioper.98@gmail.com>
Date: Tue, 12 Sep 2023 13:39:25 +0200
Subject: [PATCH] Add BuilderLogger in arduino/builder

---
 arduino/builder/builder.go          | 5 +++++
 arduino/builder/sketch_test.go      | 6 +++---
 commands/compile/compile.go         | 1 +
 legacy/builder/test/builder_test.go | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/arduino/builder/builder.go b/arduino/builder/builder.go
index 6f045169825..5e7954cd527 100644
--- a/arduino/builder/builder.go
+++ b/arduino/builder/builder.go
@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/arduino/arduino-cli/arduino/builder/logger"
 	"github.com/arduino/arduino-cli/arduino/sketch"
 	"github.com/arduino/go-paths-helper"
 	"github.com/arduino/go-properties-orderedmap"
@@ -45,6 +46,8 @@ type Builder struct {
 
 	// core related
 	coreBuildCachePath *paths.Path
+
+	logger *logger.BuilderLogger
 }
 
 // NewBuilder creates a sketch Builder.
@@ -56,6 +59,7 @@ func NewBuilder(
 	coreBuildCachePath *paths.Path,
 	jobs int,
 	requestBuildProperties []string,
+	logger *logger.BuilderLogger,
 ) (*Builder, error) {
 	buildProperties := properties.NewMap()
 	if boardBuildProperties != nil {
@@ -113,6 +117,7 @@ func NewBuilder(
 		jobs:                  jobs,
 		customBuildProperties: append(requestBuildProperties, "build.warn_data_percentage=75"),
 		coreBuildCachePath:    coreBuildCachePath,
+		logger:                logger,
 	}, nil
 }
 
diff --git a/arduino/builder/sketch_test.go b/arduino/builder/sketch_test.go
index 16c5fd9a599..aa32e30fb40 100644
--- a/arduino/builder/sketch_test.go
+++ b/arduino/builder/sketch_test.go
@@ -48,7 +48,7 @@ func TestMergeSketchSources(t *testing.T) {
 	}
 	mergedSources := strings.ReplaceAll(string(mergedBytes), "%s", pathToGoldenSource)
 
-	b, err := NewBuilder(sk, nil, paths.New("testdata"), false, nil, 0, nil)
+	b, err := NewBuilder(sk, nil, paths.New("testdata"), false, nil, 0, nil, nil)
 	require.NoError(t, err)
 
 	offset, source, err := b.sketchMergeSources(nil)
@@ -63,7 +63,7 @@ func TestMergeSketchSourcesArduinoIncluded(t *testing.T) {
 	require.NotNil(t, sk)
 
 	// ensure not to include Arduino.h when it's already there
-	b, err := NewBuilder(sk, nil, paths.New("testdata"), false, nil, 0, nil)
+	b, err := NewBuilder(sk, nil, paths.New("testdata"), false, nil, 0, nil, nil)
 	require.NoError(t, err)
 
 	_, source, err := b.sketchMergeSources(nil)
@@ -80,7 +80,7 @@ func TestCopyAdditionalFiles(t *testing.T) {
 	sk1, err := sketch.New(paths.New("testdata", t.Name()))
 	require.Nil(t, err)
 	require.Equal(t, sk1.AdditionalFiles.Len(), 1)
-	b1, err := NewBuilder(sk1, nil, paths.New("testdata"), false, nil, 0, nil)
+	b1, err := NewBuilder(sk1, nil, paths.New("testdata"), false, nil, 0, nil, nil)
 	require.NoError(t, err)
 
 	// copy the sketch over, create a fake main file we don't care about it
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
index 484a0efbfa3..71738d9dda7 100644
--- a/commands/compile/compile.go
+++ b/commands/compile/compile.go
@@ -208,6 +208,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		coreBuildCachePath,
 		int(req.GetJobs()),
 		req.GetBuildProperties(),
+		builderLogger,
 	)
 	if err != nil {
 		if strings.Contains(err.Error(), "invalid build properties") {
diff --git a/legacy/builder/test/builder_test.go b/legacy/builder/test/builder_test.go
index db356e2042f..6b581cb4c2d 100644
--- a/legacy/builder/test/builder_test.go
+++ b/legacy/builder/test/builder_test.go
@@ -103,7 +103,7 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 
 	builderLogger := logger.New(nil, nil, false, "")
 	ctx.BuilderLogger = builderLogger
-	ctx.Builder, err = bldr.NewBuilder(sk, nil, buildPath, false, nil, 0, nil)
+	ctx.Builder, err = bldr.NewBuilder(sk, nil, buildPath, false, nil, 0, nil, builderLogger)
 	require.NoError(t, err)
 	if fqbn != "" {
 		ctx.FQBN = parseFQBN(t, fqbn)
@@ -112,7 +112,7 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 		requiredTools, err := pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform)
 		require.NoError(t, err)
 
-		ctx.Builder, err = bldr.NewBuilder(sk, boardBuildProperties, buildPath, false /*OptimizeForDebug*/, nil, 0, nil)
+		ctx.Builder, err = bldr.NewBuilder(sk, boardBuildProperties, buildPath, false /*OptimizeForDebug*/, nil, 0, nil, builderLogger)
 		require.NoError(t, err)
 
 		ctx.PackageManager = pme