Skip to content

Avoid panics when compiling for custom boards #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions arduino/cores/cores.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,13 @@ func (platform *Platform) latestReleaseVersion() *semver.Version {
// GetAllInstalled returns all installed PlatformRelease
func (platform *Platform) GetAllInstalled() []*PlatformRelease {
res := []*PlatformRelease{}
for _, release := range platform.Releases {
if release.IsInstalled() {
res = append(res, release)
if platform.Releases != nil {
for _, release := range platform.Releases {
if release.IsInstalled() {
res = append(res, release)
}
}

}
return res
}
Expand Down Expand Up @@ -225,17 +228,23 @@ func (release *PlatformRelease) RequiresToolRelease(toolRelease *ToolRelease) bo
// RuntimeProperties returns the runtime properties for this PlatformRelease
func (release *PlatformRelease) RuntimeProperties() *properties.Map {
res := properties.NewMap()
res.Set("runtime.platform.path", release.InstallDir.String())
if release.InstallDir != nil {
res.Set("runtime.platform.path", release.InstallDir.String())
}

return res
}

// GetLibrariesDir returns the path to the core libraries or nil if not
// present
func (release *PlatformRelease) GetLibrariesDir() *paths.Path {
libDir := release.InstallDir.Join("libraries")
if libDir.IsDir() {
return libDir
if release.InstallDir != nil {
libDir := release.InstallDir.Join("libraries")
if libDir.IsDir() {
return libDir
}
}

return nil
}

Expand Down
4 changes: 4 additions & 0 deletions arduino/cores/packagemanager/package_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ func (pm *PackageManager) ResolveFQBN(fqbn *cores.FQBN) (
fmt.Errorf("missing platform %s:%s referenced by board %s", referredPackage, fqbn.PlatformArch, fqbn)
}
buildPlatformRelease = pm.GetInstalledPlatformRelease(buildPlatform)
if buildPlatformRelease == nil {
return targetPackage, platformRelease, board, buildProperties, nil,
fmt.Errorf("missing platform release %s:%s referenced by board %s", referredPackage, fqbn.PlatformArch, fqbn)
}
}

// No errors... phew!
Expand Down
3 changes: 3 additions & 0 deletions arduino/libraries/librariesmanager/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ func (lm *LibrariesManager) Install(indexLibrary *librariesindex.Release, libPat

// Uninstall removes a Library
func (lm *LibrariesManager) Uninstall(lib *libraries.Library) error {
if lib == nil || lib.InstallDir == nil {
return fmt.Errorf("install directory not set")
}
if err := lib.InstallDir.RemoveAll(); err != nil {
return fmt.Errorf("removing lib directory: %s", err)
}
Expand Down