Removed AddBuildPropertyIfMissinc 'legacy' (inlined in other functions)

Author: cmaglie

legacy/builder/add_build_board_property_if_missing.go

@@ -36,7 +36,6 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context)
 		&RewriteHardwareKeys{},
 		&TargetBoardResolver{},
 		&ToolsLoader{},
-		&AddBuildBoardPropertyIfMissing{},
 		&LibrariesLoader{},
 	}
 

legacy/builder/container_setup.go

@@ -42,6 +42,14 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
 		ctx.Info(tr("Using core '%[1]s' from platform in folder: %[2]s", core, actualPlatform.InstallDir))
 	}
 
+	if buildProperties.Get("build.board") == "" {
+		architecture := targetBoard.PlatformRelease.Platform.Architecture
+		defaultBuildBoard := strings.ToUpper(architecture + "_" + targetBoard.BoardID)
+		buildProperties.Set("build.board", defaultBuildBoard)
+		ctx.Info(tr("Warning: Board %[1]s doesn't define a %[2]s preference. Auto-set to: %[3]s",
+			targetBoard.String(), "'build.board'", defaultBuildBoard))
+	}
+
 	ctx.BuildCore = core
 	ctx.TargetBoard = targetBoard
 	ctx.TargetBoardBuildProperties = buildProperties

legacy/builder/target_board_resolver.go

@@ -44,7 +44,6 @@ func TestAddBuildBoardPropertyIfMissing(t *testing.T) {
 	commands := []types.Command{
 		&builder.HardwareLoader{},
 		&builder.TargetBoardResolver{},
-		&builder.AddBuildBoardPropertyIfMissing{},
 	}
 
 	for _, command := range commands {
@@ -60,8 +59,9 @@ func TestAddBuildBoardPropertyIfMissing(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "mymega", targetBoard.BoardID)
-	require.Equal(t, "atmega2560", targetBoard.Properties.Get("build.mcu"))
-	require.Equal(t, "AVR_MYMEGA2560", targetBoard.Properties.Get("build.board"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "atmega2560", targetBoardBuildProperties.Get("build.mcu"))
+	require.Equal(t, "AVR_MYMEGA2560", targetBoardBuildProperties.Get("build.board"))
 }
 
 func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
@@ -76,7 +76,6 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
 	commands := []types.Command{
 		&builder.HardwareLoader{},
 		&builder.TargetBoardResolver{},
-		&builder.AddBuildBoardPropertyIfMissing{},
 	}
 
 	for _, command := range commands {
@@ -90,6 +89,7 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "mymega", targetBoard.BoardID)
-	require.Equal(t, "atmega1280", targetBoard.Properties.Get("build.mcu"))
-	require.Equal(t, "AVR_MYMEGA", targetBoard.Properties.Get("build.board"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "atmega1280", targetBoardBuildProperties.Get("build.mcu"))
+	require.Equal(t, "AVR_MYMEGA", targetBoardBuildProperties.Get("build.board"))
 }

legacy/builder/test/add_build_board_property_if_missing_test.go

@@ -47,7 +47,8 @@ func TestTargetBoardResolverUno(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "uno", targetBoard.BoardID)
-	require.Equal(t, "atmega328p", targetBoard.Properties.Get("build.mcu"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "atmega328p", targetBoardBuildProperties.Get("build.mcu"))
 }
 
 func TestTargetBoardResolverDue(t *testing.T) {
@@ -72,7 +73,8 @@ func TestTargetBoardResolverDue(t *testing.T) {
 	require.Equal(t, "sam", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "arduino_due_x", targetBoard.BoardID)
-	require.Equal(t, "cortex-m3", targetBoard.Properties.Get("build.mcu"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "cortex-m3", targetBoardBuildProperties.Get("build.mcu"))
 }
 
 func TestTargetBoardResolverMega1280(t *testing.T) {
@@ -97,8 +99,9 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "mega", targetBoard.BoardID)
-	require.Equal(t, "atmega1280", targetBoard.Properties.Get("build.mcu"))
-	require.Equal(t, "AVR_MEGA", targetBoard.Properties.Get("build.board"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "atmega1280", targetBoardBuildProperties.Get("build.mcu"))
+	require.Equal(t, "AVR_MEGA", targetBoardBuildProperties.Get("build.board"))
 }
 
 func TestTargetBoardResolverMega2560(t *testing.T) {
@@ -123,8 +126,9 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "mega", targetBoard.BoardID)
-	require.Equal(t, "atmega2560", targetBoard.Properties.Get("build.mcu"))
-	require.Equal(t, "AVR_MEGA2560", targetBoard.Properties.Get("build.board"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "atmega2560", targetBoardBuildProperties.Get("build.mcu"))
+	require.Equal(t, "AVR_MEGA2560", targetBoardBuildProperties.Get("build.board"))
 }
 
 func TestTargetBoardResolverCustomYun(t *testing.T) {
@@ -149,8 +153,9 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
 	require.Equal(t, "avr", targetPlatform.Platform.Architecture)
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "custom_yun", targetBoard.BoardID)
-	require.Equal(t, "atmega32u4", targetBoard.Properties.Get("build.mcu"))
-	require.Equal(t, "AVR_YUN", targetBoard.Properties.Get("build.board"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "atmega32u4", targetBoardBuildProperties.Get("build.mcu"))
+	require.Equal(t, "AVR_YUN", targetBoardBuildProperties.Get("build.board"))
 }
 
 func TestTargetBoardResolverCustomCore(t *testing.T) {
@@ -176,5 +181,6 @@ func TestTargetBoardResolverCustomCore(t *testing.T) {
 	targetBoard := ctx.TargetBoard
 	require.Equal(t, "attiny841", targetBoard.BoardID)
 	require.Equal(t, "tiny841", ctx.BuildCore)
-	require.Equal(t, "tiny14", targetBoard.Properties.Get("build.variant"))
+	targetBoardBuildProperties := ctx.TargetBoardBuildProperties
+	require.Equal(t, "tiny14", targetBoardBuildProperties.Get("build.variant"))
 }