Skip to content

Commit 543863f

Browse files
cmagliecmaglie
committed
Changed field name Folder->InstallDir
1 parent fdfea8e commit 543863f

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎setup_build_properties.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
9999
}
100100

101101
for _, tool := range ctx.AllTools {
102-
buildProperties["runtime.tools."+tool.Tool.Name+".path"] = tool.Folder
103-
buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version+".path"] = tool.Folder
102+
buildProperties["runtime.tools."+tool.Tool.Name+".path"] = tool.InstallDir.String()
103+
buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version+".path"] = tool.InstallDir.String()
104104
}
105105
for _, tool := range ctx.RequiredTools {
106-
buildProperties["runtime.tools."+tool.Tool.Name+".path"] = tool.Folder
107-
buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version+".path"] = tool.Folder
106+
buildProperties["runtime.tools."+tool.Tool.Name+".path"] = tool.InstallDir.String()
107+
buildProperties["runtime.tools."+tool.Tool.Name+"-"+tool.Version+".path"] = tool.InstallDir.String()
108108
}
109109

110110
if !utils.MapStringStringHas(buildProperties, "software") {

‎test/tools_loader_test.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (s ByToolIDAndVersion) Less(i, j int) bool {
5555
if s[i].Version != s[j].Version {
5656
return s[i].Version < s[j].Version
5757
}
58-
return s[i].Folder < s[j].Folder
58+
return s[i].InstallDir.String() < s[j].InstallDir.String()
5959
}
6060

6161
func requireEquivalentPaths(t *testing.T, actual string, expected ...string) {
@@ -91,31 +91,31 @@ func TestLoadTools(t *testing.T) {
9191

9292
idx := 0
9393
require.Equal(t, ":arduino-preprocessor@0.1.5", tools[idx].String())
94-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/arduino-preprocessor/0.1.5")
94+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/arduino-preprocessor/0.1.5")
9595
idx++
9696
require.Equal(t, ":arm-none-eabi-gcc@4.8.3-2014q1", tools[idx].String())
97-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/arm-none-eabi-gcc/4.8.3-2014q1")
97+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/arm-none-eabi-gcc/4.8.3-2014q1")
9898
idx++
9999
require.Equal(t, ":avr-gcc@4.8.1-arduino5", tools[idx].String())
100-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/avr-gcc/4.8.1-arduino5")
100+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/avr-gcc/4.8.1-arduino5")
101101
idx++
102102
require.Equal(t, "arduino:avr-gcc@4.8.1-arduino5", tools[idx].String())
103-
requireEquivalentPaths(t, tools[idx].Folder, "tools_builtin/avr")
103+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "tools_builtin/avr")
104104
idx++
105105
require.Equal(t, ":avrdude@6.0.1-arduino5", tools[idx].String())
106-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/avrdude/6.0.1-arduino5")
106+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/avrdude/6.0.1-arduino5")
107107
idx++
108108
require.Equal(t, "arduino:avrdude@6.0.1-arduino5", tools[idx].String())
109-
requireEquivalentPaths(t, tools[idx].Folder, "tools_builtin/avr")
109+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "tools_builtin/avr")
110110
idx++
111111
require.Equal(t, ":bossac@1.5-arduino", tools[idx].String())
112-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/bossac/1.5-arduino")
112+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/bossac/1.5-arduino")
113113
idx++
114114
require.Equal(t, ":bossac@1.6.1-arduino", tools[idx].String())
115-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/bossac/1.6.1-arduino")
115+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/bossac/1.6.1-arduino")
116116
idx++
117117
require.Equal(t, ":ctags@5.8-arduino11", tools[idx].String())
118-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/ctags/5.8-arduino11")
118+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/ctags/5.8-arduino11")
119119
}
120120

