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

Pass runtime tools to arduino-builder

Browse Source
This commit is contained in:
Martino Facchin 2016-08-02 12:53:49 +02:00 committed by Cristian Maglie
parent fa0678f5b7
commit 6f24fa6cec
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@ import java.nio.file.StandardCopyOption;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -235,6 +236,12 @@ public class Compiler implements MessageConsumer {
commandLine.addArgument("-prefs=build.warn_data_percentage=" + PreferencesData.get("build.warn_data_percentage")); commandLine.addArgument("-prefs=build.warn_data_percentage=" + PreferencesData.get("build.warn_data_percentage"));
for (Map.Entry<String, String> entry : BaseNoGui.getBoardPreferences().entrySet()) {
if (entry.getKey().startsWith("runtime.tools")) {
commandLine.addArgument("-prefs=" + entry.getKey() + "=" + entry.getValue());
}
}
//commandLine.addArgument("-debug-level=10", false); //commandLine.addArgument("-debug-level=10", false);
if (verbose) { if (verbose) {

1
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -169,6 +169,7 @@ public class BaseNoGui {
for (ContributedTool tool : platform.getResolvedTools()) { for (ContributedTool tool : platform.getResolvedTools()) {
File folder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder(); File folder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder();
String toolPath = folder.getAbsolutePath(); String toolPath = folder.getAbsolutePath();
prefs.put(prefix + tool.getName() + ".path", toolPath);
PreferencesData.set(prefix + tool.getName() + ".path", toolPath); PreferencesData.set(prefix + tool.getName() + ".path", toolPath);
PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", toolPath); PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", toolPath);
} }