#1411 take the packager into account when installing a platform

Author: jantje

io.sloeber.core/src/io/sloeber/core/api/BoardsManager.java

@@ -212,20 +212,63 @@ public static void installLatestPlatform(String JasonName, String packageName, S
 
     @SuppressWarnings("nls")
     private static IStatus install(ArduinoPlatformVersion platformVersion, IProgressMonitor monitor) {
+        boolean forceDownload = false;
         String name = platformVersion.getName();
         String architecture = platformVersion.getArchitecture();
         String version = platformVersion.getVersion().toString();
         // Check if we're installed already
         if (platformVersion.isInstalled()) {
-            System.out.println("reusing platform " + name + " " + architecture + "(" + version + ")");
+            System.out.println("reusing platform " + name + " " + architecture + "(" + version + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
             return Status.OK_STATUS;
         }
 
         // Download platform archive
-        System.out.println("start installing platform " + name + " " + architecture + "(" + version + ")");
-        IStatus ret = BoardsManager.downloadAndInstall(platformVersion, false, monitor);
-        System.out.println("done installing platform " + name + " " + architecture + "(" + version + ")");
-        return ret;
+        System.out.println("start installing platform " + name + " " + architecture + "(" + version + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
+        MyMultiStatus mstatus = new MyMultiStatus("Failed to install " + platformVersion.getName()); //$NON-NLS-1$
+        mstatus.addErrors(PackageManager.downloadAndInstall(platformVersion, forceDownload, monitor));
+        if (!mstatus.isOK()) {
+            // no use installing tools when the boards failed installing
+            return mstatus;
+        }
+
+        //keep a copy of the json file used at install
+        File packageFile = platformVersion.getParent().getParent().getPackageIndex().getJsonFile();
+        File copyToFile = platformVersion.getInstallPath().append(packageFile.getName()).toFile();
+        try {
+            Files.copy(packageFile.toPath(), copyToFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        ArduinoPackage referencingPkg = platformVersion.getParent().getParent();
+        for (ArduinoPlatformTooldDependency toolDependency : platformVersion.getToolsDependencies()) {
+            //TODO make sure that tools from other providers are installed
+            ArduinoPackage pkg = referencingPkg;
+            ArduinoPlatformToolVersion tool = pkg.getTool(toolDependency.getName(), toolDependency.getVersion());
+            if (tool == null) {
+                //maybe these are referenced tools
+                pkg = getPackageByProvider(toolDependency.getPackager());
+                if (pkg != null) {
+                    tool = pkg.getTool(toolDependency.getName(), toolDependency.getVersion());
+                }
+            }
+            if (tool == null) {
+                mstatus.add(new Status(IStatus.ERROR, Activator.getId(),
+                        Messages.Tool_no_valid_system.replace(Messages.KEY_TAG, toolDependency.getName())));
+            } else if (!tool.isInstalled()) {
+                ArduinoInstallable installable = tool.getInstallable();
+                if (installable != null) {
+                    monitor.setTaskName(InstallProgress.getRandomMessage());
+                    mstatus.addErrors(PackageManager.downloadAndInstall(installable, forceDownload, monitor));
+                }
+            }
+        }
+
+        WorkAround.applyKnownWorkArounds(platformVersion);
+
+        System.out.println("done installing platform " + name + " " + architecture + "(" + version + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+        return mstatus;
     }
 
     public static void addPrivateHardwarePath(String newHardwarePath) {
@@ -590,11 +633,10 @@ private static Map<String, String> getEnvVarPlatformFileTools(ArduinoPlatformVer
         ArduinoPackage pkg = platformVersion.getParent().getParent();
         for (ArduinoPlatformTooldDependency tool : platformVersion.getToolsDependencies()) {
             ArduinoPlatformTool theTool = pkg.getTool(tool.getName());
-            for (ArduinoPlatformToolVersion curToolVersion : theTool.getVersions()) {
-                if (curToolVersion.isInstalled()) {
-                    vars.putAll(curToolVersion.getEnvVars(true));
-
-                }
+            if (theTool == null) {
+                System.err.println("Did not find " + tool.getName() + " in package with ID " + pkg.getID()); //$NON-NLS-1$ //$NON-NLS-2$
+            } else {
+                vars.putAll(theTool.getEnvVars(null));
             }
         }
         return vars;
@@ -660,7 +702,7 @@ public static synchronized void startup_Pluging(IProgressMonitor monitor) {
             if (platform == null) {
                 status = new Status(IStatus.ERROR, Activator.getId(), Messages.No_Platform_available);
             } else {
-                status = downloadAndInstall(platform.getNewestVersion(), false, monitor);
+                status = install(platform.getNewestVersion(), monitor);
             }
 
             if (!status.isOK()) {
@@ -673,48 +715,6 @@ public static synchronized void startup_Pluging(IProgressMonitor monitor) {
 
     }
 
-    private static IStatus downloadAndInstall(ArduinoPlatformVersion platformVersion, boolean forceDownload,
-            IProgressMonitor monitor) {
-        MyMultiStatus mstatus = new MyMultiStatus("Failed to install " + platformVersion.getName()); //$NON-NLS-1$
-        mstatus.addErrors(PackageManager.downloadAndInstall(platformVersion, forceDownload, monitor));
-        if (!mstatus.isOK()) {
-            // no use going on installing tools if the boards failed installing
-            return mstatus;
-        }
-
-        //keep a copy of the json file used at install
-        File packageFile = platformVersion.getParent().getParent().getPackageIndex().getJsonFile();
-        File copyToFile = platformVersion.getInstallPath().append(packageFile.getName()).toFile();
-        try {
-            Files.copy(packageFile.toPath(), copyToFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        if (platformVersion.getToolsDependencies() != null) {
-            ArduinoPackage pkg = platformVersion.getParent().getParent();
-            if (pkg == null) {
-                return null;
-            }
-            for (ArduinoPlatformTooldDependency toolDependency : platformVersion.getToolsDependencies()) {
-                ArduinoPlatformToolVersion tool = pkg.getTool(toolDependency.getName(), toolDependency.getVersion());
-                if (tool == null) {
-                    mstatus.add(new Status(IStatus.ERROR, Activator.getId(),
-                            Messages.Tool_no_valid_system.replace(Messages.KEY_TAG, toolDependency.getName())));
-                } else if (!tool.isInstalled()) {
-                    ArduinoInstallable installable = tool.getInstallable();
-                    if (installable != null) {
-                        monitor.setTaskName(InstallProgress.getRandomMessage());
-                        mstatus.addErrors(PackageManager.downloadAndInstall(installable, forceDownload, monitor));
-                    }
-                }
-            }
-        }
-
-        WorkAround.applyKnownWorkArounds(platformVersion);
-        return mstatus;
-    }
-
     synchronized static public List<ArduinoPlatformPackageIndex> getPackageIndices() {
         if (packageIndices == null) {
             loadJsons(false);
@@ -878,4 +878,15 @@ public static ArduinoPlatformVersion getPlatform(String vendor, String architect
         return null;
     }
 
+    public static ArduinoPackage getPackageByProvider(String packager) {
+        for (ArduinoPlatformPackageIndex index : getPackageIndices()) {
+            for (ArduinoPackage pkg : index.getPackages()) {
+                if (packager.equals(pkg.getID())) {
+                    return pkg;
+                }
+            }
+        }
+        return null;
+    }
+
 }

io.sloeber.core/src/io/sloeber/core/api/Json/ArduinoPlatformTooldDependency.java

@@ -1,16 +1,21 @@
 package io.sloeber.core.api.Json;
 
 import static io.sloeber.core.Gson.GsonConverter.*;
+import static io.sloeber.core.common.Const.*;
+
+import org.eclipse.core.runtime.IPath;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 
 import io.sloeber.core.api.VersionNumber;
+import io.sloeber.core.common.ConfigurationPreferences;
 
 public class ArduinoPlatformTooldDependency {
 
     private String myName;
+    private String myPackager;
     private VersionNumber myVersion;
 
     private transient ArduinoPlatformVersion myParentPlatform;
@@ -22,18 +27,28 @@ public ArduinoPlatformTooldDependency(JsonElement json, ArduinoPlatformVersion a
         try {
 
             myName = getSafeString(jsonObject, "name");
+            myPackager = getSafeString(jsonObject, "packager");
             myVersion = getSafeVersion(jsonObject, "version");
         } catch (Exception e) {
             throw new JsonParseException("failed to parse json  " + e.getMessage());
         }
     }
 
     public String getName() {
-        return this.myName;
+        return myName;
     }
 
     public VersionNumber getVersion() {
         return myVersion;
     }
 
+    public String getPackager() {
+        return myPackager;
+    }
+
+    public IPath getInstallPath() {
+        return ConfigurationPreferences.getInstallationPathPackages().append(myPackager).append(TOOLS).append(myName)
+                .append(myVersion.toString());
+
+    }
 }