diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index f60268b96..2f650b406 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -4,7 +4,7 @@ Part of the Processing project - http://processing.org Copyright (c) 2004-09 Ben Fry and Casey Reas - Copyright (c) 2001-04 Massachusetts Institute of Technol("Expoogy + Copyright (c) 2001-04 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 diff --git a/arduino-core/src/processing/app/debug/Compiler.java b/arduino-core/src/processing/app/debug/Compiler.java index 0e2b886d2..8044ea63c 100644 --- a/arduino-core/src/processing/app/debug/Compiler.java +++ b/arduino-core/src/processing/app/debug/Compiler.java @@ -1160,9 +1160,9 @@ public class Compiler implements MessageConsumer { String[] cmdArray; try { - String tmp_file = prefs.getOrExcept("recipe.hex.tmp_file"); + String tmp_file = prefs.getOrExcept("recipe.output.tmp_file"); tmp_file = StringReplacer.replaceFromMapping(tmp_file, dict); - String save_file = prefs.getOrExcept("recipe.hex.save_file"); + String save_file = prefs.getOrExcept("recipe.output.save_file"); save_file = StringReplacer.replaceFromMapping(save_file, dict); File hexFile = new File(prefs.get("build.path") + "/" + tmp_file); diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt index f4abb2ae2..b3c99864c 100644 --- a/hardware/arduino/avr/platform.txt +++ b/hardware/arduino/avr/platform.txt @@ -72,8 +72,8 @@ recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.obj recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex" ## Save hex -recipe.hex.tmp_file={build.project_name}.hex -recipe.hex.save_file={build.project_name}.{build.variant}.hex +recipe.output.tmp_file={build.project_name}.hex +recipe.output.save_file={build.project_name}.{build.variant}.hex ## Compute size recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf" diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt index 9b749ca23..af846086a 100644 --- a/hardware/arduino/sam/platform.txt +++ b/hardware/arduino/sam/platform.txt @@ -76,8 +76,8 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.f recipe.objcopy.bin.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin" ## Save hex -recipe.hex.tmp_file={build.project_name}.bin -recipe.hex.save_file={build.project_name}.{build.variant}.bin +recipe.output.tmp_file={build.project_name}.bin +recipe.output.save_file={build.project_name}.{build.variant}.bin ## Compute size recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"