rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-13 10:29:35 +01:00
Code Issues Releases Activity

Slightly refactored tool resolution

Browse Source 
This helps the understanding of next commits
This commit is contained in:
Cristian Maglie 2016-08-02 14:57:42 +02:00
parent 3b57462281
commit 4f1b584e71
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,16 +164,20 @@ public class BaseNoGui {
prefs.put("name", extendedName);
// Resolve tools needed for this board
List<ContributedTool> requiredTools = new ArrayList<>();
// Add all tools dependencies specified in package index
ContributedPlatform platform = indexer.getContributedPlaform(getTargetPlatform());
if (platform != null) {
String prefix = "runtime.tools.";
for (ContributedTool tool : platform.getResolvedTools()) {
File folder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder();
String toolPath = folder.getAbsolutePath();
prefs.put(prefix + tool.getName() + ".path", toolPath);
PreferencesData.set(prefix + tool.getName() + ".path", toolPath);
PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", toolPath);
}
if (platform != null)
requiredTools.addAll(platform.getResolvedTools());
String prefix = "runtime.tools.";
for (ContributedTool tool : requiredTools) {
File folder = tool.getDownloadableContribution(getPlatform()).getInstalledFolder();
String toolPath = folder.getAbsolutePath();
prefs.put(prefix + tool.getName() + ".path", toolPath);
PreferencesData.set(prefix + tool.getName() + ".path", toolPath);
PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", toolPath);
}
return prefs;
}