Skip to content

Allow Pluggable Discovery recipes to use {runtime.platform.path} #9645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2020
Merged

Allow Pluggable Discovery recipes to use {runtime.platform.path} #9645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions arduino-core/src/cc/arduino/packages/DiscoveryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.io.File;

import cc.arduino.packages.discoverers.PluggableDiscovery;
import cc.arduino.packages.discoverers.serial.SerialDiscovery;
Expand Down Expand Up @@ -65,6 +66,10 @@ public DiscoveryManager(Map<String, TargetPackage> packages) {
for (TargetPlatform platform: targetPackage.getPlatforms().values()) {
//System.out.println("installed: "+platform);
PreferencesMap prefs = platform.getPreferences().subTree("discovery");
PreferencesMap pathPrefs = new PreferencesMap();
File platformFolder = platform.getFolder();
pathPrefs.put("runtime.platform.path", platformFolder.getAbsolutePath());
pathPrefs.put("runtime.hardware.path", platformFolder.getParentFile().getAbsolutePath());
for (String discoveryName : prefs.firstLevelMap().keySet()) {
PreferencesMap discoveryPrefs = prefs.subTree(discoveryName);

Expand All @@ -76,9 +81,11 @@ public DiscoveryManager(Map<String, TargetPackage> packages) {
try {
if (PreferencesData.getBoolean("discovery.debug")) {
System.out.println("found discovery: " + discoveryName + " -> " + pattern);
System.out.println("with pathnames -> " + pathPrefs);
System.out.println("with preferencess -> " + discoveryPrefs);
}
pattern = StringReplacer.replaceFromMapping(pattern, PreferencesData.getMap());
pattern = StringReplacer.replaceFromMapping(pattern, pathPrefs);
String[] cmd = StringReplacer.formatAndSplit(pattern, discoveryPrefs);
discoverers.add(new PluggableDiscovery(discoveryName, cmd));
} catch (Exception e) {
Expand Down