Implementing targetTools and targetTool manager partial checkin

jantje · jantje · commit 18f9b8235756 · 2023-12-31T15:28:20.000+01:00
Checking in for move systems
diff --git a/io.sloeber.autoBuild.test/launch/Autobuild CreateBasicProjects.launch b/io.sloeber.autoBuild.test/launch/Autobuild CreateBasicProjects.launch
@@ -22,7 +22,6 @@
     </listAttribute>
     <mapAttribute key="org.eclipse.debug.core.environmentVariables">
         <mapEntry key="MAKE_HOME" value="E:\platform\arduinoPlugin\tools\make\"/>
-        <mapEntry key="PATH" value="E:\platform\arduinoPlugin\packages\Jantje\tools\MinGW\5.3.0\bin;E:\LLVM\bin"/>
     </mapAttribute>
     <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
     <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="true"/>
diff --git a/io.sloeber.autoBuild.test/launch/AutobuildCreateProject.launch b/io.sloeber.autoBuild.test/launch/AutobuildCreateProject.launch
@@ -22,7 +22,6 @@
     </listAttribute>
     <mapAttribute key="org.eclipse.debug.core.environmentVariables">
         <mapEntry key="MAKE_HOME" value="E:\platform\arduinoPlugin\tools\make\"/>
-        <mapEntry key="PATH" value="E:\platform\arduinoPlugin\packages\Jantje\tools\MinGW\5.3.0\bin;E:\LLVM\bin"/>
     </mapAttribute>
     <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
     <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="true"/>
diff --git a/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateBasicProjects.java b/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateBasicProjects.java
@@ -26,7 +26,7 @@
 import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
 import io.sloeber.autoBuild.api.ICodeProvider;
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
+import io.sloeber.autoBuild.api.ITargetToolManager;
 import io.sloeber.autoBuild.extensionPoint.providers.AutoBuildCommon;
 import io.sloeber.autoBuild.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
