legacy: Removed ToolsLoader step

It has been splitted and merged into HardwareLoader and TargetBoardResolver
that are more appropriate.

Author: cmaglie

legacy/builder/container_setup.go

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

legacy/builder/hardware_loader.go

@@ -39,6 +39,16 @@ func (s *HardwareLoader) Run(ctx *types.Context) error {
 				ctx.Info(tr("Error loading hardware platform: %[1]s", err.Error()))
 			}
 		}
+
+		if !ctx.CanUseCachedTools {
+			if ctx.BuiltInToolsDirs != nil {
+				pm.LoadToolsFromBundleDirectories(ctx.BuiltInToolsDirs)
+			}
+
+			ctx.AllTools = pm.GetAllInstalledToolsReleases()
+			ctx.CanUseCachedTools = true
+		}
+
 		ctx.PackageManager = pm
 	}
 	ctx.Hardware = ctx.PackageManager.Packages

legacy/builder/target_board_resolver.go

@@ -50,11 +50,17 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
 			targetBoard.String(), "'build.board'", defaultBuildBoard))
 	}
 
+	requiredTools, err := ctx.PackageManager.FindToolsRequiredForBoard(targetBoard)
+	if err != nil {
+		return err
+	}
+
 	ctx.BuildCore = core
 	ctx.TargetBoard = targetBoard
 	ctx.TargetBoardBuildProperties = buildProperties
 	ctx.TargetPlatform = targetPlatform
 	ctx.TargetPackage = targetPackage
 	ctx.ActualPlatform = actualPlatform
+	ctx.RequiredTools = requiredTools
 	return nil
 }

legacy/builder/test/setup_build_properties_test.go

@@ -43,7 +43,6 @@ func TestSetupBuildProperties(t *testing.T) {
 		&builder.AddAdditionalEntriesToContext{},
 		&builder.HardwareLoader{},
 		&builder.TargetBoardResolver{},
-		&builder.ToolsLoader{},
 		&builder.SketchLoader{},
 		&builder.SetupBuildProperties{},
 	}
@@ -111,7 +110,6 @@ func TestSetupBuildPropertiesWithSomeCustomOverrides(t *testing.T) {
 		&builder.AddAdditionalEntriesToContext{},
 		&builder.HardwareLoader{},
 		&builder.TargetBoardResolver{},
-		&builder.ToolsLoader{},
 		&builder.SketchLoader{},
 		&builder.SetupBuildProperties{},
 		&builder.SetCustomBuildProperties{},
@@ -150,7 +148,6 @@ func TestSetupBuildPropertiesUserHardware(t *testing.T) {
 		&builder.AddAdditionalEntriesToContext{},
 		&builder.HardwareLoader{},
 		&builder.TargetBoardResolver{},
-		&builder.ToolsLoader{},
 		&builder.SketchLoader{},
 		&builder.SetupBuildProperties{},
 	}

legacy/builder/test/tools_loader_test.go

@@ -68,7 +68,6 @@ func TestLoadTools(t *testing.T) {
 	}
 
 	NoError(t, (&builder.HardwareLoader{}).Run(ctx))
-	NoError(t, (&builder.ToolsLoader{}).Run(ctx))
 
 	tools := ctx.AllTools
 	require.Equal(t, 9, len(tools))
@@ -111,7 +110,6 @@ func TestLoadToolsWithBoardManagerFolderStructure(t *testing.T) {
 	}
 
 	NoError(t, (&builder.HardwareLoader{}).Run(ctx))
-	NoError(t, (&builder.ToolsLoader{}).Run(ctx))
 
 	tools := ctx.AllTools
 	require.Equal(t, 3, len(tools))
@@ -138,7 +136,6 @@ func TestLoadLotsOfTools(t *testing.T) {
 	}
 
 	NoError(t, (&builder.HardwareLoader{}).Run(ctx))
-	NoError(t, (&builder.ToolsLoader{}).Run(ctx))
 
 	tools := ctx.AllTools
 	require.Equal(t, 12, len(tools))