Skip to content

Commit 161e747

Browse files
alessio-peruginicmaglie
authored andcommitted
remove LibrariesManager from context
1 parent 4346e16 commit 161e747

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

commands/compile/compile.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/arduino/arduino-cli/arduino"
2626
bldr "github.com/arduino/arduino-cli/arduino/builder"
2727
"github.com/arduino/arduino-cli/arduino/cores"
28+
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
2829
"github.com/arduino/arduino-cli/arduino/sketch"
2930
"github.com/arduino/arduino-cli/arduino/utils"
3031
"github.com/arduino/arduino-cli/buildcache"
@@ -248,27 +249,26 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
248249
}
249250
}
250251

251-
// TODO replace all UseCache call with our SketchLibrariesDetector
252-
useCachedLibrariesResolution := req.GetSkipLibrariesDiscovery()
252+
var libsManager *librariesmanager.LibrariesManager
253253
if pme.GetProfile() != nil {
254-
builderCtx.LibrariesManager = lm
254+
libsManager = lm
255255
}
256-
lm, libsResolver, verboseOut, err := bldr.LibrariesLoader(
257-
useCachedLibrariesResolution, builderCtx.LibrariesManager,
256+
useCachedLibrariesResolution := req.GetSkipLibrariesDiscovery()
257+
libsManager, libsResolver, verboseOut, err := bldr.LibrariesLoader(
258+
useCachedLibrariesResolution, libsManager,
258259
builderCtx.BuiltInLibrariesDirs, builderCtx.LibraryDirs, builderCtx.OtherLibrariesDirs,
259260
builderCtx.ActualPlatform, builderCtx.TargetPlatform,
260261
)
261262
if err != nil {
262263
return r, &arduino.CompileFailedError{Message: err.Error()}
263264
}
264265

265-
builderCtx.LibrariesManager = lm
266266
if builderCtx.Verbose {
267267
builderCtx.Warn(string(verboseOut))
268268
}
269269

270270
builderCtx.SketchLibrariesDetector = bldr.NewSketchLibrariesDetector(
271-
lm, libsResolver,
271+
libsManager, libsResolver,
272272
builderCtx.Verbose,
273273
useCachedLibrariesResolution,
274274
func(msg string) { builderCtx.Info(msg) },

legacy/builder/test/builder_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,12 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
126126

127127
if !stepToSkip[skipLibraries] {
128128
lm, libsResolver, _, err := bldr.LibrariesLoader(
129-
false, ctx.LibrariesManager,
129+
false, nil,
130130
ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
131131
ctx.ActualPlatform, ctx.TargetPlatform,
132132
)
133133
NoError(t, err)
134134

135-
ctx.LibrariesManager = lm
136135
ctx.SketchLibrariesDetector = bldr.NewSketchLibrariesDetector(
137136
lm, libsResolver,
138137
ctx.Verbose,

legacy/builder/test/libraries_loader_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func TestLoadLibrariesAVR(t *testing.T) {
4848
defer cleanUpBuilderTestContext(t, ctx)
4949

5050
lm, libsResolver, _, err := builder.LibrariesLoader(
51-
false, ctx.LibrariesManager,
51+
false, nil,
5252
ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
5353
ctx.ActualPlatform, ctx.TargetPlatform,
5454
)
@@ -152,7 +152,7 @@ func TestLoadLibrariesSAM(t *testing.T) {
152152
defer cleanUpBuilderTestContext(t, ctx)
153153

154154
lm, libsResolver, _, err := builder.LibrariesLoader(
155-
false, ctx.LibrariesManager,
155+
false, nil,
156156
ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
157157
ctx.ActualPlatform, ctx.TargetPlatform,
158158
)
@@ -229,7 +229,7 @@ func TestLoadLibrariesAVRNoDuplicateLibrariesFolders(t *testing.T) {
229229
defer cleanUpBuilderTestContext(t, ctx)
230230

231231
lm, _, _, err := builder.LibrariesLoader(
232-
false, ctx.LibrariesManager,
232+
false, nil,
233233
ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
234234
ctx.ActualPlatform, ctx.TargetPlatform,
235235
)
@@ -252,7 +252,7 @@ func TestLoadLibrariesMyAVRPlatform(t *testing.T) {
252252
defer cleanUpBuilderTestContext(t, ctx)
253253

254254
lm, _, _, err := builder.LibrariesLoader(
255-
false, ctx.LibrariesManager,
255+
false, nil,
256256
ctx.BuiltInLibrariesDirs, ctx.LibraryDirs, ctx.OtherLibrariesDirs,
257257
ctx.ActualPlatform, ctx.TargetPlatform,
258258
)

legacy/builder/types/context.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/arduino/arduino-cli/arduino/builder"
2626
"github.com/arduino/arduino-cli/arduino/cores"
2727
"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
28-
"github.com/arduino/arduino-cli/arduino/libraries/librariesmanager"
2928
"github.com/arduino/arduino-cli/arduino/sketch"
3029
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
3130
paths "github.com/arduino/go-paths-helper"
@@ -102,7 +101,6 @@ type Context struct {
102101
WarningsLevel string
103102

104103
// Libraries handling
105-
LibrariesManager *librariesmanager.LibrariesManager
106104
IncludeFolders paths.PathList
107105

108106
// C++ Parsing

0 commit comments

Comments
 (0)