@@ -41,7 +41,7 @@ public class CreateBasicProjects {
     private boolean doTestDefaultBuilder = true;
     private boolean doTestInternalBuilder = true;
     private boolean doTestMakeBuilder = true;
-    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
+    static IToolProvider toolprovider = ITargetToolManager.getDefault().getAnyInstalledToolProvider();
 
     @BeforeAll
     static void beforeAll() {
diff --git a/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateProject.java b/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateProject.java
@@ -11,7 +11,7 @@
 import io.sloeber.autoBuild.api.AutoBuildProject;
 import io.sloeber.autoBuild.api.ICodeProvider;
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
+import io.sloeber.autoBuild.api.ITargetToolManager;
 import io.sloeber.autoBuild.extensionPoint.providers.AutoBuildCommon;
 import io.sloeber.autoBuild.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
@@ -27,7 +27,7 @@
 
 @SuppressWarnings("nls")
 class CreateProject {
-    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
+    static IToolProvider toolprovider = ITargetToolManager.getDefault().getAnyInstalledToolProvider();
 
     @BeforeAll
     static void beforeAll() {
diff --git a/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/issues.java b/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/issues.java
@@ -21,13 +21,13 @@
 
 import io.sloeber.autoBuild.api.AutoBuildProject;
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
+import io.sloeber.autoBuild.api.ITargetToolManager;
 import io.sloeber.autoBuild.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
 
 @SuppressWarnings({ "nls", "static-method" })
 public class issues {
-    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
+    static IToolProvider toolprovider = ITargetToolManager.getDefault().getAnyInstalledToolProvider();
 
     @BeforeAll
     public static void beforeAll() {
diff --git a/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/regression.java b/io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/regression.java
@@ -29,7 +29,7 @@
 import io.sloeber.autoBuild.api.AutoBuildProject;
 import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
+import io.sloeber.autoBuild.api.ITargetToolManager;
 import io.sloeber.autoBuild.extensionPoint.providers.MakeRule;
 import io.sloeber.autoBuild.extensionPoint.providers.MakeRules;
 import io.sloeber.autoBuild.helpers.Shared;
@@ -42,7 +42,7 @@
 public class regression {
     static private String extensionPointID = "io.sloeber.autoBuild.buildDefinitions";
     static int testCounter = 1;
-    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
+    static IToolProvider toolprovider = ITargetToolManager.getDefault().getAnyInstalledToolProvider();
 
     @BeforeAll
     public static void beforeAll() {
diff --git a/io.sloeber.autoBuild.test/src/io/sloeber/autoBuilld/investigate/CConfigurationDescriptionInvestigation.java b/io.sloeber.autoBuild.test/src/io/sloeber/autoBuilld/investigate/CConfigurationDescriptionInvestigation.java
@@ -17,7 +17,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import io.sloeber.autoBuild.api.AutoBuildProject;
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
+import io.sloeber.autoBuild.api.ITargetToolManager;
 import io.sloeber.autoBuild.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
 
@@ -39,7 +39,7 @@ static void beforeAll() {
     public void testConfigDescription() {
         beforeAll();
         String projectName = "testConfigDescription";
-        IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
+        IToolProvider toolprovider = ITargetToolManager.getDefault().getAnyInstalledToolProvider();
         IProject testProject = AutoBuildProject.createProject(projectName, defaultExtensionPointID, defaultExtensionID,
                 defaultProjectTypeID, defaultNatureID, new TemplateTestCodeProvider("exe"), toolprovider, false, null);
         ICProjectDescription projectDesc = CoreModel.getDefault().getProjectDescription(testProject, true);
diff --git a/io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewAutoBuildProjectWizard.java b/io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewAutoBuildProjectWizard.java
@@ -27,7 +27,7 @@
 import io.sloeber.autoBuild.api.AutoBuildProject;
 import io.sloeber.autoBuild.api.ICodeProvider;
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
+import io.sloeber.autoBuild.api.ITargetToolManager;
 import io.sloeber.autoBuild.integration.AutoBuildManager;
 import io.sloeber.autoBuild.integration.AutoBuildProjectGenerator;
 import io.sloeber.autoBuild.ui.internal.Messages;
@@ -45,7 +45,7 @@ public boolean performFinish() {
                     .toArray(new String[10])[0];
             String natureID = CCProjectNature.CC_NATURE_ID;
             ICodeProvider codeProvider = null;
-            IToolProvider toolProvider = IToolProviderManager.getDefault().getAnyToolProvider();
+            IToolProvider toolProvider = ITargetToolManager.getDefault().getAnyInstalledToolProvider();
             getContainer().run(true, true, new WorkspaceModifyOperation() {
                 @Override
                 protected void execute(IProgressMonitor monitor)
diff --git a/io.sloeber.autoBuild/OSGI-INF/l10n/bundle.properties b/io.sloeber.autoBuild/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,8 @@
 #Properties file for io.sloeber.core
 
+
+minGWToolProviderName=MinGW tool provider
+
 autoBuild.configuration.name = Release
 inputType.archiver.name = OBJ Files to archive
 inputType.Asembly.name = Assembly source files
@@ -31,15 +34,20 @@ autoBuild.outputType.S.exe.name = Object Files ( from assembly to executable)
 autoBuild.projectType.name = Compound executable project
 autoBuild.tooolChain.name = Compound Toolchain
 autoBuild.builder.name = Auto Build Builder
-autoBuild.tool.gcc.compiler = GNU C file compiler
+
+autoBuild.tool.archiver = GNU archiver
+autoBuild.tool.assembler = GNU assembler
+
+
 autoBuild.tool.gpp.compiler = GNU C++ file compiler
-autoBuild.tool.gpp.linker.staticLib = GNU linker for static libs
-autoBuild.tool.cpp.linker.dynamic.Lib = GNU C++ linker for dynamic libraries
-autoBuild.tool.c.linker.dynamic.Lib = GNU C linker for dynamic libraries
+autoBuild.tool.gpp.linker.staticLib = GNU C++ linker for static libs
+autoBuild.tool.gpp.linker.dynamic.Lib = GNU C++ linker for dynamic libraries
 autoBuild.tool.gpp.linker.exe = GNU C++ linker for executables
+
+autoBuild.tool.gcc.compiler = GNU C file compiler
+autoBuild.tool.gcc.linker.staticLib = GNU C linker for static libs
+autoBuild.tool.gcc.linker.dynamic.Lib = GNU C linker for dynamic libraries
 autoBuild.tool.gcc.linker.exe = GNU C linker for executables
-autoBuild.tool.gcc.archiver = GNU archiver
-autoBuild.tool.gcc.assembler = GNU assembler
 
 
 cross.gnu.toolChain.name = Cross GCC
diff --git a/io.sloeber.autoBuild/plugin.xml b/io.sloeber.autoBuild/plugin.xml
@@ -214,7 +214,8 @@
            id="cdt.autobuild.tool.assembler"
            name="%ToolName.assembler"
            natureFilter="both"
-           outputFlag="-o">
+           outputFlag="-o"
+           toolType="a-&gt;a.o">
         <optionCategory
               id="gnu.asm.category.general"
               name="%OptionCategory.General"
@@ -269,7 +270,8 @@
            id="cdt.autobuild.tool.c.compiler"
            name="%ToolName.compiler.c"
            natureFilter="both"
-           outputFlag="-o">
+           outputFlag="-o"
+           toolType="c-&gt;c.o">
         <optionCategory
               id="gnu.c.compiler.category.dialect"
               name="%OptionCategory.Dialect"
@@ -809,7 +811,8 @@
            id="cdt.autobuild.tool.cpp.compiler"
            name="%ToolName.compiler.cpp"
            natureFilter="ccnature"
-           outputFlag="-o">
+           outputFlag="-o"
+           toolType="cpp-&gt;cpp.o">
         <optionCategory
               id="gnu.cpp.compiler.category.dialect"
               name="%OptionCategory.Dialect"
@@ -1395,7 +1398,8 @@
            errorParsers="org.eclipse.cdt.core.GLDErrorParser"
            id="cdt.autobuild.tool.cpp.exe.linker"
            name="%ToolName.exe.linker.cpp"
-           outputFlag="-o">
+           outputFlag="-o"
+           toolType="cpp.o-&gt;exe">
         <optionCategory
               id="gnu.cpp.link.category.options"
               name="%OptionCategory.General"
@@ -1547,7 +1551,8 @@
            name="%ToolName.dynamic.lib.linker.cpp"
            natureFilter="ccnature"
            outputFlag="-o"
-           superClass="cdt.autobuild.tool.cpp.exe.linker">
+           superClass="cdt.autobuild.tool.cpp.exe.linker"
+           toolType="cpp.o-&gt;so/dll">
         <option
               category="gnu.c.link.category.shared"
               command="-shared"
@@ -1582,7 +1587,8 @@
            id="cdt.autobuild.tool.c.exe.linker"
            name="%ToolName.exe.linker.c"
            natureFilter="cnature"
-           outputFlag="-o">
+           outputFlag="-o"
+           toolType="c.o-&gt;exe">
         <optionCategory
               id="gnu.c.link.category.general"
               name="%OptionCategory.General"
@@ -1739,7 +1745,8 @@
            command="ar"
            id="cdt.autobuild.tool.archiver"
            name="%ToolName.archiver"
-           natureFilter="both">
+           natureFilter="both"
+           toolType="o-&gt;ar">
         <optionCategory
               id="gnu.lib.category.general"
               name="%OptionCategory.General"
@@ -1774,7 +1781,8 @@
      <tool
            id="cdt.autobuild.tool.c.dynamic.lib.linker"
            name="%ToolName.dynamic.lib.linker.c"
-           superClass="cdt.autobuild.tool.c.exe.linker">
+           superClass="cdt.autobuild.tool.c.exe.linker"
+           toolType="c.o-&gt;so/dll">
         <outputType
               id="cdt.autobuild.tool.dynamic.lib.c.linker.output.so"
               superClass="cdt.autobuild.tool.dynamic.lib.cpp.linker.output.so">
@@ -1891,9 +1899,10 @@
      </builder>
   </toolChain>
   <ToolProvider
-        id="io.sloeber.autoBuild.ToolProvider.Path"
-        name="Path Tool Provider"
-        toolProvider="io.sloeber.autoBuild.Internal.PathToolProvider">
+        Description="A tool provider for MinGW"
+        id="io.sloeber.autoBuild.ToolProvider.minGW"
+        name="%minGWToolProviderName"
+        toolProvider="io.sloeber.autoBuild.Internal.MinGWToolProvider">
   </ToolProvider>
 
 	</extension>
diff --git a/io.sloeber.autoBuild/schema/buildDefinitions.exsd b/io.sloeber.autoBuild/schema/buildDefinitions.exsd
@@ -385,7 +385,7 @@ Not this can be overruled by command and false command in case of a boolean
                </restriction>
             </simpleType>
          </attribute>
-         <attribute name="tool type">
+         <attribute name="toolType">
             <annotation>
                <documentation>
                   The type of tool.
@@ -394,15 +394,21 @@ When the type of tool is specified and a tool provider is specified;  the comman
             </annotation>
             <simpleType>
                <restriction base="string">
-                  <enumeration value="a->o">
+                  <enumeration value="a->a.o">
                   </enumeration>
-                  <enumeration value="c(pp)->o">
+                  <enumeration value="cpp->cpp.o">
+                  </enumeration>
+                  <enumeration value="c->c.o">
+                  </enumeration>
+                  <enumeration value="c.o->so/dll">
+                  </enumeration>
+                  <enumeration value="cpp.o->so/dll">
                   </enumeration>
                   <enumeration value="o->ar">
                   </enumeration>
-                  <enumeration value="o->so/dll">
+                  <enumeration value="c.o->exe">
                   </enumeration>
-                  <enumeration value="o->exe">
+                  <enumeration value="cpp.o->exe">
                   </enumeration>
                </restriction>
             </simpleType>
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/Internal/MinGWToolProvider.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/Internal/MinGWToolProvider.java
@@ -0,0 +1,72 @@
+package io.sloeber.autoBuild.Internal;
+
+import java.nio.file.Path;
+import java.util.Map;
+
+import io.sloeber.autoBuild.api.IToolProvider;
+import io.sloeber.autoBuild.api.ITargetToolManager;
+import io.sloeber.autoBuild.api.ITargetToolManager.ToolFlavour;
+import io.sloeber.autoBuild.api.ITargetToolManager.ToolType;
+import org.eclipse.cdt.internal.core.MinGW;
+
+public class MinGWToolProvider implements IToolProvider {
+    private static String myMinGWHome = null;
+    private static Path myMinGPath = null;
+    final private static String MINGW_ID = "system_Installed_Mingw"; //$NON-NLS-1$
+    private static boolean holdsAllTools = false;
+
+    static {
+        myMinGWHome = org.eclipse.cdt.internal.core.MinGW.getMinGWHome();
+        if (myMinGWHome != null) {
+            holdsAllTools = true;
+            myMinGPath = Path.of(myMinGWHome);
+        }
+    }
+
+    public MinGWToolProvider() {
+        //nothing to be done here
+    }
+
+    @Override
+    public boolean holdsAllTools() {
+        return holdsAllTools;
+    }
+
+    @Override
+    public String getSelectionID() {
+        return MINGW_ID;
+    }
+
+    @Override
+    public Map<String, String> getEnvironmentVariables() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Map<String, String> getToolVariables() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public String getCommand(ToolType toolType) {
+        return ITargetToolManager.getDefault().getDefaultCommand(getToolFlavour(), toolType);
+    }
+
+    @Override
+    public Path getToolLocation(ToolType toolType) {
+        return myMinGPath;
+    }
+
+    @Override
+    public ToolFlavour getToolFlavour() {
+        return ToolFlavour.MINGW;
+    }
+
+    @Override
+    public String getID() {
+        return MINGW_ID;
+    }
+
+}
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/Internal/PathToolProvider.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/Internal/PathToolProvider.java
@@ -14,9 +14,9 @@
 import static java.util.regex.Pattern.quote;
 
 import io.sloeber.autoBuild.api.IToolProvider;
-import io.sloeber.autoBuild.api.IToolProviderManager;
-import io.sloeber.autoBuild.api.IToolProviderManager.ToolFlavour;
-import io.sloeber.autoBuild.api.IToolProviderManager.ToolType;
+import io.sloeber.autoBuild.api.ITargetToolManager;
+import io.sloeber.autoBuild.api.ITargetToolManager.ToolFlavour;
+import io.sloeber.autoBuild.api.ITargetToolManager.ToolType;
 
 public class PathToolProvider implements IToolProvider {
 
@@ -53,7 +53,7 @@ public Map<String, String> getToolVariables() {
     @Override
     public String getCommand(ToolType toolType) {
         if (holdsAllTools()) {
-            IToolProviderManager toolProviderManager = IToolProviderManager.getDefault();
+            ITargetToolManager toolProviderManager = ITargetToolManager.getDefault();
             return toolProviderManager.getDefaultCommand(getToolFlavour(), toolType);
         }
         return null;
@@ -73,7 +73,7 @@ public ToolFlavour getToolFlavour() {
     @Override
     public boolean holdsAllTools() {
         if (myHoldAllTools == null) {
-            IToolProviderManager toolProviderManager = IToolProviderManager.getDefault();
+            ITargetToolManager toolProviderManager = ITargetToolManager.getDefault();
             Set<String> commands = new HashSet<>();
             //get all the commands removing duplicate
             for (ToolType curToolType : ToolType.values()) {
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/Internal/TargetToolManager.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/Internal/TargetToolManager.java
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/ITargetToolManager.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/ITargetToolManager.java
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/IToolProvider.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/IToolProvider.java
diff --git a/io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConstants.java b/io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConstants.java
diff --git a/io.sloeber.autoBuild/src/io/sloeber/schema/api/ITool.java b/io.sloeber.autoBuild/src/io/sloeber/schema/api/ITool.java
diff --git a/io.sloeber.autoBuild/src/io/sloeber/schema/internal/Tool.java b/io.sloeber.autoBuild/src/io/sloeber/schema/internal/Tool.java
