Skip to content

Commit 57203ac

Browse files
cmagliecmaglie
committed
Moved Target* fields in Context
Signed-off-by: Cristian Maglie <[email protected]>
1 parent c68454f commit 57203ac

11 files changed

+44
-43
lines changed

‎src/arduino.cc/builder/add_missing_build_properties_from_parent_platform_txt_files.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type AddMissingBuildPropertiesFromParentPlatformTxtFiles struct{}
3939

4040
func (s *AddMissingBuildPropertiesFromParentPlatformTxtFiles) Run(context map[string]interface{}, ctx *types.Context) error {
4141
packages := context[constants.CTX_HARDWARE].(*types.Packages)
42-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
42+
targetPackage := ctx.TargetPackage
4343
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
4444

4545
newBuildProperties := packages.Properties.Clone()

‎src/arduino.cc/builder/constants/constants.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ const BUILD_PROPERTIES_TOOLS_KEY = "tools"
7474
const BUILD_PROPERTIES_VID = "vid"
7575
const COAN = "coan"
7676
const CTAGS = "ctags"
77-
const CTX_ACTUAL_PLATFORM = "actualPlatform"
7877
const CTX_ARCHIVE_FILE_PATH_CORE = "archiveFileCore"
7978
const CTX_BUILD_CORE = "buildCore"
8079
const CTX_BUILD_PROPERTIES = "buildProperties"
@@ -93,9 +92,6 @@ const CTX_OBJECT_FILES_SKETCH = "objectFilesSketch"
9392
const CTX_PLATFORM_KEYS_REWRITE = "platformKeysRewrite"
9493
const CTX_SKETCH = "sketch"
9594
const CTX_SOURCE = "source"
96-
const CTX_TARGET_BOARD = "targetBoard"
97-
const CTX_TARGET_PACKAGE = "targetPackage"
98-
const CTX_TARGET_PLATFORM = "targetPlatform"
9995
const CTX_TOOLS = "tools"
10096
const CTX_VIDPID = "VIDPID"
10197
const EMPTY_STRING = ""

‎src/arduino.cc/builder/includes_to_include_folders.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ func (s *IncludesToIncludeFolders) Run(context map[string]interface{}, ctx *type
4545
includes := ctx.Includes
4646
headerToLibraries := ctx.HeaderToLibraries
4747

48-
platform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
49-
actualPlatform := context[constants.CTX_ACTUAL_PLATFORM].(*types.Platform)
48+
platform := ctx.TargetPlatform
49+
actualPlatform := ctx.ActualPlatform
5050
libraryResolutionResults := ctx.LibrariesResolutionResults
5151
importedLibraries := ctx.ImportedLibraries
5252

‎src/arduino.cc/builder/libraries_loader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ func (s *LibrariesLoader) Run(context map[string]interface{}, ctx *types.Context
5151
sortedLibrariesFolders := []string{}
5252
sortedLibrariesFolders = utils.AppendIfNotPresent(sortedLibrariesFolders, builtInLibrariesFolders...)
5353

54-
platform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
54+
platform := ctx.TargetPlatform
5555
debugLevel := ctx.DebugLevel
5656
logger := ctx.GetLogger()
5757

58-
actualPlatform := context[constants.CTX_ACTUAL_PLATFORM].(*types.Platform)
58+
actualPlatform := ctx.ActualPlatform
5959
if actualPlatform != platform {
6060
sortedLibrariesFolders = appendPathToLibrariesFolders(sortedLibrariesFolders, filepath.Join(actualPlatform.Folder, constants.FOLDER_LIBRARIES))
6161
}

‎src/arduino.cc/builder/setup_build_properties.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ type SetupBuildProperties struct{}
4545
func (s *SetupBuildProperties) Run(context map[string]interface{}, ctx *types.Context) error {
4646
packages := context[constants.CTX_HARDWARE].(*types.Packages)
4747

48-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
49-
actualPlatform := context[constants.CTX_ACTUAL_PLATFORM].(*types.Platform)
50-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
48+
targetPlatform := ctx.TargetPlatform
49+
actualPlatform := ctx.ActualPlatform
50+
targetBoard := ctx.TargetBoard
5151

5252
buildProperties := make(props.PropertiesMap)
5353
buildProperties.Merge(actualPlatform.Properties)

‎src/arduino.cc/builder/target_board_resolver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ func (s *TargetBoardResolver) Run(context map[string]interface{}, ctx *types.Con
6666
return i18n.ErrorfWithLogger(logger, constants.MSG_BOARD_UNKNOWN, targetBoardName, targetPlatformName, targetPackageName)
6767
}
6868

69-
context[constants.CTX_TARGET_PACKAGE] = targetPackage
70-
context[constants.CTX_TARGET_PLATFORM] = targetPlatform
71-
context[constants.CTX_TARGET_BOARD] = targetBoard
69+
ctx.TargetPackage = targetPackage
70+
ctx.TargetPlatform = targetPlatform
71+
ctx.TargetBoard = targetBoard
7272

7373
if len(fqbnParts) > 3 {
7474
addAdditionalPropertiesToTargetBoard(targetBoard, fqbnParts[3])
@@ -98,7 +98,7 @@ func (s *TargetBoardResolver) Run(context map[string]interface{}, ctx *types.Con
9898
}
9999

100100
context[constants.CTX_BUILD_CORE] = core
101-
context[constants.CTX_ACTUAL_PLATFORM] = actualPlatform
101+
ctx.ActualPlatform = actualPlatform
102102

103103
return nil
104104
}

‎src/arduino.cc/builder/test/add_build_board_property_if_missing_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ func TestAddBuildBoardPropertyIfMissing(t *testing.T) {
5656
NoError(t, err)
5757
}
5858

59-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
59+
targetPackage := ctx.TargetPackage
6060
require.Equal(t, "my_avr_platform", targetPackage.PackageId)
61-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
61+
targetPlatform := ctx.TargetPlatform
6262
require.Equal(t, "avr", targetPlatform.PlatformId)
63-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
63+
targetBoard := ctx.TargetBoard
6464
require.Equal(t, "mymega", targetBoard.BoardId)
6565
require.Equal(t, constants.EMPTY_STRING, targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
6666
require.Equal(t, "AVR_MYMEGA", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
@@ -84,11 +84,11 @@ func TestAddBuildBoardPropertyIfMissingNotMissing(t *testing.T) {
8484
NoError(t, err)
8585
}
8686

87-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
87+
targetPackage := ctx.TargetPackage
8888
require.Equal(t, "my_avr_platform", targetPackage.PackageId)
89-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
89+
targetPlatform := ctx.TargetPlatform
9090
require.Equal(t, "avr", targetPlatform.PlatformId)
91-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
91+
targetBoard := ctx.TargetBoard
9292
require.Equal(t, "mymega", targetBoard.BoardId)
9393
require.Equal(t, "atmega2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
9494
require.Equal(t, "AVR_MEGA2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])

‎src/arduino.cc/builder/test/target_board_resolver_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ func TestTargetBoardResolverUno(t *testing.T) {
5555
NoError(t, err)
5656
}
5757

58-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
58+
targetPackage := ctx.TargetPackage
5959
require.Equal(t, "arduino", targetPackage.PackageId)
60-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
60+
targetPlatform := ctx.TargetPlatform
6161
require.Equal(t, "avr", targetPlatform.PlatformId)
62-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
62+
targetBoard := ctx.TargetBoard
6363
require.Equal(t, "uno", targetBoard.BoardId)
6464
require.Equal(t, "atmega328p", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
6565
}
@@ -81,11 +81,11 @@ func TestTargetBoardResolverDue(t *testing.T) {
8181
NoError(t, err)
8282
}
8383

84-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
84+
targetPackage := ctx.TargetPackage
8585
require.Equal(t, "arduino", targetPackage.PackageId)
86-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
86+
targetPlatform := ctx.TargetPlatform
8787
require.Equal(t, "sam", targetPlatform.PlatformId)
88-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
88+
targetBoard := ctx.TargetBoard
8989
require.Equal(t, "arduino_due_x", targetBoard.BoardId)
9090
require.Equal(t, "cortex-m3", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
9191
}
@@ -107,11 +107,11 @@ func TestTargetBoardResolverMega1280(t *testing.T) {
107107
NoError(t, err)
108108
}
109109

110-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
110+
targetPackage := ctx.TargetPackage
111111
require.Equal(t, "arduino", targetPackage.PackageId)
112-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
112+
targetPlatform := ctx.TargetPlatform
113113
require.Equal(t, "avr", targetPlatform.PlatformId)
114-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
114+
targetBoard := ctx.TargetBoard
115115
require.Equal(t, "mega", targetBoard.BoardId)
116116
require.Equal(t, "atmega1280", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
117117
require.Equal(t, "AVR_MEGA", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
@@ -134,11 +134,11 @@ func TestTargetBoardResolverMega2560(t *testing.T) {
134134
NoError(t, err)
135135
}
136136

137-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
137+
targetPackage := ctx.TargetPackage
138138
require.Equal(t, "arduino", targetPackage.PackageId)
139-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
139+
targetPlatform := ctx.TargetPlatform
140140
require.Equal(t, "avr", targetPlatform.PlatformId)
141-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
141+
targetBoard := ctx.TargetBoard
142142
require.Equal(t, "mega", targetBoard.BoardId)
143143
require.Equal(t, "atmega2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
144144
require.Equal(t, "AVR_MEGA2560", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
@@ -161,11 +161,11 @@ func TestTargetBoardResolverCustomYun(t *testing.T) {
161161
NoError(t, err)
162162
}
163163

164-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
164+
targetPackage := ctx.TargetPackage
165165
require.Equal(t, "my_avr_platform", targetPackage.PackageId)
166-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
166+
targetPlatform := ctx.TargetPlatform
167167
require.Equal(t, "avr", targetPlatform.PlatformId)
168-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
168+
targetBoard := ctx.TargetBoard
169169
require.Equal(t, "custom_yun", targetBoard.BoardId)
170170
require.Equal(t, "atmega32u4", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_MCU])
171171
require.Equal(t, "AVR_YUN", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_BOARD])
@@ -188,11 +188,11 @@ func TestTargetBoardResolverCustomCore(t *testing.T) {
188188
NoError(t, err)
189189
}
190190

191-
targetPackage := context[constants.CTX_TARGET_PACKAGE].(*types.Package)
191+
targetPackage := ctx.TargetPackage
192192
require.Equal(t, "watterott", targetPackage.PackageId)
193-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
193+
targetPlatform := ctx.TargetPlatform
194194
require.Equal(t, "avr", targetPlatform.PlatformId)
195-
targetBoard := context[constants.CTX_TARGET_BOARD].(*types.Board)
195+
targetBoard := ctx.TargetBoard
196196
require.Equal(t, "attiny841", targetBoard.BoardId)
197197
require.Equal(t, "tiny841", context[constants.CTX_BUILD_CORE].(string))
198198
require.Equal(t, "tiny14", targetBoard.Properties[constants.BUILD_PROPERTIES_BUILD_VARIANT])

‎src/arduino.cc/builder/types/context.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ type Context struct {
2020
BuildOptionsJson string
2121
BuildOptionsJsonPrevious string
2222

23+
TargetBoard *Board
24+
TargetPackage *Package
25+
TargetPlatform *Platform
26+
ActualPlatform *Platform
27+
2328
BuildPath string
2429
SketchBuildPath string
2530
CoreBuildPath string

‎src/arduino.cc/builder/warn_about_arch_incompatible_libraries.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (s *WarnAboutArchIncompatibleLibraries) Run(context map[string]interface{},
4444
return nil
4545
}
4646

47-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
47+
targetPlatform := ctx.TargetPlatform
4848
buildProperties := context[constants.CTX_BUILD_PROPERTIES].(props.PropertiesMap)
4949
logger := ctx.GetLogger()
5050

‎src/arduino.cc/builder/warn_about_platform_rewrites.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func (s *WarnAboutPlatformRewrites) Run(context map[string]interface{}, ctx *typ
4444

4545
logger := ctx.GetLogger()
4646
hardwareRewriteResults := context[constants.CTX_HARDWARE_REWRITE_RESULTS].(map[*types.Platform][]types.PlatforKeyRewrite)
47-
targetPlatform := context[constants.CTX_TARGET_PLATFORM].(*types.Platform)
48-
actualPlatform := context[constants.CTX_ACTUAL_PLATFORM].(*types.Platform)
47+
targetPlatform := ctx.TargetPlatform
48+
actualPlatform := ctx.ActualPlatform
4949

5050
platforms := []*types.Platform{targetPlatform}
5151
if actualPlatform != targetPlatform {

0 commit comments

Comments
 (0)