Skip to content

Commit 310f2e2

Browse files
cmagliecmaglie
committed
BuildProperties are now part of Context
Signed-off-by: Cristian Maglie <[email protected]>
1 parent 57203ac commit 310f2e2

23 files changed

+27
-51
lines changed

Diff for: ‎src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ package builder
3131

3232
import (
3333
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/props"
3534
"arduino.cc/builder/types"
3635
)
3736

@@ -40,13 +39,13 @@ type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}
4039
func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(context map[string]interface{}, ctx *types.Context) error {
4140
packages := context[constants.CTX_HARDWARE].(*types.Packages)
4241
targetPackage := ctx.TargetPackage
43-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
42+
buildProperties := ctx.BuildProperties
4443

4544
newBuildProperties := packages.Properties.Clone()
4645
newBuildProperties.Merge(targetPackage.Properties)
4746
newBuildProperties.Merge(buildProperties)
4847

49-
context[constants.CTX_BUILD_PROPERTIES] = newBuildProperties
48+
ctx.BuildProperties = newBuildProperties
5049

5150
return nil
5251
}

Diff for: ‎src/arduino.cc/builder/coan_runner.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ package builder
3232
import (
3333
"arduino.cc/builder/constants"
3434
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
3736
"arduino.cc/builder/utils"
3837
"fmt"
@@ -61,7 +60,7 @@ func (s *CoanRunner) Run(context map[string]interface{}, ctx *types.Context) err
6160
return i18n.WrapError(err)
6261
}
6362

64-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
63+
buildProperties := ctx.BuildProperties
6564
properties := buildProperties.Clone()
6665
properties.Merge(buildProperties.SubTree(constants.BUILD_PROPERTIES_TOOLS_KEY).SubTree(constants.COAN))
6766
properties[constants.BUILD_PROPERTIES_SOURCE_FILE] = coanTargetFileName

Diff for: ‎src/arduino.cc/builder/constants/constants.go

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ const COAN = "coan"
7676
const CTAGS = "ctags"
7777
const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
7878
const CTX_BUILD_CORE = "buildCore"
79-
const CTX_BUILD_PROPERTIES = "buildProperties"
8079
const CTX_FILE_PATH_TO_READ = "filePathToRead"
8180
const CTX_GCC_MINUS_E_SOURCE = "gccMinusESource"
8281
const CTX_GCC_MINUS_M_OUTPUT = "gccMinusMOutput"

