rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-18 07:52:14 +01:00
Code Issues Releases Activity

Better to separate arguments only when specifying paths, otherwise we can't specify empty args like "-warnings="

Browse Source
This commit is contained in:
Federico Fissore 2015-09-16 11:25:11 +02:00
parent 6847c52428
commit f906d45de0
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
arduino-core/src/cc/arduino/Compiler.java
View File

@ -107,7 +107,7 @@ public class Compiler implements MessageConsumer {
private final String pathToSketch; private final String pathToSketch;
private final SketchData sketch; private final SketchData sketch;
private final String buildPath; private final String buildPath;
private boolean verbose; private final boolean verbose;
private RunnerException exception; private RunnerException exception;
public Compiler(SketchData data, String buildPath) { public Compiler(SketchData data, String buildPath) {
@ -172,8 +172,7 @@ public class Compiler implements MessageConsumer {
File executable = BaseNoGui.getContentFile("arduino-builder"); File executable = BaseNoGui.getContentFile("arduino-builder");
CommandLine commandLine = new CommandLine(executable); CommandLine commandLine = new CommandLine(executable);
commandLine.addArgument(action.value, false); commandLine.addArgument(action.value, false);
commandLine.addArgument("-logger", false); commandLine.addArgument("-logger=machine", false);
commandLine.addArgument("machine", false);
Stream.of(BaseNoGui.getHardwarePath(), new File(BaseNoGui.getSettingsFolder(), "packages").getAbsolutePath(), BaseNoGui.getSketchbookHardwareFolder().getAbsolutePath()) Stream.of(BaseNoGui.getHardwarePath(), new File(BaseNoGui.getSettingsFolder(), "packages").getAbsolutePath(), BaseNoGui.getSketchbookHardwareFolder().getAbsolutePath())
.forEach(p -> { .forEach(p -> {
@ -197,30 +196,22 @@ public class Compiler implements MessageConsumer {
commandLine.addArgument("\"" + BaseNoGui.getContentFile("libraries").getAbsolutePath() + "\"", false); commandLine.addArgument("\"" + BaseNoGui.getContentFile("libraries").getAbsolutePath() + "\"", false);
String fqbn = Stream.of(aPackage.getId(), platform.getId(), board.getId(), boardOptions(board)).filter(s -> !s.isEmpty()).collect(Collectors.joining(":")); String fqbn = Stream.of(aPackage.getId(), platform.getId(), board.getId(), boardOptions(board)).filter(s -> !s.isEmpty()).collect(Collectors.joining(":"));
commandLine.addArgument("-fqbn", false); commandLine.addArgument("-fqbn=" + fqbn, false);
commandLine.addArgument(fqbn, false);
commandLine.addArgument("-ide-version", false); commandLine.addArgument("-ide-version=" + BaseNoGui.REVISION, false);
commandLine.addArgument(Integer.toString(BaseNoGui.REVISION), false);
commandLine.addArgument("-build-path", false); commandLine.addArgument("-build-path", false);
commandLine.addArgument("\"" + buildPath + "\"", false); commandLine.addArgument("\"" + buildPath + "\"", false);
commandLine.addArgument("-warnings", false); commandLine.addArgument("-warnings=" + PreferencesData.get("compiler.warning_level"), false);
commandLine.addArgument(PreferencesData.get("compiler.warning_level"), false);
PreferencesData.getMap() PreferencesData.getMap()
.subTree("build_properties_custom") .subTree("build_properties_custom")
.entrySet() .entrySet()
.stream() .stream()
.forEach(kv -> { .forEach(kv -> commandLine.addArgument("-prefs=\"" + kv.getKey() + "=" + kv.getValue() + "\"", false));
commandLine.addArgument("-prefs", false);
commandLine.addArgument("\"" + kv.getKey() + "=" + kv.getValue() + "\"", false);
});
commandLine.addArgument("-prefs", false); commandLine.addArgument("-prefs=build.warn_data_percentage=" + PreferencesData.get("build.warn_data_percentage"));
commandLine.addArgument("build.warn_data_percentage=" + PreferencesData.get("build.warn_data_percentage"), false);
//commandLine.addArgument("-debug-level", false); //commandLine.addArgument("-debug-level=10", false);
//commandLine.addArgument("10", false);
if (verbose) { if (verbose) {
commandLine.addArgument("-verbose", false); commandLine.addArgument("-verbose", false);
@ -260,7 +251,7 @@ public class Compiler implements MessageConsumer {
} }
} }
protected void size(PreferencesMap prefs) throws RunnerException { private void size(PreferencesMap prefs) throws RunnerException {
String maxTextSizeString = prefs.get("upload.maximum_size"); String maxTextSizeString = prefs.get("upload.maximum_size");
String maxDataSizeString = prefs.get("upload.maximum_data_size"); String maxDataSizeString = prefs.get("upload.maximum_data_size");
@ -310,7 +301,7 @@ public class Compiler implements MessageConsumer {
} }
} }
void saveHex(PreferencesMap prefs) throws RunnerException { private void saveHex(PreferencesMap prefs) throws RunnerException {
List<String> compiledSketches = new ArrayList<>(prefs.subTree("recipe.output.tmp_file", 1).values()); List<String> compiledSketches = new ArrayList<>(prefs.subTree("recipe.output.tmp_file", 1).values());
List<String> copyOfCompiledSketches = new ArrayList<>(prefs.subTree("recipe.output.save_file", 1).values()); List<String> copyOfCompiledSketches = new ArrayList<>(prefs.subTree("recipe.output.save_file", 1).values());
@ -365,19 +356,15 @@ public class Compiler implements MessageConsumer {
return (compiledSketches.isEmpty() || copyOfCompiledSketches.isEmpty() || copyOfCompiledSketches.size() < compiledSketches.size()) && (!prefs.containsKey("recipe.output.tmp_file") || !prefs.containsKey("recipe.output.save_file")); return (compiledSketches.isEmpty() || copyOfCompiledSketches.isEmpty() || copyOfCompiledSketches.size() < compiledSketches.size()) && (!prefs.containsKey("recipe.output.tmp_file") || !prefs.containsKey("recipe.output.save_file"));
} }
void runActions(String recipeClass, PreferencesMap prefs) throws RunnerException, PreferencesMapException { private void runActions(String recipeClass, PreferencesMap prefs) throws RunnerException, PreferencesMapException {
List<String> patterns = new ArrayList<>(); List<String> patterns = prefs.keySet().stream().filter(key -> key.startsWith("recipe." + recipeClass) && key.endsWith(".pattern")).collect(Collectors.toList());
for (String key : prefs.keySet()) {
if (key.startsWith("recipe." + recipeClass) && key.endsWith(".pattern"))
patterns.add(key);
}
Collections.sort(patterns); Collections.sort(patterns);
for (String recipe : patterns) { for (String recipe : patterns) {
runRecipe(recipe, prefs); runRecipe(recipe, prefs);
} }
} }
void runRecipe(String recipe, PreferencesMap prefs) throws RunnerException, PreferencesMapException { private void runRecipe(String recipe, PreferencesMap prefs) throws RunnerException, PreferencesMapException {
PreferencesMap dict = new PreferencesMap(prefs); PreferencesMap dict = new PreferencesMap(prefs);
dict.put("ide_version", "" + BaseNoGui.REVISION); dict.put("ide_version", "" + BaseNoGui.REVISION);
dict.put("sketch_path", sketch.getFolder().getAbsolutePath()); dict.put("sketch_path", sketch.getFolder().getAbsolutePath());
@ -394,7 +381,7 @@ public class Compiler implements MessageConsumer {
private void exec(String[] command) throws RunnerException { private void exec(String[] command) throws RunnerException {
// eliminate any empty array entries // eliminate any empty array entries
List<String> stringList = new ArrayList<String>(); List<String> stringList = new ArrayList<>();
for (String string : command) { for (String string : command) {
string = string.trim(); string = string.trim();
if (string.length() != 0) if (string.length() != 0)
@ -582,9 +569,9 @@ public class Compiler implements MessageConsumer {
System.err.println(s); System.err.println(s);
} }
public RunnerException placeException(String message, private RunnerException placeException(String message,
String dotJavaFilename, String dotJavaFilename,
int dotJavaLine) { int dotJavaLine) {
// Placing errors is simple, because we inserted #line directives // Placing errors is simple, because we inserted #line directives
// into the preprocessed source. The compiler gives us correct // into the preprocessed source. The compiler gives us correct
// the file name and line number. :-) // the file name and line number. :-)