#1339 boardsmanager now has a platform and platform version

regression testing works
Sloeber · Nov 25, 2021 · c5154a7 · c5154a7
1 parent 1fd4470
commit c5154a7
Show file tree

Hide file tree

Showing 48 changed files with 1,262 additions and 1,191 deletions.
diff --git a/io.sloeber.core/META-INF/MANIFEST.MF b/io.sloeber.core/META-INF/MANIFEST.MF
@@ -33,7 +33,6 @@ Export-Package: cc.arduino.packages;x-internal:=true,
  io.sloeber.core;x-friends:="io.sloeber.tests",
  io.sloeber.core.api,
  io.sloeber.core.api.Json,
- io.sloeber.core.api.Json.packages,
  io.sloeber.core.builder;x-internal:=true,
  io.sloeber.core.common;x-friends:="io.sloeber.tests",
  io.sloeber.core.communication;x-internal:=true,

diff --git a/io.sloeber.core/src/io/sloeber/core/Activator.java b/io.sloeber.core/src/io/sloeber/core/Activator.java
@@ -41,13 +41,14 @@
 import org.osgi.service.prefs.Preferences;
 
 import cc.arduino.packages.discoverers.SloeberNetworkDiscovery;
-import io.sloeber.core.api.PackageManager;
+import io.sloeber.core.api.BoardsManager;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.ConfigurationPreferences;
 import io.sloeber.core.common.InstancePreferences;
 import io.sloeber.core.listeners.ConfigurationChangeListener;
 import io.sloeber.core.listeners.IndexerListener;
 import io.sloeber.core.listeners.resourceChangeListener;
