Expanding properties of bootloader key before checking for its existence.

Fixes #63

Signed-off-by: Federico Fissore <f.fissore@arduino.cc>

Author: Federico Fissore

src/arduino.cc/builder/merge_sketch_with_bootloader.go

@@ -32,6 +32,7 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
+	"arduino.cc/builder/props"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
 	"os"
@@ -70,6 +71,7 @@ func (s *MergeSketchWithBootloader) Run(context map[string]interface{}) error {
 	} else {
 		bootloader = buildProperties[constants.BUILD_PROPERTIES_BOOTLOADER_FILE]
 	}
+	bootloader = props.ExpandPropsInString(buildProperties, bootloader)
 
 	bootloaderPath := filepath.Join(buildProperties[constants.BUILD_PROPERTIES_RUNTIME_PLATFORM_PATH], constants.FOLDER_BOOTLOADERS, bootloader)
 	if _, err := os.Stat(bootloaderPath); err != nil {

src/arduino.cc/builder/test/merge_sketch_with_bootloader_test.go

@@ -166,3 +166,46 @@ func TestMergeSketchWithBootloaderWhenNoBootloaderAvailable(t *testing.T) {
 	require.Error(t, err)
 	require.True(t, os.IsNotExist(err))
 }
+
+func TestMergeSketchWithBootloaderPathIsParameterized(t *testing.T) {
+	DownloadCoresAndToolsAndLibraries(t)
+
+	context := make(map[string]interface{})
+
+	buildPath := SetupBuildPath(t, context)
+	defer os.RemoveAll(buildPath)
+
+	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "user_hardware"}
+	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools"}
+	context[constants.CTX_FQBN] = "my_avr_platform:avr:mymega:cpu=atmega2560"
+	context[constants.CTX_BUILT_IN_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
+	context[constants.CTX_OTHER_LIBRARIES_FOLDERS] = []string{"libraries"}
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch1", "sketch.ino")
+	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+
+	err := utils.EnsureFolderExists(filepath.Join(buildPath, "sketch"))
+	NoError(t, err)
+
+	fakeSketchHex := "row 1\n" +
+		"row 2\n"
+	err = utils.WriteFile(filepath.Join(buildPath, "sketch", "sketch.ino.hex"), fakeSketchHex)
+	NoError(t, err)
+
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+		&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
+		&builder.MergeSketchWithBootloader{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
+
+	bytes, err := ioutil.ReadFile(filepath.Join(buildPath, "sketch", "sketch.ino.with_bootloader.hex"))
+	NoError(t, err)
+	mergedSketchHex := string(bytes)
+
+	require.True(t, strings.HasPrefix(mergedSketchHex, "row 1\n:020000023000CC"))
+	require.True(t, strings.HasSuffix(mergedSketchHex, ":040000033000E000E9\n:00000001FF\n"))
+}

src/arduino.cc/builder/test/user_hardware/my_avr_platform/avr/boards.txt

@@ -62,9 +62,10 @@ mymega.menu.cpu.atmega2560.upload.protocol=wiring
 mymega.menu.cpu.atmega2560.upload.maximum_size=253952
 mymega.menu.cpu.atmega2560.upload.speed=115200
 
+mymega.menu.cpu.atmega2560.bootloader._folder=stk500v2
 mymega.menu.cpu.atmega2560.bootloader.high_fuses=0xD8
 mymega.menu.cpu.atmega2560.bootloader.extended_fuses=0xFD
-mymega.menu.cpu.atmega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
+mymega.menu.cpu.atmega2560.bootloader.file={bootloader._folder}/stk500boot_v2_mega2560.hex
 
 mymega.menu.cpu.atmega2560.build.mcu=atmega2560
 mymega.menu.cpu.atmega2560.build.board=AVR_MEGA2560
@@ -75,9 +76,10 @@ mymega.menu.cpu.atmega1280.upload.protocol=arduino
 mymega.menu.cpu.atmega1280.upload.maximum_size=126976
 mymega.menu.cpu.atmega1280.upload.speed=57600
 
+mymega.menu.cpu.atmega1280.bootloader._folder=atmega
 mymega.menu.cpu.atmega1280.bootloader.high_fuses=0xDA
 mymega.menu.cpu.atmega1280.bootloader.extended_fuses=0xF5
-mymega.menu.cpu.atmega1280.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex
+mymega.menu.cpu.atmega1280.bootloader.file={bootloader._folder}/ATmegaBOOT_168_atmega1280.hex
 
 mymega.menu.cpu.atmega1280.build.mcu=atmega1280
 mymega.menu.cpu.atmega1280.build.board=AVR_MEGA