Diff for: ‎src/arduino.cc/builder/ctags/ctags_runner.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ package ctags
3232
import (
3333
"arduino.cc/builder/constants"
3434
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
3736
"arduino.cc/builder/utils"
3837
"fmt"
@@ -41,7 +40,7 @@ import (
4140
type CTagsRunner struct{}
4241

4342
func (s *CTagsRunner) Run(context map[string]interface{}, ctx *types.Context) error {
44-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
43+
buildProperties := ctx.BuildProperties
4544
ctagsTargetFilePath := ctx.CTagsTargetFile
4645
logger := ctx.GetLogger()
4746

Diff for: ‎src/arduino.cc/builder/dump_build_properties.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/props"
3533
"arduino.cc/builder/types"
3634
"arduino.cc/builder/utils"
3735
"fmt"
@@ -41,7 +39,7 @@ import (
4139
type DumpBuildProperties struct{}
4240

4341
func (s *DumpBuildProperties) Run(context map[string]interface{}, ctx *types.Context) error {
44-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
42+
buildProperties := ctx.BuildProperties
4543

4644
keys := utils.KeysOfMapOfString(buildProperties)
4745
sort.Strings(keys)

Diff for: ‎src/arduino.cc/builder/gcc_preproc_runner.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,7 @@ func prepareGCCPreprocRecipeProperties(context map[string]interface{}, ctx *type
108108
targetFilePath = filepath.Join(preprocPath, targetFilePath)
109109
}
110110

111-
properties := make(props.PropertiesMap)
112-
if p, ok := context[constants.CTX_BUILD_PROPERTIES]; ok {
113-
properties = p.(props.PropertiesMap).Clone()
114-
}
115-
111+
properties := ctx.BuildProperties
116112
properties[constants.BUILD_PROPERTIES_SOURCE_FILE] = sourceFilePath
117113
properties[constants.BUILD_PROPERTIES_PREPROCESSED_FILE_PATH] = targetFilePath
118114

Diff for: ‎src/arduino.cc/builder/includes_finder_with_gcc.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"arduino.cc/builder/builder_utils"
3434
"arduino.cc/builder/constants"
3535
"arduino.cc/builder/i18n"
36-
"arduino.cc/builder/props"
3736
"arduino.cc/builder/types"
3837
"arduino.cc/builder/utils"
3938
"strings"
@@ -44,10 +43,7 @@ type IncludesFinderWithGCC struct {
4443
}
4544

4645
func (s *IncludesFinderWithGCC) Run(context map[string]interface{}, ctx *types.Context) error {
47-
buildProperties := make(props.PropertiesMap)
48-
if p, ok := context[constants.CTX_BUILD_PROPERTIES]; ok {
49-
buildProperties = p.(props.PropertiesMap).Clone()
50-
}
46+
buildProperties := ctx.BuildProperties
5147
verbose := ctx.Verbose
5248
logger := ctx.GetLogger()
5349

Diff for: ‎src/arduino.cc/builder/includes_to_include_folders.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (s *IncludesToIncludeFolders) Run(context map[string]interface{}, ctx *type
6969

7070
ctx.ImportedLibraries = importedLibraries
7171

72-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
72+
buildProperties := ctx.BuildProperties
7373
verbose := ctx.Verbose
7474
includeFolders := resolveIncludeFolders(newlyImportedLibraries, buildProperties, verbose)
7575
context[constants.CTX_INCLUDE_FOLDERS] = includeFolders

Diff for: ‎src/arduino.cc/builder/load_vid_pid_specific_properties.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (s *LoadVIDPIDSpecificProperties) Run(context map[string]interface{}, ctx *
5252
vid := vidPidParts[0]
5353
pid := vidPidParts[1]
5454

55-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
55+
buildProperties := ctx.BuildProperties
5656
VIDPIDIndex, err := findVIDPIDIndex(buildProperties, vid, pid)
5757
if err != nil {
5858
return i18n.WrapError(err)

Diff for: ‎src/arduino.cc/builder/merge_sketch_with_bootloader.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ package builder
3232
import (
3333
"arduino.cc/builder/constants"
3434
"arduino.cc/builder/i18n"
35-
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
3736
"arduino.cc/builder/utils"
3837
"os"
@@ -43,7 +42,7 @@ import (
4342
type MergeSketchWithBootloader struct{}
4443

4544
func (s *MergeSketchWithBootloader) Run(context map[string]interface{}, ctx *types.Context) error {
46-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
45+
buildProperties := ctx.BuildProperties
4746
if !utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_NOBLINK) && !utils.MapStringStringHas(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_FILE) {
4847
return nil
4948
}

Diff for: ‎src/arduino.cc/builder/phases/core_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type CoreBuilder struct{}
4242

4343
func (s *CoreBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
4444
coreBuildPath := ctx.CoreBuildPath
45-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
45+
buildProperties := ctx.BuildProperties
4646
verbose := ctx.Verbose
4747
warningsLevel := ctx.WarningsLevel
4848
logger := ctx.GetLogger()

Diff for: ‎src/arduino.cc/builder/phases/libraries_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type LibrariesBuilder struct{}
4444

4545
func (s *LibrariesBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
4646
librariesBuildPath := ctx.LibrariesBuildPath
47-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
47+
buildProperties := ctx.BuildProperties
4848
includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
4949
includes = utils.Map(includes, utils.WrapWithHyphenI)
5050
libraries := ctx.ImportedLibraries

Diff for: ‎src/arduino.cc/builder/phases/linker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (s *Linker) Run(context map[string]interface{}, ctx *types.Context) error {
5959
return i18n.WrapError(err)
6060
}
6161

62-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
62+
buildProperties := ctx.BuildProperties
6363
verbose := ctx.Verbose
6464
warningsLevel := ctx.WarningsLevel
6565
logger := ctx.GetLogger()

Diff for: ‎src/arduino.cc/builder/phases/sketch_builder.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"arduino.cc/builder/builder_utils"
3434
"arduino.cc/builder/constants"
3535
"arduino.cc/builder/i18n"
36-
"arduino.cc/builder/props"
3736
"arduino.cc/builder/types"
3837
"arduino.cc/builder/utils"
3938
)
@@ -42,7 +41,7 @@ type SketchBuilder struct{}
4241

4342
func (s *SketchBuilder) Run(context map[string]interface{}, ctx *types.Context) error {
4443
sketchBuildPath := ctx.SketchBuildPath
45-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
44+
buildProperties := ctx.BuildProperties
4645
includes := context[constants.CTX_INCLUDE_FOLDERS].([]string)
4746
includes = utils.Map(includes, utils.WrapWithHyphenI)
4847
verbose := ctx.Verbose

Diff for: ‎src/arduino.cc/builder/recipe_runner.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"arduino.cc/builder/builder_utils"
3434
"arduino.cc/builder/constants"
3535
"arduino.cc/builder/i18n"
36-
"arduino.cc/builder/props"
3736
"arduino.cc/builder/types"
3837
"os"
3938
"sort"
@@ -51,10 +50,7 @@ func (s *RecipeByPrefixSuffixRunner) Run(context map[string]interface{}, ctx *ty
5150
logger.Fprintln(os.Stdout, constants.LOG_LEVEL_DEBUG, constants.MSG_LOOKING_FOR_RECIPES, s.Prefix, s.Suffix)
5251
}
5352

54-
buildProperties := make(props.PropertiesMap)
55-
if p, ok := context[constants.CTX_BUILD_PROPERTIES]; ok {
56-
buildProperties = p.(props.PropertiesMap).Clone()
57-
}
53+
buildProperties := ctx.BuildProperties
5854
verbose := ctx.Verbose
5955

6056
recipes := findRecipes(buildProperties, s.Prefix, s.Suffix)

Diff for: ‎src/arduino.cc/builder/set_custom_build_properties.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
package builder
3131

3232
import (
33-
"arduino.cc/builder/constants"
3433
"arduino.cc/builder/i18n"
3534
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
@@ -40,7 +39,7 @@ type SetCustomBuildProperties struct{}
4039

4140
func (s *SetCustomBuildProperties) Run(context map[string]interface{}, ctx *types.Context) error {
4241
logger := ctx.GetLogger()
43-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
42+
buildProperties := ctx.BuildProperties
4443
customBuildProperties, err := props.LoadFromSlice(ctx.CustomBuildProperties, logger)
4544
if err != nil {
4645
return i18n.WrapError(err)

Diff for: ‎src/arduino.cc/builder/setup_build_properties.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (s *SetupBuildProperties) Run(context map[string]interface{}, ctx *types.Co
111111
buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_ZONE] = strconv.Itoa(utils.TimezoneOffset())
112112
buildProperties[constants.BUILD_PROPERTIES_EXTRA_TIME_DST] = strconv.Itoa(utils.DaylightSavingsOffset(now))
113113

114-
context[constants.CTX_BUILD_PROPERTIES] = buildProperties
114+
ctx.BuildProperties = buildProperties
115115

116116
return nil
117117
}

Diff for: ‎src/arduino.cc/builder/test/load_vid_pid_specific_properties_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ package test
3232
import (
3333
"arduino.cc/builder"
3434
"arduino.cc/builder/constants"
35-
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
3736
"github.com/stretchr/testify/require"
3837
"os"
@@ -64,7 +63,7 @@ func TestLoadVIDPIDSpecificPropertiesWhenNoVIDPIDAreProvided(t *testing.T) {
6463
NoError(t, err)
6564
}
6665

67-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
66+
buildProperties := ctx.BuildProperties
6867

6968
require.Equal(t, "0x0037", buildProperties["pid.0"])
7069
require.Equal(t, "\"Genuino Micro\"", buildProperties["vid.4.build.usb_product"])
@@ -97,7 +96,7 @@ func TestLoadVIDPIDSpecificProperties(t *testing.T) {
9796
NoError(t, err)
9897
}
9998

100-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
99+
buildProperties := ctx.BuildProperties
101100

102101
require.Equal(t, "0x0037", buildProperties["pid.0"])
103102
require.Equal(t, "\"Genuino Micro\"", buildProperties["vid.4.build.usb_product"])

Diff for: ‎src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ package test
3232
import (
3333
"arduino.cc/builder"
3434
"arduino.cc/builder/constants"
35-
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
3736
"arduino.cc/builder/utils"
3837
"github.com/stretchr/testify/require"
@@ -155,7 +154,7 @@ func TestMergeSketchWithBootloaderWhenNoBootloaderAvailable(t *testing.T) {
155154
NoError(t, err)
156155
}
157156

158-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
157+
buildProperties := ctx.BuildProperties
159158
delete(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_NOBLINK)
160159
delete(buildProperties, constants.BUILD_PROPERTIES_BOOTLOADER_FILE)
161160

Diff for: ‎src/arduino.cc/builder/test/recipe_runner_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestRecipeRunner(t *testing.T) {
4646
context := make(map[string]interface{})
4747
ctx := &types.Context{}
4848
buildProperties := make(props.PropertiesMap)
49-
context[constants.CTX_BUILD_PROPERTIES] = buildProperties
49+
ctx.BuildProperties = buildProperties
5050

5151
buildProperties["recipe.hooks.prebuild.1.pattern"] = "echo"
5252

Diff for: ‎src/arduino.cc/builder/test/setup_build_properties_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ package test
3232
import (
3333
"arduino.cc/builder"
3434
"arduino.cc/builder/constants"
35-
"arduino.cc/builder/props"
3635
"arduino.cc/builder/types"
3736
"arduino.cc/builder/utils"
3837
"github.com/stretchr/testify/require"
@@ -70,7 +69,7 @@ func TestSetupBuildProperties(t *testing.T) {
7069
NoError(t, err)
7170
}
7271

73-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
72+
buildProperties := ctx.BuildProperties
7473

7574
require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
7675

@@ -135,7 +134,7 @@ func TestSetupBuildPropertiesWithSomeCustomOverrides(t *testing.T) {
135134
NoError(t, err)
136135
}
137136

138-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
137+
buildProperties := ctx.BuildProperties
139138

140139
require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
141140

@@ -174,7 +173,7 @@ func TestSetupBuildPropertiesUserHardware(t *testing.T) {
174173
NoError(t, err)
175174
}
176175

177-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
176+
buildProperties := ctx.BuildProperties
178177

179178
require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
180179

@@ -208,7 +207,7 @@ func TestSetupBuildPropertiesWithMissingPropsFromParentPlatformTxtFiles(t *testi
208207
NoError(t, err)
209208
}
210209

211-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
210+
buildProperties := ctx.BuildProperties
212211

213212
require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
214213

Diff for: ‎src/arduino.cc/builder/types/context.go

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ type Context struct {
2525
TargetPlatform *Platform
2626
ActualPlatform *Platform
2727

28+
BuildProperties props.PropertiesMap
2829
BuildPath string
2930
SketchBuildPath string
3031
CoreBuildPath string

Diff for: ‎src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ package builder
3131

3232
import (
3333
"arduino.cc/builder/constants"
34-
"arduino.cc/builder/props"
3534
"arduino.cc/builder/types"
3635
"os"
3736
"strings"
@@ -45,7 +44,7 @@ func (s *WarnAboutArchIncompatibleLibraries) Run(context map[string]interface{},
4544
}
4645

4746
targetPlatform := ctx.TargetPlatform
48-
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
47+
buildProperties := ctx.BuildProperties
4948
logger := ctx.GetLogger()
5049

5150
archs := []string{}

0 commit comments

Comments
 (0)