Added support to boards.local.txt. See arduino/Arduino#3878

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/constants/constants.go

@@ -123,6 +123,7 @@ const CTX_VERBOSE = "verbose"
 const CTX_VIDPID = "VIDPID"
 const CTX_WARNINGS_LEVEL = "warningLevel"
 const EMPTY_STRING = ""
+const FILE_BOARDS_LOCAL_TXT = "boards.local.txt"
 const FILE_BOARDS_TXT = "boards.txt"
 const FILE_BUILTIN_TOOLS_VERSIONS_TXT = "builtin_tools_versions.txt"
 const FILE_COAN_TARGET = "coan_target.cpp"

Diff for: src/arduino.cc/builder/hardware_loader.go

@@ -219,6 +219,13 @@ func loadBoards(boards map[string]*types.Board, packageId string, platformId str
 		return utils.WrapError(err)
 	}
 
+	localProperties, err := props.SafeLoad(filepath.Join(folder, constants.FILE_BOARDS_LOCAL_TXT))
+	if err != nil {
+		return utils.WrapError(err)
+	}
+
+	properties = utils.MergeMapsOfStrings(properties, localProperties)
+
 	propertiesByBoardId := props.FirstLevelOf(properties)
 	delete(propertiesByBoardId, constants.BOARD_PROPERTIES_MENU)
 

Diff for: src/arduino.cc/builder/test/hardware/arduino/avr/boards.local.txt

@@ -0,0 +1,11 @@
+## Arduino Duemilanove or Diecimila w/ ATmega123
+## ---------------------------------------------
+diecimila.menu.cpu.atmega123=ATmega123
+
+diecimila.menu.cpu.atmega123.upload.maximum_size=14336
+diecimila.menu.cpu.atmega123.upload.maximum_data_size=1024
+diecimila.menu.cpu.atmega123.upload.speed=19200
+
+diecimila.menu.cpu.atmega123.bootloader.high_fuses=0xdd
+diecimila.menu.cpu.atmega123.bootloader.extended_fuses=0x00
+diecimila.menu.cpu.atmega123.bootloader.file=atmega/ATmegaBOOT_123_diecimila.hex

Diff for: src/arduino.cc/builder/test/hardware_loader_test.go

@@ -63,6 +63,8 @@ func TestLoadHardware(t *testing.T) {
 
 	require.Equal(t, "arduino_due_x", packages.Packages["arduino"].Platforms["sam"].Boards["arduino_due_x"].BoardId)
 
+	require.Equal(t, "ATmega123", packages.Packages["arduino"].Platforms["avr"].Boards["diecimila"].Properties["menu.cpu.atmega123"])
+
 	avrPlatform := packages.Packages["arduino"].Platforms["avr"]
 	require.Equal(t, "Arduino AVR Boards", avrPlatform.Properties[constants.PLATFORM_NAME])
 	require.Equal(t, "-v", avrPlatform.Properties["tools.avrdude.bootloader.params.verbose"])