Commit 1b96a97

committed

Using BuiltInToolsDirs instead of ToolsDirs

1 parent aa5bb45 commit 1b96a97Copy full SHA for 1b96a97

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/arduino/arduino-builder`
`3`	`3`	`go 1.12`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/arduino/arduino-cli v0.0.0-20190909101745-b3db7a6400cf`
	`6`	`+ github.com/arduino/arduino-cli v0.0.0-20190920124130-b6774033151c`
`7`	`7`	`github.com/arduino/go-paths-helper v0.0.0-20190214132331-c3c98d1bf2e1`
`8`	`8`	`github.com/arduino/go-properties-orderedmap v0.0.0-20190828172252-05018b28ff6c`
`9`	`9`	`github.com/go-errors/errors v1.0.1`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ github.com/arduino/arduino-cli v0.0.0-20190828173137-fffa451acd60 h1:5jnGjqzOYyS`
`5`	`5`	`github.com/arduino/arduino-cli v0.0.0-20190828173137-fffa451acd60/go.mod h1:mTVK2WsKc1Ehy2ic+rChPLo9N0uf3ZuUVO7C3y4Y04Q=`
`6`	`6`	`github.com/arduino/arduino-cli v0.0.0-20190909101745-b3db7a6400cf h1:MWVsGOfaT0/HzX5PP6/fWiPviu2YzBe1SbPMtX4qb7s=`
`7`	`7`	`github.com/arduino/arduino-cli v0.0.0-20190909101745-b3db7a6400cf/go.mod h1:mTVK2WsKc1Ehy2ic+rChPLo9N0uf3ZuUVO7C3y4Y04Q=`
	`8`	`+github.com/arduino/arduino-cli v0.0.0-20190920124130-b6774033151c h1:0ewBEBzUPbdJgXusSiofkoCJbrT2uKex5ZswdawmdAM=`
	`9`	`+github.com/arduino/arduino-cli v0.0.0-20190920124130-b6774033151c/go.mod h1:tGmlOZBUyZunMKW2TIwP/ztR2wnfL81+BNNuZaZmXuQ=`
`8`	`10`	`github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c h1:agh2JT96G8egU7FEb13L4dq3fnCN7lxXhJ86t69+W7s=`
`9`	`11`	`github.com/arduino/board-discovery v0.0.0-20180823133458-1ba29327fb0c/go.mod h1:HK7SpkEax/3P+0w78iRQx1sz1vCDYYw9RXwHjQTB5i8=`
`10`	`12`	`github.com/arduino/go-paths-helper v0.0.0-20190214132331-c3c98d1bf2e1 h1:S0NpDSqjlkNA510vmRCP5Cq9mPgu3rWDSdeN4SI1Mwc=`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,9 @@ func main() {`
`258`	`258`	`if toolsFolders, err := toSliceOfUnquoted(toolsFoldersFlag); err != nil {`
`259`	`259`	`printCompleteError(err)`
`260`	`260`	`} else if len(toolsFolders) > 0 {`
`261`		`- ctx.ToolsDirs = paths.NewPathList(toolsFolders...)`
	`261`	`+ ctx.BuiltInToolsDirs = paths.NewPathList(toolsFolders...)`
`262`	`262`	`}`
`263`		`- if len(ctx.ToolsDirs) == 0 {`
	`263`	`+ if len(ctx.BuiltInToolsDirs) == 0 {`
`264`	`264`	`printErrorMessageAndFlagUsage(errors.New("Parameter '" + FLAG_TOOLS + "' is mandatory"))`
`265`	`265`	`}`
`266`	`266`

Comments

(0)