121121
func TestLoadToolsWithBoardManagerFolderStructure(t *testing.T) {
@@ -134,13 +134,13 @@ func TestLoadToolsWithBoardManagerFolderStructure(t *testing.T) {
134134

135135
idx := 0
136136
require.Equal(t, "arduino:CMSIS@4.0.0-atmel", tools[idx].String())
137-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel")
137+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel")
138138
idx++
139139
require.Equal(t, "RFduino:arm-none-eabi-gcc@4.8.3-2014q1", tools[idx].String())
140-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_board_manager_stuff/RFduino/tools/arm-none-eabi-gcc/4.8.3-2014q1")
140+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/RFduino/tools/arm-none-eabi-gcc/4.8.3-2014q1")
141141
idx++
142142
require.Equal(t, "arduino:openocd@0.9.0-arduino", tools[idx].String())
143-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino")
143+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino")
144144
}
145145

146146
func TestLoadLotsOfTools(t *testing.T) {
@@ -161,38 +161,38 @@ func TestLoadLotsOfTools(t *testing.T) {
161161

162162
idx := 0
163163
require.Equal(t, "arduino:CMSIS@4.0.0-atmel", tools[idx].String())
164-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel")
164+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel")
165165
idx++
166166
require.Equal(t, ":arduino-preprocessor@0.1.5", tools[idx].String())
167-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/arduino-preprocessor/0.1.5")
167+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/arduino-preprocessor/0.1.5")
168168
idx++
169169
require.Equal(t, "RFduino:arm-none-eabi-gcc@4.8.3-2014q1", tools[idx].String())
170-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_board_manager_stuff/RFduino/tools/arm-none-eabi-gcc/4.8.3-2014q1")
170+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/RFduino/tools/arm-none-eabi-gcc/4.8.3-2014q1")
171171
idx++
172172
require.Equal(t, ":arm-none-eabi-gcc@4.8.3-2014q1", tools[idx].String())
173-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/arm-none-eabi-gcc/4.8.3-2014q1")
173+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/arm-none-eabi-gcc/4.8.3-2014q1")
174174
idx++
175175
require.Equal(t, ":avr-gcc@4.8.1-arduino5", tools[idx].String())
176-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/avr-gcc/4.8.1-arduino5")
176+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/avr-gcc/4.8.1-arduino5")
177177
idx++
178178
require.Equal(t, "arduino:avr-gcc@4.8.1-arduino5", tools[idx].String())
179-
requireEquivalentPaths(t, tools[idx].Folder, "tools_builtin/avr")
179+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "tools_builtin/avr")
180180
idx++
181181
require.Equal(t, ":avrdude@6.0.1-arduino5", tools[idx].String())
182-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/avrdude/6.0.1-arduino5")
182+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/avrdude/6.0.1-arduino5")
183183
idx++
184184
require.Equal(t, "arduino:avrdude@6.0.1-arduino5", tools[idx].String())
185-
requireEquivalentPaths(t, tools[idx].Folder, "tools_builtin/avr")
185+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "tools_builtin/avr")
186186
idx++
187187
require.Equal(t, ":bossac@1.5-arduino", tools[idx].String())
188-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/bossac/1.5-arduino")
188+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/bossac/1.5-arduino")
189189
idx++
190190
require.Equal(t, ":bossac@1.6.1-arduino", tools[idx].String())
191-
requireEquivalentPaths(t, tools[idx].Folder, tools[idx].Folder, "downloaded_tools/bossac/1.6.1-arduino")
191+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), tools[idx].InstallDir.String(), "downloaded_tools/bossac/1.6.1-arduino")
192192
idx++
193193
require.Equal(t, ":ctags@5.8-arduino11", tools[idx].String())
194-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_tools/ctags/5.8-arduino11")
194+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_tools/ctags/5.8-arduino11")
195195
idx++
196196
require.Equal(t, "arduino:openocd@0.9.0-arduino", tools[idx].String())
197-
requireEquivalentPaths(t, tools[idx].Folder, "downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino")
197+
requireEquivalentPaths(t, tools[idx].InstallDir.String(), "downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino")
198198
}

0 commit comments

Comments
 (0)