Skip to content

Commit 52f67b9

Browse files
committed
Refactored generation of 'software' build property
1 parent 9d8d43c commit 52f67b9

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

Diff for: arduino/cores/packagemanager/package_manager.go

+3
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,9 @@ func (pme *Explorer) ResolveFQBN(fqbn *cores.FQBN) (
385385
// Deprecated properties
386386
buildProperties.Set("ide_version", "10607")
387387
buildProperties.Set("runtime.ide.version", "10607")
388+
if !buildProperties.ContainsKey("software") {
389+
buildProperties.Set("software", "ARDUINO")
390+
}
388391

389392
// No errors... phew!
390393
return targetPackage, platformRelease, board, buildProperties, buildPlatformRelease, nil

Diff for: legacy/builder/builder.go

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ var tr = i18n.Tr
3131

3232
const DEFAULT_DEBUG_LEVEL = 5
3333
const DEFAULT_WARNINGS_LEVEL = "none"
34-
const DEFAULT_SOFTWARE = "ARDUINO"
3534

3635
type Builder struct{}
3736

Diff for: legacy/builder/setup_build_properties.go

-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
5050
}
5151
ctx.OptimizationFlags = buildProperties.Get("compiler.optimization_flags")
5252

53-
if !buildProperties.ContainsKey("software") {
54-
buildProperties.Set("software", DEFAULT_SOFTWARE)
55-
}
56-
5753
buildProperties.SetPath("build.source.path", ctx.Sketch.FullPath)
5854

5955
buildProperties.Merge(ctx.PackageManager.GetCustomGlobalProperties())

0 commit comments

Comments
 (0)