Replace runtime variables with board-specific ones

Only works if a valid package_index json has been provided

Author: facchinm

add_missing_build_properties_from_parent_platform_txt_files.go

@@ -30,6 +30,7 @@
 package builder
 
 import (
+	"github.com/arduino/arduino-builder/json_package_index"
 	"github.com/arduino/arduino-builder/types"
 )
 
@@ -48,3 +49,27 @@ func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(ctx *types.Con
 
 	return nil
 }
+
+type OverridePropertiesWithJsonInfo struct{}
+
+func (s *OverridePropertiesWithJsonInfo) Run(ctx *types.Context) error {
+
+	if ctx.JsonFolders != nil {
+
+		jsonProperties, err := json_package_index.PackageIndexFoldersToPropertiesMap(ctx.JsonFolders)
+
+		if err != nil {
+			// doesn't matter, log the broken package in verbose mode
+		}
+
+		newBuildProperties := jsonProperties[ctx.TargetPackage.PackageId+":"+ctx.TargetPlatform.PlatformId+":"+ctx.TargetPlatform.Properties["version"]]
+
+		buildProperties := ctx.BuildProperties.Clone()
+
+		buildProperties.Merge(newBuildProperties)
+
+		ctx.BuildProperties = buildProperties
+	}
+
+	return nil
+}

container_setup.go

@@ -52,6 +52,7 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context)
 		&LoadVIDPIDSpecificProperties{},
 		&SetCustomBuildProperties{},
 		&AddMissingBuildPropertiesFromParentPlatformTxtFiles{},
+		&OverridePropertiesWithJsonInfo{},
 	}
 
 	for _, command := range commands {