Removed SetCustomBuildProperties from legacy

Author: cmaglie

Diff for: commands/compile/compile.go

@@ -35,6 +35,7 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
 	paths "github.com/arduino/go-paths-helper"
+	"github.com/arduino/go-properties-orderedmap"
 	"github.com/sirupsen/logrus"
 )
 
@@ -151,6 +152,14 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	// Add build properites related to sketch data
 	buildProperties = bldr.SetupBuildProperties(buildProperties, buildPath, sk, req.GetOptimizeForDebug())
 
+	// Add user provided custom build properties
+	customBuildPropertiesArgs := append(req.GetBuildProperties(), "build.warn_data_percentage=75")
+	if customBuildProperties, err := properties.LoadFromSlice(req.GetBuildProperties()); err != nil {
+		return nil, &arduino.InvalidArgumentError{Message: tr("Invalid build properties"), Cause: err}
+	} else {
+		buildProperties.Merge(customBuildProperties)
+	}
+
 	requiredTools, err := pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform)
 	if err != nil {
 		return nil, err
@@ -167,6 +176,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	builderCtx.ActualPlatform = buildPlatform
 	builderCtx.RequiredTools = requiredTools
 	builderCtx.BuildProperties = buildProperties
+	builderCtx.CustomBuildProperties = customBuildPropertiesArgs
 	builderCtx.UseCachedLibrariesResolution = req.GetSkipLibrariesDiscovery()
 	builderCtx.FQBN = fqbn
 	builderCtx.Sketch = sk
@@ -188,8 +198,6 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	builderCtx.Jobs = int(req.GetJobs())
 	builderCtx.WarningsLevel = req.GetWarnings()
 
-	builderCtx.CustomBuildProperties = append(req.GetBuildProperties(), "build.warn_data_percentage=75")
-
 	if req.GetBuildCachePath() == "" {
 		builderCtx.CoreBuildCachePath = paths.TempDir().Join("arduino", "cores")
 	} else {

Diff for: legacy/builder/container_setup.go

@@ -30,7 +30,6 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context)
 		&AddAdditionalEntriesToContext{},
 		&FailIfBuildPathEqualsSketchPath{},
 		&LibrariesLoader{},
-		&SetCustomBuildProperties{},
 	}
 	for _, command := range commands {
 		PrintRingNameIfDebug(ctx, command)

Diff for: legacy/builder/set_custom_build_properties.go

@@ -22,6 +22,7 @@ import (
 	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	paths "github.com/arduino/go-paths-helper"
+	"github.com/arduino/go-properties-orderedmap"
 	"github.com/stretchr/testify/require"
 )
 
@@ -87,21 +88,12 @@ func TestSetupBuildPropertiesWithSomeCustomOverrides(t *testing.T) {
 	}
 	ctx = prepareBuilderTestContext(t, ctx, paths.New("sketch1", "sketch1.ino"), "arduino:avr:uno")
 	defer cleanUpBuilderTestContext(t, ctx)
-
-	commands := []types.Command{
-		&builder.AddAdditionalEntriesToContext{},
-		&builder.SetCustomBuildProperties{},
-	}
-
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
+	customProps, err := properties.LoadFromSlice(ctx.CustomBuildProperties)
+	NoError(t, err)
+	ctx.BuildProperties.Merge(customProps)
 
 	buildProperties := ctx.BuildProperties
-
 	require.Equal(t, "ARDUINO", buildProperties.Get("software"))
-
 	require.Equal(t, "uno", buildProperties.Get("_id"))
 	require.Equal(t, "fake name", buildProperties.Get("name"))
 	require.Equal(t, "\"{compiler.path}{compiler.c.cmd}\" {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} \"{source_file}\" -o \"{object_file}\"", buildProperties.Get("recipe.c.o.pattern"))

Diff for: legacy/builder/test/setup_build_properties_test.go

@@ -132,7 +132,7 @@ type Context struct {
 	// Send progress events to this callback
 	ProgressCB rpc.TaskProgressCB
 
-	// Contents of a custom build properties file (line by line)
+	// Custom build properties defined by user (line by line as "key=value" pairs)
 	CustomBuildProperties []string
 
 	// Reuse old tools since the backing storage didn't change