Skip to content

Commit c4473eb

Browse files
committed
Change hardware and libraries steps
1 parent 047a2c2 commit c4473eb

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

arduino/cores/packagemanager/loader.go

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

2626
"github.com/arduino/arduino-cli/arduino/cores"
2727
"github.com/arduino/arduino-cli/arduino/discovery"
28-
"github.com/arduino/arduino-cli/configuration"
2928
"github.com/arduino/go-paths-helper"
3029
properties "github.com/arduino/go-properties-orderedmap"
3130
semver "go.bug.st/relaxed-semver"
@@ -34,15 +33,13 @@ import (
3433
)
3534

3635
// LoadHardware read all plaforms from the configured paths
37-
func (pm *PackageManager) LoadHardware() []*status.Status {
36+
func (pm *PackageManager) LoadHardware(hardwareDirs, bundleToolsDirs paths.PathList) []*status.Status {
3837
statuses := []*status.Status{}
39-
dirs := configuration.HardwareDirectories(configuration.Settings)
40-
if errs := pm.LoadHardwareFromDirectories(dirs); len(errs) > 0 {
38+
if errs := pm.LoadHardwareFromDirectories(hardwareDirs); len(errs) > 0 {
4139
statuses = append(statuses, errs...)
4240
}
4341

44-
dirs = configuration.BundleToolsDirectories(configuration.Settings)
45-
if errs := pm.LoadToolsFromBundleDirectories(dirs); len(errs) > 0 {
42+
if errs := pm.LoadToolsFromBundleDirectories(bundleToolsDirs); len(errs) > 0 {
4643
statuses = append(statuses, errs...)
4744
}
4845
return statuses

arduino/cores/packagemanager/package_manager_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,11 @@ func TestBoardOptionsFunctions(t *testing.T) {
212212

213213
func TestFindToolsRequiredForBoard(t *testing.T) {
214214
os.Setenv("ARDUINO_DATA_DIR", dataDir1.String())
215-
configuration.Settings = configuration.Init("")
215+
settings := configuration.Init(dataDir1.Join("arduino-cli.yaml").String())
216216
pm := packagemanager.NewPackageManager(
217217
dataDir1,
218-
configuration.PackagesDir(configuration.Settings),
219-
paths.New(configuration.Settings.GetString("directories.Downloads")),
218+
configuration.PackagesDir(settings),
219+
paths.New(settings.GetString("directories.Downloads")),
220220
dataDir1,
221221
)
222222

@@ -231,7 +231,9 @@ func TestFindToolsRequiredForBoard(t *testing.T) {
231231
// We ignore the errors returned since they might not be necessarily blocking
232232
// but just warnings for the user, like in the case a board is not loaded
233233
// because of malformed menus
234-
pm.LoadHardware()
234+
hardwareDirs := configuration.HardwareDirectories(settings)
235+
bundleToolsDirs := configuration.BundleToolsDirectories(settings)
236+
pm.LoadHardware(hardwareDirs, bundleToolsDirs)
235237
esp32, err := pm.FindBoardWithFQBN("esp32:esp32:esp32")
236238
require.NoError(t, err)
237239
esptool231 := pm.FindToolDependency(&cores.ToolDependency{

arduino/libraries/librariesmanager/librariesmanager.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ func (lm *LibrariesManager) AddLibrariesDir(path *paths.Path, location libraries
136136
return
137137
}
138138
}
139-
logrus.WithField("dir", path).WithField("location", location.String()).Info("Adding libraries dir")
140139
lm.LibrariesDir = append(lm.LibrariesDir, &LibrariesDir{
141140
Path: path,
142141
Location: location,

0 commit comments

Comments
 (0)