Skip to content

Commit 097d5c4

Browse files
alessio-peruginicmaglie
authored andcommitted
remove no longer used builder getters
1 parent 43c510d commit 097d5c4

File tree

2 files changed

+8
-29
lines changed

2 files changed

+8
-29
lines changed

arduino/builder/builder.go

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -232,26 +232,11 @@ func (b *Builder) GetBuildPath() *paths.Path {
232232
return b.buildPath
233233
}
234234

235-
// GetSketchBuildPath returns the sketch build path
236-
func (b *Builder) GetSketchBuildPath() *paths.Path {
237-
return b.sketchBuildPath
238-
}
239-
240-
// GetLibrariesBuildPath returns the libraries build path
241-
func (b *Builder) GetLibrariesBuildPath() *paths.Path {
242-
return b.librariesBuildPath
243-
}
244-
245235
// ExecutableSectionsSize fixdoc
246236
func (b *Builder) ExecutableSectionsSize() ExecutablesFileSections {
247237
return b.executableSectionsSize
248238
}
249239

250-
// TargetPlatform fixdoc
251-
func (b *Builder) TargetPlatform() *cores.PlatformRelease {
252-
return b.targetPlatform
253-
}
254-
255240
// Preprocess fixdoc
256241
func (b *Builder) Preprocess() error {
257242
b.Progress.AddSubSteps(6)
@@ -284,14 +269,14 @@ func (b *Builder) preprocess() error {
284269

285270
b.logIfVerbose(false, tr("Detecting libraries used..."))
286271
err := b.SketchLibrariesDetector.FindIncludes(
287-
b.GetBuildPath(),
288-
b.GetBuildProperties().GetPath("build.core.path"),
289-
b.GetBuildProperties().GetPath("build.variant.path"),
290-
b.GetSketchBuildPath(),
291-
b.Sketch(),
292-
b.GetLibrariesBuildPath(),
293-
b.GetBuildProperties(),
294-
b.TargetPlatform().Platform.Architecture,
272+
b.buildPath,
273+
b.buildProperties.GetPath("build.core.path"),
274+
b.buildProperties.GetPath("build.variant.path"),
275+
b.sketchBuildPath,
276+
b.sketch,
277+
b.librariesBuildPath,
278+
b.buildProperties,
279+
b.targetPlatform.Platform.Architecture,
295280
)
296281
if err != nil {
297282
return err

arduino/builder/sketch.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
"github.com/arduino/arduino-cli/arduino/builder/cpp"
2727
"github.com/arduino/arduino-cli/arduino/builder/utils"
28-
"github.com/arduino/arduino-cli/arduino/sketch"
2928
"github.com/arduino/arduino-cli/i18n"
3029
f "github.com/arduino/arduino-cli/internal/algorithms"
3130
"github.com/arduino/go-paths-helper"
@@ -39,11 +38,6 @@ var (
3938
tr = i18n.Tr
4039
)
4140

42-
// Sketch fixdoc
43-
func (b *Builder) Sketch() *sketch.Sketch {
44-
return b.sketch
45-
}
46-
4741
// PrepareSketchBuildPath copies the sketch source files in the build path.
4842
// The .ino files are merged together to create a .cpp file (by the way, the
4943
// .cpp file still needs to be Arduino-preprocessed to compile).

0 commit comments

Comments
 (0)