Skip to content

Commit 1b24145

Browse files
committed
Moved 'build.board' property generation out of legacy package
1 parent 755e2ba commit 1b24145

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

arduino/cores/packagemanager/package_manager.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,13 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
359359
}
360360
buildProperties.Set("runtime.os", properties.GetOSSuffix())
361361
buildProperties.Set("build.library_discovery_phase", "0")
362+
363+
if buildProperties.Get("build.board") == "" {
364+
architecture := board.PlatformRelease.Platform.Architecture
365+
defaultBuildBoard := strings.ToUpper(architecture + "_" + board.BoardID)
366+
buildProperties.Set("build.board", defaultBuildBoard)
367+
}
368+
362369
// Deprecated properties
363370
buildProperties.Set("tools.avrdude.path", "{runtime.tools.avrdude.path}")
364371
buildProperties.Set("ide_version", "10607")

legacy/builder/target_board_resolver.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,9 @@ func (s *TargetBoardResolver) Run(ctx *types.Context) error {
5050
ctx.Info("")
5151
}
5252

53-
if buildProperties.Get("build.board") == "" {
54-
architecture := targetBoard.PlatformRelease.Platform.Architecture
55-
defaultBuildBoard := strings.ToUpper(architecture + "_" + targetBoard.BoardID)
56-
buildProperties.Set("build.board", defaultBuildBoard)
53+
if !targetBoard.Properties.ContainsKey("build.board") {
5754
ctx.Info(tr("Warning: Board %[1]s doesn't define a %[2]s preference. Auto-set to: %[3]s",
58-
targetBoard.String(), "'build.board'", defaultBuildBoard))
55+
targetBoard.String(), "'build.board'", buildProperties.Get("build.board")))
5956
}
6057

6158
requiredTools, err := ctx.PackageManager.FindToolsRequiredForBuild(targetPlatform, buildPlatform)

0 commit comments

Comments
 (0)