arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Refactored corePath field in Compiler class

Browse Source
This commit is contained in:
Cristian Maglie
2012-01-13 18:17:28 +01:00
parent 34d9004db7
commit 4a0260e2b5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/processing/app/debug/Compiler.java
View File

@ -133,7 +133,7 @@ public class Compiler implements MessageConsumer {
coreFolder = new File(t.getFolder(), "cores"); coreFolder = new File(t.getFolder(), "cores");
coreFolder = new File(coreFolder, split[1]); coreFolder = new File(coreFolder, split[1]);
} }
String corePath = coreFolder.getAbsolutePath(); corePath = coreFolder.getAbsolutePath();
String variant = boardPreferences.get("build.variant"); String variant = boardPreferences.get("build.variant");
variantPath = null; variantPath = null;
@ -480,6 +480,7 @@ public class Compiler implements MessageConsumer {
dict.put("source_file", sourceName); dict.put("source_file", sourceName);
dict.put("object_file", objectName); dict.put("object_file", objectName);
dict.put("toolchain_path", toolsPath); dict.put("toolchain_path", toolsPath);
dict.put("core_path", corePath);
try { try {
String cmd = prefs.get("recipe.S.o.pattern"); String cmd = prefs.get("recipe.S.o.pattern");
@ -500,6 +501,7 @@ public class Compiler implements MessageConsumer {
dict.put("source_file", sourceName); dict.put("source_file", sourceName);
dict.put("object_file", objectName); dict.put("object_file", objectName);
dict.put("toolchain_path", toolsPath); dict.put("toolchain_path", toolsPath);
dict.put("core_path", corePath);
String cmd = prefs.get("recipe.c.o.pattern"); String cmd = prefs.get("recipe.c.o.pattern");
try { try {
@ -520,6 +522,7 @@ public class Compiler implements MessageConsumer {
dict.put("source_file", sourceName); dict.put("source_file", sourceName);
dict.put("object_file", objectName); dict.put("object_file", objectName);
dict.put("toolchain_path", toolsPath); dict.put("toolchain_path", toolsPath);
dict.put("core_path", corePath);
String cmd = prefs.get("recipe.cpp.o.pattern"); String cmd = prefs.get("recipe.cpp.o.pattern");
try { try {