arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Compiler: removed duplicated functions getCommandCompilerS, getCommandCompilerC, and getCommandCompilerCPP in favour of generic getCommandCompilerByRecipe

Browse Source
This commit is contained in:
Federico Fissore
2015-01-08 13:54:20 +01:00
parent f5520fc7e1
commit fd4a5a82b3
1 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,7 +511,7 @@ public class Compiler implements MessageConsumer {
for (File file : sSources) { for (File file : sSources) {
File objectFile = new File(outputPath, file.getName() + ".o"); File objectFile = new File(outputPath, file.getName() + ".o");
objectPaths.add(objectFile); objectPaths.add(objectFile);
String[] cmd = getCommandCompilerS(includeFolders, file, objectFile); String[] cmd = getCommandCompilerByRecipe(includeFolders, file, objectFile, "recipe.S.o.pattern");
execAsynchronously(cmd); execAsynchronously(cmd);
} }
@ -521,7 +521,7 @@ public class Compiler implements MessageConsumer {
objectPaths.add(objectFile); objectPaths.add(objectFile);
if (isAlreadyCompiled(file, objectFile, dependFile, prefs)) if (isAlreadyCompiled(file, objectFile, dependFile, prefs))
continue; continue;
String[] cmd = getCommandCompilerC(includeFolders, file, objectFile); String[] cmd = getCommandCompilerByRecipe(includeFolders, file, objectFile, "recipe.c.o.pattern");
execAsynchronously(cmd); execAsynchronously(cmd);
} }
@ -531,7 +531,7 @@ public class Compiler implements MessageConsumer {
objectPaths.add(objectFile); objectPaths.add(objectFile);
if (isAlreadyCompiled(file, objectFile, dependFile, prefs)) if (isAlreadyCompiled(file, objectFile, dependFile, prefs))
continue; continue;
String[] cmd = getCommandCompilerCPP(includeFolders, file, objectFile); String[] cmd = getCommandCompilerByRecipe(includeFolders, file, objectFile, "recipe.cpp.o.pattern");
execAsynchronously(cmd); execAsynchronously(cmd);
} }
@ -811,9 +811,7 @@ public class Compiler implements MessageConsumer {
System.err.print(s); System.err.print(s);
} }
private String[] getCommandCompilerS(List<File> includeFolders, private String[] getCommandCompilerByRecipe(List<File> includeFolders, File sourceFile, File objectFile, String recipe) throws PreferencesMapException, RunnerException {
File sourceFile, File objectFile)
throws RunnerException, PreferencesMapException {
String includes = prepareIncludes(includeFolders); String includes = prepareIncludes(includeFolders);
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + BaseNoGui.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
@ -821,45 +819,7 @@ public class Compiler implements MessageConsumer {
dict.put("source_file", sourceFile.getAbsolutePath()); dict.put("source_file", sourceFile.getAbsolutePath());
dict.put("object_file", objectFile.getAbsolutePath()); dict.put("object_file", objectFile.getAbsolutePath());
String cmd = prefs.getOrExcept("recipe.S.o.pattern"); String cmd = prefs.getOrExcept(recipe);
try {
return StringReplacer.formatAndSplit(cmd, dict, true);
} catch (Exception e) {
throw new RunnerException(e);
}
}
private String[] getCommandCompilerC(List<File> includeFolders,
File sourceFile, File objectFile)
throws RunnerException, PreferencesMapException {
String includes = prepareIncludes(includeFolders);
PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("includes", includes);
dict.put("source_file", sourceFile.getAbsolutePath());
dict.put("object_file", objectFile.getAbsolutePath());
String cmd = prefs.getOrExcept("recipe.c.o.pattern");
try {
return StringReplacer.formatAndSplit(cmd, dict, true);
} catch (Exception e) {
throw new RunnerException(e);
}
}
private String[] getCommandCompilerCPP(List<File> includeFolders,
File sourceFile, File objectFile)
throws RunnerException, PreferencesMapException {
String includes = prepareIncludes(includeFolders);
PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("includes", includes);
dict.put("source_file", sourceFile.getAbsolutePath());
dict.put("object_file", objectFile.getAbsolutePath());
String cmd = prefs.getOrExcept("recipe.cpp.o.pattern");
try { try {
return StringReplacer.formatAndSplit(cmd, dict, true); return StringReplacer.formatAndSplit(cmd, dict, true);
} catch (Exception e) { } catch (Exception e) {