Refactored custom global properties handling

cmaglie · cmaglie · commit 87f06d76c3d7 · 2023-02-22T15:22:04.000+01:00
diff --git a/arduino/cores/packagemanager/package_manager.go b/arduino/cores/packagemanager/package_manager.go
@@ -397,6 +397,8 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
 		buildProperties.Set("software", "ARDUINO")
 	}
 
+	buildProperties.Merge(pme.GetCustomGlobalProperties())
+
 	return targetPackage, platformRelease, board, buildProperties, buildPlatformRelease, nil
 }
 
diff --git a/legacy/builder/setup_build_properties.go b/legacy/builder/setup_build_properties.go
@@ -47,8 +47,6 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 
 	buildProperties.SetPath("build.source.path", ctx.Sketch.FullPath)
 
-	buildProperties.Merge(ctx.PackageManager.GetCustomGlobalProperties())
-
 	keychainProp := buildProperties.ContainsKey("build.keys.keychain")
 	signProp := buildProperties.ContainsKey("build.keys.sign_key")
 	encryptProp := buildProperties.ContainsKey("build.keys.encrypt_key")

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,8 @@ func (pme Explorer) ResolveFQBN(fqbn cores.FQBN) (`
`397`	`397`	`buildProperties.Set("software", "ARDUINO")`
`398`	`398`	`}`
`399`	`399`
	`400`	`+ buildProperties.Merge(pme.GetCustomGlobalProperties())`
	`401`	`+`
`400`	`402`	`return targetPackage, platformRelease, board, buildProperties, buildPlatformRelease, nil`
`401`	`403`	`}`
`402`	`404`