8000 Merge remote-tracking branch 'arduino/master' · arduino/arduino-builder@07bcf8e · GitHub
[go: up one dir, main page]
Skip to content

Commit 07bcf8e

Browse files
author
Me No Dev
committed
Merge remote-tracking branch 'arduino/master'
2 parents db08742 + 80849e7 commit 07bcf8e

File tree

7 files changed

+35
-19
lines changed

7 files changed

+35
-19
lines changed

‎main.go

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ const FLAG_LOGGER_MACHINE = "machine"
7777
const FLAG_VERSION = "version"
7878
const FLAG_VID_PID = "vid-pid"
7979

80-
type slice []string
80+
type foldersFlag []string
8181

82-
func (h *slice) String() string {
82+
func (h *foldersFlag) String() string {
8383
return fmt.Sprint(*h)
8484
}
8585

86-
func (h *slice) Set(csv string) error {
86+
func (h *foldersFlag) Set(csv string) error {
8787
var values []string
8888
if strings.Contains(csv, string(os.PathListSeparator)) {
8989
values = strings.Split(csv, string(os.PathListSeparator))
@@ -99,15 +99,28 @@ func (h *slice) Set(csv string) error {
9999
return nil
100100
}
101101

102+
type propertiesFlag []string
103+
104+
func (h *propertiesFlag) String() string {
105+
return fmt.Sprint(*h)
106+
}
107+
108+
func (h *propertiesFlag) Set(value string) error {
109+
value = strings.TrimSpace(value)
110+
*h = append(*h, value)
111+
112+
return nil
113+
}
114+
102115
var compileFlag *bool
103116
var preprocessFlag *bool
104117
var dumpPrefsFlag *bool
105118
var buildOptionsFileFlag *string
106-
var hardwareFoldersFlag slice
107-
var toolsFoldersFlag slice
108-
var librariesBuiltInFoldersFlag slice
109-
var librariesFoldersFlag slice
110-
var customBuildPropertiesFlag slice
119+
var hardwareFoldersFlag foldersFlag
120+
var toolsFoldersFlag foldersFlag
121+
var librariesBuiltInFoldersFlag foldersFlag
122+
var librariesFoldersFlag foldersFlag
123+
var customBuildPropertiesFlag propertiesFlag
111124
var fqbnFlag *string
112125
var coreAPIVersionFlag *string
113126
var ideVersionFlag *string
@@ -336,7 +349,7 @@ func main() {
336349
defer os.Exit(exitCode)
337350
}
338351

339-
func setContextSliceKeyOrLoadItFromOptions(context map[string]interface{}, cliFlag slice, buildOptions map[string]string, contextKey string, paramName string, mandatory bool) (error, bool) {
352+
func setContextSliceKeyOrLoadItFromOptions(context map[string]interface{}, cliFlag []string, buildOptions map[string]string, contextKey string, paramName string, mandatory bool) (error, bool) {
340353
values, err := toSliceOfUnquoted(cliFlag)
341354
if err != nil {
342355
return err, true
@@ -364,7 +377,7 @@ func toExitCode(err error) int {
364377
return 1
365378
}
366379

367-
func toSliceOfUnquoted(value slice) ([]string, error) {
380+
func toSliceOfUnquoted(value []string) ([]string, error) {
368381
var values []string
369382
for _, v := range value {
370383
v, err := gohasissues.Unquote(v)

‎src/arduino.cc/builder/ctags/ctags_parser.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import (
3333
"arduino.cc/builder/constants"
3434
"arduino.cc/builder/types"
3535
"arduino.cc/builder/utils"
36+
"bufio"
3637
"os"
3738
"reflect"
3839
"runtime"
3940
"strconv"
4041
"strings"
41-
"bufio"
4242
)
4343

4444
const KIND_PROTOTYPE = "prototype"
@@ -172,12 +172,12 @@ func prototypeAndCodeDontMatch(tag *types.CTag) bool {
172172

173173
// skip lines until we get to the start of this tag
174174
for scanner.Scan() && line < tag.Line {
175-
line++;
175+
line++
176176
}
177177

178178
// read up to 10 lines in search of a closing paren
179179
newcode := scanner.Text()
180-
for scanner.Scan() && line < (tag.Line + 10) && strings.Index(newcode, ")") == -1 {
180+
for scanner.Scan() && line < (tag.Line+10) && strings.Index(newcode, ")") == -1 {
181181
newcode += scanner.Text()
182182
}
183183

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ func TestLoadHardwareWithBoardManagerFolderStructure(t *testing.T) {
178178
require.Equal(t, 0, len(packages.Packages["RFduino"].Platforms))
179179

180180
samdPlatform := packages.Packages["arduino"].Platforms["samd"]
181-
require.Equal(t, 2, len(samdPlatform.Boards))
181+
require.Equal(t, 3, len(samdPlatform.Boards))
182182

183183
require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].BoardId)
184184
require.Equal(t, "arduino_zero_edbg", samdPlatform.Boards["arduino_zero_edbg"].Properties[constants.ID])
@@ -232,7 +232,7 @@ func TestLoadLotsOfHardware(t *testing.T) {
232232
require.Equal(t, 3, len(packages.Packages["arduino"].Platforms))
233233
require.Equal(t, 20, len(packages.Packages["arduino"].Platforms["avr"].Boards))
234234
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms["sam"].Boards))
235-
require.Equal(t, 2, len(packages.Packages["arduino"].Platforms["samd"].Boards))
235+
require.Equal(t, 3, len(packages.Packages["arduino"].Platforms["samd"].Boards))
236236

237237
require.Equal(t, 1, len(packages.Packages["my_avr_platform"].Platforms))
238238
require.Equal(t, 2, len(packages.Packages["my_avr_platform"].Platforms["avr"].Boards))

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ type Core struct {
8484

8585
func DownloadCoresAndToolsAndLibraries(t *testing.T) {
8686
cores := []Core{
87-
Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.9"},
88-
Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.5"},
87+
Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.10"},
88+
Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.7"},
8989
}
9090

9191
boardsManagerCores := []Core{
92-
Core{Maintainer: "arduino", Arch: "samd", Version: "1.6.2"},
92+
Core{Maintainer: "arduino", Arch: "samd", Version: "1.6.5"},
9393
}
9494

9595
boardsManagerRedBearCores := []Core{
@@ -134,7 +134,7 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
134134
libraries := []Library{
135135
Library{Name: "Audio", Version: "1.0.4"},
136136
Library{Name: "Adafruit PN532", Version: "1.0.0"},
137-
Library{Name: "Bridge", Version: "1.1.0"},
137+
Library{Name: "Bridge", Version: "1.6.1"},
138138
Library{Name: "CapacitiveSensor", Version: "0.5.0", VersionInLibProperties: "0.5"},
139139
Library{Name: "Ethernet", Version: "1.1.1"},
140140
Library{Name: "Robot IR Remote", Version: "1.0.2"},

‎src/arduino.cc/builder/test/libraries/SPI/library.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ paragraph=
77
url=http://arduino.cc/en/Reference/SPI
88
architectures=avr
99
types=Arduino
10+
category=Other
1011

‎src/arduino.cc/builder/test/libraries/USBHost/library.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ sentence=Allows the communication with USB peripherals like mice, keyboards, and
66
paragraph=The USBHost library allows the board to appear as a USB host, enabling it to communicate with peripherals like USB mice and keyboards. USBHost does not support devices that are connected through USB hubs. This includes some keyboards that have an internal hub.
77
url=http://arduino.cc/en/Reference/USBHost
88
architectures=samd
9+
category=Other

‎src/arduino.cc/builder/test/libraries/wronglib/library.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ sentence=sentence
66
paragraph=paragraph
77
url=url
88
architectures=*
9+
category=Other

0 commit comments

Comments
 (0)
0