+import io.sloeber.core.tools.PackageManager;
 
 /**
  * generated code
@@ -213,7 +214,7 @@ private static void initializeImportantVariables() {
         InstancePreferences.setPrivateLibraryPaths(InstancePreferences.getPrivateLibraryPaths());
         InstancePreferences.setPrivateHardwarePaths(InstancePreferences.getPrivateHardwarePaths());
         InstancePreferences.setAutomaticallyImportLibraries(InstancePreferences.getAutomaticallyImportLibraries());
-        PackageManager.setJsonURLs(PackageManager.getJsonURLs());
+        BoardsManager.setJsonURLs(BoardsManager.getJsonURLs());
     }
 
     private void runPluginCoreStartInstantiatorJob() {
@@ -251,7 +252,7 @@ protected IStatus run(IProgressMonitor monitor) {
 
                 installOtherStuff();
 
-                PackageManager.startup_Pluging(monitor);
+                BoardsManager.startup_Pluging(monitor);
 
                 monitor.setTaskName("Done!");
                 if (InstancePreferences.useBonjour()) {

diff --git a/io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java b/io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java
@@ -22,7 +22,8 @@
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 
-import io.sloeber.core.api.Json.packages.ArduinoPlatform;
+import io.sloeber.core.api.Json.ArduinoPlatform;
+import io.sloeber.core.api.Json.ArduinoPlatformVersion;
 import io.sloeber.core.common.Common;
 import io.sloeber.core.common.ConfigurationPreferences;
 import io.sloeber.core.tools.Helpers;
@@ -193,8 +194,13 @@ private void ParseSection() {
                 String refVendor = valueSplit[0];
                 String actualValue = valueSplit[1];
                 myBoardsCore = actualValue;
-                myReferencedCorePlatformPath = PackageManager.getPlatformInstallPath(refVendor, architecture);
-                if (this.myReferencedCorePlatformPath == null) {
+                ArduinoPlatform platform = BoardsManager.getPlatform(refVendor, architecture);
+                ArduinoPlatformVersion platformVersion = null;
+                platformVersion = platform.getNewestInstalled();
+                if (platformVersion != null) {
+                    myReferencedCorePlatformPath = platformVersion.getInstallPath();
+                }
+                if (myReferencedCorePlatformPath == null) {
                     Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
                             Helpers_tool_reference_missing.replace(TOOL_TAG, core)
                                     .replace(FILE_TAG, getReferencingBoardsFile().toString())
@@ -207,8 +213,11 @@ private void ParseSection() {
                 VersionNumber refVersion = new VersionNumber(valueSplit[2]);
                 String actualValue = valueSplit[3];
                 myBoardsCore = actualValue;
-                myReferencedCorePlatformPath = PackageManager.getPlatformInstallPath(refVendor, refArchitecture,
+                ArduinoPlatformVersion platformVersion = BoardsManager.getPlatform(refVendor, refArchitecture,
                         refVersion);
+                if (platformVersion != null) {
+                    myReferencedCorePlatformPath = platformVersion.getInstallPath();
+                }
                 if (this.myReferencedCorePlatformPath == null) {
                     Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
                             Helpers_tool_reference_missing.replace(TOOL_TAG, core)
@@ -226,7 +235,7 @@ private void ParseSection() {
                 String refVendor = valueSplit[0];
                 String actualValue = valueSplit[1];
                 this.myBoardsVariant = actualValue;
-                this.myReferencedBoardVariantPlatformPath = PackageManager.getPlatformInstallPath(refVendor,
+                this.myReferencedBoardVariantPlatformPath = BoardsManager.getPlatformInstallPath(refVendor,
                         architecture);
                 if (this.myReferencedBoardVariantPlatformPath == null) {
                     Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
@@ -242,10 +251,10 @@ private void ParseSection() {
                 String actualValue = valueSplit[3];
                 this.myBoardsVariant = actualValue;
                 if ("*".equals(refVersion)) { //$NON-NLS-1$
-                    this.myReferencedBoardVariantPlatformPath = PackageManager.getPlatformInstallPath(refVendor,
+                    this.myReferencedBoardVariantPlatformPath = BoardsManager.getPlatformInstallPath(refVendor,
                             refArchitecture);
                 } else {
-                    this.myReferencedBoardVariantPlatformPath = PackageManager.getPlatformInstallPath(refVendor,
+                    this.myReferencedBoardVariantPlatformPath = BoardsManager.getPlatformInstallPath(refVendor,
                             refArchitecture, refVersion);
                 }
                 if (this.myReferencedBoardVariantPlatformPath == null) {
@@ -265,8 +274,7 @@ private void ParseSection() {
                 String refVendor = valueSplit[0];
                 String actualValue = valueSplit[1];
                 this.myUploadTool = actualValue;
-                this.myReferencedUploadToolPlatformPath = PackageManager.getPlatformInstallPath(refVendor,
-                        architecture);
+                this.myReferencedUploadToolPlatformPath = BoardsManager.getPlatformInstallPath(refVendor, architecture);
                 if (this.myReferencedUploadToolPlatformPath == null) {
                     Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
                             Helpers_tool_reference_missing.replace(TOOL_TAG, upload)
@@ -280,7 +288,7 @@ private void ParseSection() {
                 VersionNumber refVersion = new VersionNumber(valueSplit[2]);
                 String actualValue = valueSplit[3];
                 this.myUploadTool = actualValue;
-                this.myReferencedUploadToolPlatformPath = PackageManager.getPlatformInstallPath(refVendor,
+                this.myReferencedUploadToolPlatformPath = BoardsManager.getPlatformInstallPath(refVendor,
                         refArchitecture, refVersion);
                 if (this.myReferencedUploadToolPlatformPath == null) {
                     Common.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
@@ -668,7 +676,12 @@ public IPath getreferencedHardwarePath() {
      */
     public IPath getArduinoPlatformPath() {
         updateWhenDirty();
-        return PackageManager.getPlatformInstallPath(VendorArduino, getArchitecture());
+        ArduinoPlatform platform = BoardsManager.getPlatform(VendorArduino, getArchitecture());
+        if (platform == null) {
+            return null;
+        }
+        ArduinoPlatformVersion platformVersion = platform.getNewestInstalled();
+        return platformVersion.getInstallPath();
     }
 
     /**
@@ -892,8 +905,8 @@ private Map<String, String> getEnVarPlatformInfo() {
             return new HashMap<>();
         }
 
-        ArduinoPlatform referencingPlatform = PackageManager.getPlatform(referencingPlatformPath);
-        ArduinoPlatform referencedPlatform = PackageManager.getPlatform(referencedPlatformPath);
+        ArduinoPlatformVersion referencingPlatform = BoardsManager.getPlatform(referencingPlatformPath);
+        ArduinoPlatformVersion referencedPlatform = BoardsManager.getPlatform(referencedPlatformPath);
 
         boolean jsonBasedPlatformManagement = !Preferences.getUseArduinoToolSelection();
         if (jsonBasedPlatformManagement) {