remove buildPath parameter to PrepareSketchBuildPath func

arduino · Sep 12, 2023 · 1ebabcd · 1ebabcd
1 parent f1c5cc5
commit 1ebabcd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/arduino/builder/sketch.go b/arduino/builder/sketch.go
@@ -48,8 +48,8 @@ func (b *Builder) Sketch() *sketch.Sketch {
 // PrepareSketchBuildPath copies the sketch source files in the build path.
 // The .ino files are merged together to create a .cpp file (by the way, the
 // .cpp file still needs to be Arduino-preprocessed to compile).
-func (b *Builder) PrepareSketchBuildPath(sourceOverrides map[string]string, buildPath *paths.Path) (int, error) {
-	if err := buildPath.MkdirAll(); err != nil {
+func (b *Builder) PrepareSketchBuildPath(sourceOverrides map[string]string) (int, error) {
+	if err := b.buildPath.MkdirAll(); err != nil {
 		return 0, errors.Wrap(err, tr("unable to create a folder to save the sketch"))
 	}
 
@@ -58,12 +58,12 @@ func (b *Builder) PrepareSketchBuildPath(sourceOverrides map[string]string, buil
 		return 0, err
 	}
 
-	destFile := buildPath.Join(b.sketch.MainFile.Base() + ".cpp")
+	destFile := b.buildPath.Join(b.sketch.MainFile.Base() + ".cpp")
 	if err := destFile.WriteFile([]byte(mergedSource)); err != nil {
 		return 0, err
 	}
 
-	if err := b.sketchCopyAdditionalFiles(buildPath, sourceOverrides); err != nil {
+	if err := b.sketchCopyAdditionalFiles(b.buildPath, sourceOverrides); err != nil {
 		return 0, err
 	}
 

diff --git a/legacy/builder/builder.go b/legacy/builder/builder.go
@@ -51,7 +51,7 @@ func (s *Builder) Run(ctx *types.Context) error {
 		}),
 
 		types.BareCommand(func(ctx *types.Context) error {
-			ctx.LineOffset, _err = ctx.Builder.PrepareSketchBuildPath(ctx.SourceOverride, ctx.Builder.GetSketchBuildPath())
+			ctx.LineOffset, _err = ctx.Builder.PrepareSketchBuildPath(ctx.SourceOverride)
 			return _err
 		}),
 
@@ -319,7 +319,7 @@ func (s *Preprocess) Run(ctx *types.Context) error {
 		}),
 
 		types.BareCommand(func(ctx *types.Context) error {
-			ctx.LineOffset, _err = ctx.Builder.PrepareSketchBuildPath(ctx.SourceOverride, ctx.Builder.GetSketchBuildPath())
+			ctx.LineOffset, _err = ctx.Builder.PrepareSketchBuildPath(ctx.SourceOverride)
 			return _err
 		}),