Refactored generation of 'software' build property

cmaglie · cmaglie · commit ca7cd4cba174 · 2023-02-27T19:23:07.000+01:00
diff --git a/arduino/cores/packagemanager/package_manager.go b/arduino/cores/packagemanager/package_manager.go
@@ -385,6 +385,9 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
 	// Deprecated properties
 	buildProperties.Set("ide_version", "10607")
 	buildProperties.Set("runtime.ide.version", "10607")
+	if !buildProperties.ContainsKey("software") {
+		buildProperties.Set("software", "ARDUINO")
+	}
 
 	// No errors... phew!
 	return targetPackage, platformRelease, board, buildProperties, buildPlatformRelease, nil
diff --git a/legacy/builder/builder.go b/legacy/builder/builder.go
@@ -31,7 +31,6 @@ var tr = i18n.Tr
 
 const DEFAULT_DEBUG_LEVEL = 5
 const DEFAULT_WARNINGS_LEVEL = "none"
-const DEFAULT_SOFTWARE = "ARDUINO"
 
 type Builder struct{}
 
diff --git a/legacy/builder/setup_build_properties.go b/legacy/builder/setup_build_properties.go
@@ -50,10 +50,6 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	}
 	ctx.OptimizationFlags = buildProperties.Get("compiler.optimization_flags")
 
-	if !buildProperties.ContainsKey("software") {
-		buildProperties.Set("software", DEFAULT_SOFTWARE)
-	}
-
 	buildProperties.SetPath("build.source.path", ctx.Sketch.FullPath)
 
 	buildProperties.Merge(ctx.PackageManager.GetCustomGlobalProperties())

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,6 @@ func (s SetupBuildProperties) Run(ctx types.Context) error {`
`50`	`50`	`}`
`51`	`51`	`ctx.OptimizationFlags = buildProperties.Get("compiler.optimization_flags")`
`52`	`52`
`53`		`- if !buildProperties.ContainsKey("software") {`
`54`		`- buildProperties.Set("software", DEFAULT_SOFTWARE)`
`55`		`- }`
`56`		`-`
`57`	`53`	`buildProperties.SetPath("build.source.path", ctx.Sketch.FullPath)`
`58`	`54`
`59`	`55`	`buildProperties.Merge(ctx.PackageManager.GetCustomGlobalProperties())`