Removed builderCtx.BuildCachePath

Because it creates a lot of confusion

Author: cmaglie

commands/compile/compile.go

@@ -144,8 +144,6 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	// Optimize for debug
 	builderCtx.OptimizeForDebug = req.GetOptimizeForDebug()
 
-	builderCtx.CoreBuildCachePath = paths.TempDir().Join("arduino", "core-cache")
-
 	builderCtx.Jobs = int(req.GetJobs())
 
 	builderCtx.USBVidPid = req.GetVidPid()
@@ -155,11 +153,16 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	builderCtx.CustomBuildProperties = append(req.GetBuildProperties(), securityKeysOverride...)
 
 	if req.GetBuildCachePath() != "" {
-		builderCtx.BuildCachePath = paths.New(req.GetBuildCachePath())
-		err = builderCtx.BuildCachePath.MkdirAll()
+		buildCachePath, err := paths.New(req.GetBuildCachePath()).Abs()
 		if err != nil {
 			return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build cache directory"), Cause: err}
 		}
+		if err := buildCachePath.MkdirAll(); err != nil {
+			return nil, &arduino.PermissionDeniedError{Message: tr("Cannot create build cache directory"), Cause: err}
+		}
+		builderCtx.CoreBuildCachePath = buildCachePath.Join("core")
+	} else {
+		builderCtx.CoreBuildCachePath = paths.TempDir().Join("arduino", "core-cache")
 	}
 
 	builderCtx.BuiltInLibrariesDirs = configuration.IDEBuiltinLibrariesDir(configuration.Settings)

legacy/builder/add_additional_entries_to_context.go

@@ -50,15 +50,6 @@ func (*AddAdditionalEntriesToContext) Run(ctx *types.Context) error {
 		ctx.CoreBuildPath = coreBuildPath
 	}
 
-	if ctx.BuildCachePath != nil {
-		coreBuildCachePath, err := ctx.BuildCachePath.Join(constants.FOLDER_CORE).Abs()
-		if err != nil {
-			return errors.WithStack(err)
-		}
-
-		ctx.CoreBuildCachePath = coreBuildCachePath
-	}
-
 	if ctx.WarningsLevel == "" {
 		ctx.WarningsLevel = DEFAULT_WARNINGS_LEVEL
 	}

legacy/builder/test/builder_test.go

@@ -371,7 +371,7 @@ func TestBuilderCacheCoreAFile(t *testing.T) {
 	SetupBuildPath(t, ctx)
 	defer ctx.BuildPath.RemoveAll()
 	SetupBuildCachePath(t, ctx)
-	defer ctx.BuildCachePath.RemoveAll()
+	defer ctx.CoreBuildCachePath.RemoveAll()
 
 	// Run build
 	bldr := builder.Builder{}

legacy/builder/test/helper.go

@@ -71,7 +71,7 @@ func SetupBuildPath(t *testing.T, ctx *types.Context) *paths.Path {
 func SetupBuildCachePath(t *testing.T, ctx *types.Context) *paths.Path {
 	buildCachePath, err := paths.MkTempDir(constants.EMPTY_STRING, "test_build_cache")
 	NoError(t, err)
-	ctx.BuildCachePath = buildCachePath
+	ctx.CoreBuildCachePath = buildCachePath
 	return buildCachePath
 }
 

legacy/builder/types/context.go

@@ -99,7 +99,6 @@ type Context struct {
 	BuildProperties              *properties.Map
 	BuildCore                    string
 	BuildPath                    *paths.Path
-	BuildCachePath               *paths.Path
 	SketchBuildPath              *paths.Path
 	CoreBuildPath                *paths.Path
 	CoreBuildCachePath           *paths.Path