Added tool provider. Still need to use it

Author: jantje

io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateBasicProjects.java

@@ -25,6 +25,8 @@
 import io.sloeber.autoBuild.api.AutoBuildProject;
 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.extensionPoint.providers.AutoBuildCommon;
 import io.sloeber.autoBuild.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
@@ -39,6 +41,7 @@ public class CreateBasicProjects {
     private boolean doTestDefaultBuilder = true;
     private boolean doTestInternalBuilder = true;
     private boolean doTestMakeBuilder = true;
+    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
 
     @BeforeAll
     static void beforeAll() {
@@ -55,7 +58,7 @@ static void buildAllConfigsAsActive(String builderName, String projectName, Stri
             Boolean shouldMakefileExists) throws Exception {
 
         IProject testProject = AutoBuildProject.createProject(String.format("%03d", testCounter++) + "_" + projectName,
-                extensionPointID, extensionID, projectTypeID, natureID, codeProvider, false, null);
+                extensionPointID, extensionID, projectTypeID, natureID, codeProvider, toolprovider, false, null);
         ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
         for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {
             cProjectDesc.setActiveConfiguration(curConfig);
@@ -69,7 +72,7 @@ static void buildAllConfigs(String builderName, String projectName, String exten
             throws Exception {
 
         IProject testProject = AutoBuildProject.createProject(String.format("%03d", testCounter++) + "_" + projectName,
-                extensionPointID, extensionID, projectTypeID, natureID, codeProvider, false, null);
+                extensionPointID, extensionID, projectTypeID, natureID, codeProvider, toolprovider, false, null);
         ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
         Set<String> configs = new HashSet<>();
 

io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateProject.java

@@ -10,6 +10,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 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.extensionPoint.providers.AutoBuildCommon;
 import io.sloeber.autoBuild.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
@@ -25,6 +27,7 @@
 
 @SuppressWarnings("nls")
 class CreateProject {
+    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
 
     @BeforeAll
     static void beforeAll() {
@@ -39,7 +42,7 @@ void testExample(String myProjectName, String extensionID, String extensionImpID
             String natureID, ICodeProvider codeProvider) throws Exception {
 
         IProject testProject = AutoBuildProject.createProject(myProjectName, extensionID, extensionImpID, projectTypeID,
-                natureID, codeProvider, false, null);
+                natureID, codeProvider, toolprovider, false, null);
         ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
         for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {
             cProjectDesc.setActiveConfiguration(curConfig);

io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/issues.java

@@ -20,11 +20,14 @@
 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.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
 
 @SuppressWarnings({ "nls", "static-method" })
 public class issues {
+    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
 
     @BeforeAll
     public static void beforeAll() {
@@ -99,8 +102,8 @@ public void setDescriptionDoesNotSetDescription() throws Exception {
         CoreModel coreModel = CoreModel.getDefault();
 
         IProject testProject = AutoBuildProject.createProject(projectName, defaultExtensionPointID,
-                defaultProjectTypeID, defaultExtensionID, defaultNatureID, new TemplateTestCodeProvider("exe"), false,
-                null);
+                defaultProjectTypeID, defaultExtensionID, defaultNatureID, new TemplateTestCodeProvider("exe"),
+                toolprovider, false, null);
 
         ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
         for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {

io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/regression.java

@@ -28,6 +28,8 @@
 
 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.extensionPoint.providers.MakeRule;
 import io.sloeber.autoBuild.extensionPoint.providers.MakeRules;
 import io.sloeber.autoBuild.helpers.Shared;
@@ -40,6 +42,7 @@
 public class regression {
     static private String extensionPointID = "io.sloeber.autoBuild.buildDefinitions";
     static int testCounter = 1;
+    static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
 
     @BeforeAll
     public static void beforeAll() {
@@ -72,7 +75,7 @@ public void createCloseOpenProject() throws Exception {
 
         IProject testProject = AutoBuildProject.createProject(projectName, extensionPointID, "cdt.cross.gnu",
                 "cdt.managedbuild.target.gnu.cross.exe", CCProjectNature.CC_NATURE_ID,
-                new TemplateTestCodeProvider("exe"), false, null);
+                new TemplateTestCodeProvider("exe"), toolprovider, false, null);
 
         //Build all the configurations and verify proper building
         Shared.buildAndVerifyProjectUsingActivConfig(testProject, null);
@@ -111,7 +114,7 @@ public void setBuilder() throws Exception {
 
         IProject testProject = AutoBuildProject.createProject(projectName, extensionPointID, "cdt.cross.gnu",
                 "cdt.managedbuild.target.gnu.cross.exe", CCProjectNature.CC_NATURE_ID,
-                new TemplateTestCodeProvider("exe"), false, null);
+                new TemplateTestCodeProvider("exe"), toolprovider, false, null);
 
         //Build the active configuration and verify proper building
         Shared.BuildAndVerifyActiveConfig(testProject);
@@ -169,7 +172,7 @@ void testOptions(String optionID, String optionValue, String commandContribution
         if (testProject == null || !testProject.exists()) {
             testProject = AutoBuildProject.createProject(projectName, extensionPointID, "io.sloeber.autoBuild.test",
                     "io.sloeber.autoBuild.projectType.test.options", CCProjectNature.CC_NATURE_ID,
-                    new TemplateTestCodeProvider("exe"), false, null);
+                    new TemplateTestCodeProvider("exe"), toolprovider, false, null);
         }
 
         //get the project and autobuild configurations

io.sloeber.autoBuild.test/src/io/sloeber/autoBuilld/investigate/CConfigurationDescriptionInvestigation.java

@@ -16,6 +16,8 @@
 import org.junit.Test;
 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.helpers.Shared;
 import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
 
@@ -37,8 +39,9 @@ static void beforeAll() {
     public void testConfigDescription() {
         beforeAll();
         String projectName = "testConfigDescription";
+        IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
         IProject testProject = AutoBuildProject.createProject(projectName, defaultExtensionPointID, defaultExtensionID,
-                defaultProjectTypeID, defaultNatureID, new TemplateTestCodeProvider("exe"), false, null);
+                defaultProjectTypeID, defaultNatureID, new TemplateTestCodeProvider("exe"), toolprovider, false, null);
         ICProjectDescription projectDesc = CoreModel.getDefault().getProjectDescription(testProject, true);
         for (ICConfigurationDescription curConf : projectDesc.getConfigurations()) {
             assertFalse("conf is readOnly class instance", curConf instanceof CConfigurationDescriptionCache);

io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewAutoBuildProjectWizard.java

@@ -26,6 +26,8 @@
 
 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.integration.AutoBuildManager;
 import io.sloeber.autoBuild.integration.AutoBuildProjectGenerator;
 import io.sloeber.autoBuild.ui.internal.Messages;
@@ -43,14 +45,15 @@ public boolean performFinish() {
                     .toArray(new String[10])[0];
             String natureID = CCProjectNature.CC_NATURE_ID;
             ICodeProvider codeProvider = null;
+            IToolProvider toolProvider = IToolProviderManager.getDefault().getAnyToolProvider();
             getContainer().run(true, true, new WorkspaceModifyOperation() {
                 @Override
                 protected void execute(IProgressMonitor monitor)
                         throws CoreException, InvocationTargetException, InterruptedException {
                     SubMonitor sub = SubMonitor.convert(monitor, Messages.TemplateWizard_Generating, 1);
 
                     AutoBuildProject.createProject(projectName, extensionPointID, extensionID, projectTypeID, natureID,
-                            codeProvider, false, sub);
+                            codeProvider, toolProvider, false, sub);
                     //                    generator.generate(model, sub);
                     //                    getWorkbench().getDisplay().asyncExec(new Runnable() {
                     //                        @Override