Factored 'build.variant' and related properties calculation

Author: cmaglie

arduino/cores/packagemanager/package_manager.go

@@ -304,9 +304,21 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
 	if split := strings.Split(core, ":"); len(split) > 1 {
 		core, referredCore = split[1], split[0]
 	}
+	variant := buildProperties.Get("build.variant")
+	referredVariant := ""
+	if split := strings.Split(variant, ":"); len(split) > 1 {
+		variant, referredVariant = split[1], split[0]
+	}
+	if referredCore != "" && referredVariant != "" && referredCore != referredVariant {
+		return targetPackage, platformRelease, board, buildProperties, nil,
+			fmt.Errorf(tr("'build.core' and 'build.variant' refer to different platforms: %[1]s and %[2]s"), core+":"+referredCore, variant+":"+referredVariant)
+	}
 
 	var referredPlatformRelease *cores.PlatformRelease
 	referredPackageName := referredCore
+	if referredPackageName == "" {
+		referredPackageName = referredVariant
+	}
 	if referredPackageName != "" {
 		referredPackage := pme.packages[referredPackageName]
 		if referredPackage == nil {
@@ -336,6 +348,16 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
 	for _, tool := range pme.GetAllInstalledToolsReleases() {
 		buildProperties.Merge(tool.RuntimeProperties())
 	}
+
+	buildProperties.Set("build.variant.path", "")
+	if variant != "" {
+		variantPlatformRelease := platformRelease
+		if referredVariant != "" {
+			variantPlatformRelease = referredPlatformRelease
+		}
+		buildProperties.SetPath("build.variant.path", variantPlatformRelease.InstallDir.Join("variants", variant))
+	}
+
 	requiredTools, err := pme.FindToolsRequiredForBuild(platformRelease, buildPlatformRelease)
 	if err != nil {
 		return targetPackage, platformRelease, board, buildProperties, buildPlatformRelease, err

legacy/builder/setup_build_properties.go

@@ -18,9 +18,7 @@ package builder
 import (
 	"os"
 	"path/filepath"
-	"strings"
 
-	"github.com/arduino/arduino-cli/arduino/cores"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	properties "github.com/arduino/go-properties-orderedmap"
 	"github.com/pkg/errors"
@@ -29,8 +27,6 @@ import (
 type SetupBuildProperties struct{}
 
 func (s *SetupBuildProperties) Run(ctx *types.Context) error {
-	packages := ctx.Hardware
-
 	targetPlatform := ctx.TargetPlatform
 	actualPlatform := ctx.ActualPlatform
 
@@ -71,22 +67,6 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	}
 	ctx.OptimizationFlags = buildProperties.Get("compiler.optimization_flags")
 
-	variant := buildProperties.Get("build.variant")
-	if variant == "" {
-		buildProperties.Set("build.variant.path", "")
-	} else {
-		var variantPlatformRelease *cores.PlatformRelease
-		variantParts := strings.Split(variant, ":")
-		if len(variantParts) > 1 {
-			variantPlatform := packages[variantParts[0]].Platforms[targetPlatform.Platform.Architecture]
-			variantPlatformRelease = ctx.PackageManager.GetInstalledPlatformRelease(variantPlatform)
-			variant = variantParts[1]
-		} else {
-			variantPlatformRelease = targetPlatform
-		}
-		buildProperties.SetPath("build.variant.path", variantPlatformRelease.InstallDir.Join("variants", variant))
-	}
-
 	if !buildProperties.ContainsKey("software") {
 		buildProperties.Set("software", DEFAULT_SOFTWARE)
 	}