rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

saveHex: rename recipe.hex -> recipe.output

Browse Source 
Signed-off-by: Arnav Gupta <championswimmer@gmail.com>
This commit is contained in:
Arnav Gupta 2015-02-10 03:54:48 +05:30 committed by Federico Fissore
parent 4acfc0c344
commit 4d029de000
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/Editor.java
View File

@ -4,7 +4,7 @@
Part of the Processing project - http://processing.org Part of the Processing project - http://processing.org
Copyright (c) 2004-09 Ben Fry and Casey Reas 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 This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 it under the terms of the GNU General Public License version 2

4
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -1160,9 +1160,9 @@ public class Compiler implements MessageConsumer {
String[] cmdArray; String[] cmdArray;
try { 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); 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); save_file = StringReplacer.replaceFromMapping(save_file, dict);
File hexFile = new File(prefs.get("build.path") + "/" + tmp_file); File hexFile = new File(prefs.get("build.path") + "/" + tmp_file);

4
hardware/arduino/avr/platform.txt
View File

@ -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" 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 ## Save hex
recipe.hex.tmp_file={build.project_name}.hex recipe.output.tmp_file={build.project_name}.hex
recipe.hex.save_file={build.project_name}.{build.variant}.hex recipe.output.save_file={build.project_name}.{build.variant}.hex
## Compute size ## Compute size
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf" recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"

4
hardware/arduino/sam/platform.txt
View File

@ -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" 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 ## Save hex
recipe.hex.tmp_file={build.project_name}.bin recipe.output.tmp_file={build.project_name}.bin
recipe.hex.save_file={build.project_name}.{build.variant}.bin recipe.output.save_file={build.project_name}.{build.variant}.bin
## Compute size ## Compute size
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf" recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"