Compiler: merge sketch must look for the bootloader file under runtime.platform.path, not build.platform.path. Fixes arduino#3395

Federico Fissore · Federico Fissore · commit 5d3e4c185ea4 · 2015-06-22T11:56:56.000+02:00
diff --git a/arduino-core/src/processing/app/debug/Compiler.java b/arduino-core/src/processing/app/debug/Compiler.java
@@ -1203,7 +1203,7 @@ private File mergeSketchWithBootloaderIfAppropriate(String className, Preference
       bootloaderNoBlink = prefs.get("bootloader.file");
     }
 
-    File bootloader = new File(new File(prefs.get("build.platform.path"), "bootloaders"), bootloaderNoBlink);
+    File bootloader = new File(new File(prefs.get("runtime.platform.path"), "bootloaders"), bootloaderNoBlink);
     if (!bootloader.exists()) {
       System.err.println(I18n.format(_("Bootloader file specified but missing: {0}"), bootloader));
       return null;

Original file line number	Diff line number	Diff line change
`@@ -1203,7 +1203,7 @@ private File mergeSketchWithBootloaderIfAppropriate(String className, Preference`
`1203`	`1203`	`bootloaderNoBlink = prefs.get("bootloader.file");`
`1204`	`1204`	`}`
`1205`	`1205`
`1206`		`- File bootloader = new File(new File(prefs.get("build.platform.path"), "bootloaders"), bootloaderNoBlink);`
	`1206`	`+ File bootloader = new File(new File(prefs.get("runtime.platform.path"), "bootloaders"), bootloaderNoBlink);`
`1207`	`1207`	`if (!bootloader.exists()) {`
`1208`	`1208`	`System.err.println(I18n.format(_("Bootloader file specified but missing: {0}"), bootloader));`
`1209`	`1209`	`return null;`