Removed ctx.ToolsDirs

The ToolsDirs field has been replaced by BuiltInToolsDirs during the big refactoring in the arduino-builder repo. The intention was to remove ToolsDirs once done, but for some reasons I forgot to remove it. This commit completes the transition.
arduino · Sep 20, 2019 · 7727b8d · 7727b8d
1 parent ad69500
commit 7727b8d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 30 deletions.
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -95,7 +95,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	}
 
 	if toolsDir, err := config.BundleToolsDirectories(); err == nil {
-		builderCtx.ToolsDirs = toolsDir
+		builderCtx.BuiltInToolsDirs = toolsDir
 	} else {
 		return nil, fmt.Errorf("cannot get bundled tools directories: %s", err)
 	}

diff --git a/legacy/builder/grpc/rpc.go b/legacy/builder/grpc/rpc.go
@@ -57,7 +57,7 @@ type builderServer struct {
 }
 
 func (s *builderServer) watch() {
-	folders := []paths.PathList{s.ctx.HardwareDirs, s.ctx.ToolsDirs, s.ctx.BuiltInLibrariesDirs, s.ctx.OtherLibrariesDirs}
+	folders := []paths.PathList{s.ctx.HardwareDirs, s.ctx.BuiltInToolsDirs, s.ctx.BuiltInLibrariesDirs, s.ctx.OtherLibrariesDirs}
 
 	for _, category := range folders {
 		for _, folder := range category {
@@ -84,7 +84,7 @@ func (s *builderServer) DropCache(ctx context.Context, args *pb.VerboseParams) (
 func (s *builderServer) Autocomplete(ctx context.Context, args *pb.BuildParams) (*pb.Response, error) {
 
 	s.ctx.HardwareDirs = paths.NewPathList(strings.Split(args.HardwareFolders, ",")...)
-	s.ctx.ToolsDirs = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
+	s.ctx.BuiltInToolsDirs = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
 	s.ctx.BuiltInLibrariesDirs = paths.NewPathList(strings.Split(args.BuiltInLibrariesFolders, ",")...)
 	s.ctx.OtherLibrariesDirs = paths.NewPathList(strings.Split(args.OtherLibrariesFolders, ",")...)
 	s.ctx.SketchLocation = paths.New(args.SketchLocation)
@@ -128,7 +128,7 @@ func (s *builderServer) Autocomplete(ctx context.Context, args *pb.BuildParams)
 func (s *builderServer) Build(args *pb.BuildParams, stream pb.Builder_BuildServer) error {
 
 	s.ctx.HardwareDirs = paths.NewPathList(strings.Split(args.HardwareFolders, ",")...)
-	s.ctx.ToolsDirs = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
+	s.ctx.BuiltInToolsDirs = paths.NewPathList(strings.Split(args.ToolsFolders, ",")...)
 	s.ctx.BuiltInLibrariesDirs = paths.NewPathList(strings.Split(args.BuiltInLibrariesFolders, ",")...)
 	s.ctx.OtherLibrariesDirs = paths.NewPathList(strings.Split(args.OtherLibrariesFolders, ",")...)
 	s.ctx.SketchLocation = paths.New(args.SketchLocation)

diff --git a/legacy/builder/tools_loader.go b/legacy/builder/tools_loader.go
@@ -30,9 +30,6 @@
 package builder
 
 import (
-	"fmt"
-	"strings"
-
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/go-paths-helper"
 )
@@ -45,28 +42,9 @@ func (s *ToolsLoader) Run(ctx *types.Context) error {
 		return nil
 	}
 
-	folders := paths.NewPathList()
 	builtinFolders := paths.NewPathList()
-
-	if ctx.BuiltInToolsDirs != nil || len(ctx.BuiltInLibrariesDirs) == 0 {
-		folders = ctx.ToolsDirs
+	if ctx.BuiltInToolsDirs != nil {
 		builtinFolders = ctx.BuiltInToolsDirs
-	} else {
-		// Auto-detect built-in tools folders (for arduino-builder backward compatibility)
-		// this is a deprecated feature and will be removed in the future
-		builtinHardwareFolder, err := ctx.BuiltInLibrariesDirs[0].Join("..").Abs()
-
-		if err != nil {
-			fmt.Println("Error detecting ")
-		}
-
-		for _, folder := range ctx.ToolsDirs {
-			if !strings.Contains(folder.String(), builtinHardwareFolder.String()) { // TODO: make a function to check for subfolders
-				folders = append(folders, folder)
-			} else {
-				builtinFolders = append(builtinFolders, folder)
-			}
-		}
 	}
 
 	pm := ctx.PackageManager

diff --git a/legacy/builder/types/context.go b/legacy/builder/types/context.go
@@ -24,7 +24,6 @@ type ProgressStruct struct {
 type Context struct {
 	// Build options
 	HardwareDirs         paths.PathList
-	ToolsDirs            paths.PathList
 	BuiltInToolsDirs     paths.PathList
 	BuiltInLibrariesDirs paths.PathList
 	OtherLibrariesDirs   paths.PathList
@@ -122,7 +121,7 @@ type Context struct {
 func (ctx *Context) ExtractBuildOptions() *properties.Map {
 	opts := properties.NewMap()
 	opts.Set("hardwareFolders", strings.Join(ctx.HardwareDirs.AsStrings(), ","))
-	opts.Set("toolsFolders", strings.Join(ctx.ToolsDirs.AsStrings(), ","))
+	opts.Set("builtInToolsFolders", strings.Join(ctx.BuiltInToolsDirs.AsStrings(), ","))
 	opts.Set("builtInLibrariesFolders", strings.Join(ctx.BuiltInLibrariesDirs.AsStrings(), ","))
 	opts.Set("otherLibrariesFolders", strings.Join(ctx.OtherLibrariesDirs.AsStrings(), ","))
 	opts.SetPath("sketchLocation", ctx.SketchLocation)
@@ -146,7 +145,7 @@ func (ctx *Context) ExtractBuildOptions() *properties.Map {
 
 func (ctx *Context) InjectBuildOptions(opts *properties.Map) {
 	ctx.HardwareDirs = paths.NewPathList(strings.Split(opts.Get("hardwareFolders"), ",")...)
-	ctx.ToolsDirs = paths.NewPathList(strings.Split(opts.Get("toolsFolders"), ",")...)
+	ctx.BuiltInToolsDirs = paths.NewPathList(strings.Split(opts.Get("builtInToolsFolders"), ",")...)
 	ctx.BuiltInLibrariesDirs = paths.NewPathList(strings.Split(opts.Get("builtInLibrariesFolders"), ",")...)
 	ctx.OtherLibrariesDirs = paths.NewPathList(strings.Split(opts.Get("otherLibrariesFolders"), ",")...)
 	ctx.SketchLocation = opts.GetPath("sketchLocation")