Merge remote-tracking branch 'upstream/master'

Author: robertinant

README.md

@@ -74,7 +74,7 @@ go build github.com/arduino/arduino-builder/arduino-builder
 In order to run the tests, type:
 
 ```
-go test github.com/arduino/arduino-builder/arduino-builder/...
+go test github.com/arduino/arduino-builder/...
 ```
 
 This runs all tests, showing any failures and a summary at the end.
@@ -88,13 +88,13 @@ To run a single test, use the -run option, which accepts a regular
 expression (see also go help testflag).
 
 ```
-go test github.com/arduino/arduino-builder/arduino-builder/... -run 'TestBuilderEmptySketch'
-go test github.com/arduino/arduino-builder/arduino-builder/... -run 'TestPrototypesAdder.*'
+go test github.com/arduino/arduino-builder/... -run 'TestBuilderEmptySketch'
+go test github.com/arduino/arduino-builder/... -run 'TestPrototypesAdder.*'
 ```
 
 In jenkins, use
 ```
-go test -v github.com/arduino/arduino-builder/arduino-builder/... | bin/go-junit-report > report.xml
+go test -v github.com/arduino/arduino-builder/... | bin/go-junit-report > report.xml
 ```
 
 The first time you run the tests, some needed files (toolchains and

hardware_loader.go

@@ -85,7 +85,7 @@ func (s *HardwareLoader) Run(ctx *types.Context) error {
 			}
 
 			targetPackage := getOrCreatePackage(packages, packageId)
-			err = loadPackage(targetPackage, subfolderPath, logger)
+			err = loadPackage(targetPackage, subfolderPath)
 			if err != nil {
 				return i18n.WrapError(err)
 			}
@@ -111,7 +111,7 @@ func getOrCreatePackage(packages *types.Packages, packageId string) *types.Packa
 	return &targetPackage
 }
 
-func loadPackage(targetPackage *types.Package, folder string, logger i18n.Logger) error {
+func loadPackage(targetPackage *types.Package, folder string) error {
 	packagePlatformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
@@ -143,7 +143,7 @@ func loadPackage(targetPackage *types.Package, folder string, logger i18n.Logger
 		}
 
 		platform := getOrCreatePlatform(platforms, platformId)
-		err = loadPlatform(platform, targetPackage.PackageId, subfolderPath, logger)
+		err = loadPlatform(platform, subfolderPath)
 		if err != nil {
 			return i18n.WrapError(err)
 		}
@@ -167,7 +167,7 @@ func getOrCreatePlatform(platforms map[string]*types.Platform, platformId string
 	return &targetPlatform
 }
 
-func loadPlatform(targetPlatform *types.Platform, packageId string, folder string, logger i18n.Logger) error {
+func loadPlatform(targetPlatform *types.Platform, folder string) error {
 	_, err := os.Stat(filepath.Join(folder, constants.FILE_BOARDS_TXT))
 	if err != nil && !os.IsNotExist(err) {
 		return i18n.WrapError(err)
@@ -179,13 +179,11 @@ func loadPlatform(targetPlatform *types.Platform, packageId string, folder strin
 
 	targetPlatform.Folder = folder
 
-	err = loadBoards(targetPlatform.Boards, packageId, targetPlatform.PlatformId, folder, logger)
+	err = loadBoards(targetPlatform.Boards, folder)
 	if err != nil {
 		return i18n.WrapError(err)
 	}
 
-	assignDefaultBoardToPlatform(targetPlatform)
-
 	platformTxt, err := properties.SafeLoad(filepath.Join(folder, constants.FILE_PLATFORM_TXT))
 	if err != nil {
 		return i18n.WrapError(err)
@@ -209,17 +207,7 @@ func loadPlatform(targetPlatform *types.Platform, packageId string, folder strin
 	return nil
 }
 
-func assignDefaultBoardToPlatform(targetPlatform *types.Platform) {
-	if targetPlatform.DefaultBoard == nil {
-		for _, board := range targetPlatform.Boards {
-			if targetPlatform.DefaultBoard == nil {
-				targetPlatform.DefaultBoard = board
-			}
-		}
-	}
-}
-
-func loadBoards(boards map[string]*types.Board, packageId string, platformId string, folder string, logger i18n.Logger) error {
+func loadBoards(boards map[string]*types.Board, folder string) error {
 	boardsProperties, err := properties.Load(filepath.Join(folder, constants.FILE_BOARDS_TXT))
 	if err != nil {
 		return i18n.WrapError(err)

types/types.go

@@ -136,12 +136,11 @@ type Package struct {
 }
 
 type Platform struct {
-	PlatformId   string
-	Folder       string
-	DefaultBoard *Board
-	Boards       map[string]*Board
-	Properties   properties.Map
-	Programmers  map[string]properties.Map
+	PlatformId  string
+	Folder      string
+	Boards      map[string]*Board
+	Properties  properties.Map
+	Programmers map[string]properties.Map
 }
 
 type Board struct {