Skip to content

Commit 576c3d5

Browse files
author
jan
committed
Refactor rename targetTool to buildTools
There is still a targetTool in the exsd (renamed to targetTools) This is the targetTools for the toolchain and is named correctly (I think) Though no extension point uses it right now and no testing has been done on it
1 parent b6e4a5c commit 576c3d5

File tree

102 files changed

+592
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+592
-575
lines changed

‎io.sloeber.autoBuild.test/launch/AutoBuildRegression.launch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@
400400
<setEntry value="org.eclipse.tools.templates.freemarker@default:default"/>
401401
<setEntry value="org.eclipse.tools.templates.ui@default:default"/>
402402
</setAttribute>
403-
<booleanAttribute key="show_selected_only" value="false"/>
403+
<booleanAttribute key="show_selected_only" value="true"/>
404404
<booleanAttribute key="tracing" value="false"/>
405405
<booleanAttribute key="useCustomFeatures" value="false"/>
406406
<booleanAttribute key="useDefaultConfig" value="true"/>

‎io.sloeber.autoBuild.test/launch/Autobuild AutoBuildCreateBasicProjects.launch

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,13 @@
559559
<setEntry value="io.sloeber.autoBuild.test@default:default"/>
560560
<setEntry value="io.sloeber.autoBuild.ui@default:default"/>
561561
<setEntry value="io.sloeber.autoBuild@default:default"/>
562+
<setEntry value="io.sloeber.core.nl1@default:false"/>
563+
<setEntry value="io.sloeber.core@default:default"/>
564+
<setEntry value="io.sloeber.product.sdk@default:default"/>
565+
<setEntry value="io.sloeber.product@default:default"/>
566+
<setEntry value="io.sloeber.tests@default:default"/>
567+
<setEntry value="io.sloeber.ui.nl1@default:false"/>
568+
<setEntry value="io.sloeber.ui@default:default"/>
562569
<setEntry value="org.eclipse.cdt.build.gcc.core@default:default"/>
563570
<setEntry value="org.eclipse.cdt.core.native@default:default"/>
564571
<setEntry value="org.eclipse.cdt.core.win32.x86_64@default:false"/>

‎io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/helpers/Defaults.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.sloeber.autoBuild.api.AutoBuildNewProjectCodeManager;
88
import io.sloeber.autoBuild.api.ICodeProvider;
99
import io.sloeber.autoBuild.integration.AutoBuildManager;
10-
import io.sloeber.schema.api.IProjectType;
10+
import io.sloeber.autoBuild.schema.api.IProjectType;
1111

1212
@SuppressWarnings("nls")
1313
public class Defaults {

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import io.sloeber.autoBuild.api.AutoBuildProject;
3030
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
3131
import io.sloeber.autoBuild.api.ICodeProvider;
32+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
33+
import io.sloeber.autoBuild.buildTools.api.IBuildToolsManager;
3234
import io.sloeber.autoBuild.helpers.Shared;
3335
import io.sloeber.autoBuild.integration.AutoBuildManager;
3436
import io.sloeber.autoBuild.internal.AutoBuildCommon;
35-
import io.sloeber.buildTool.api.IBuildToolManager;
36-
import io.sloeber.buildTool.api.IBuildTools;
37-
import io.sloeber.schema.api.IProjectType;
37+
import io.sloeber.autoBuild.schema.api.IProjectType;
3838

3939
@SuppressWarnings({ "nls" })
4040
public class AutoBuildCreateBasicProjects {
@@ -45,7 +45,7 @@ public class AutoBuildCreateBasicProjects {
4545
private boolean doTestInternalBuilder = true;
4646
private boolean doTestMakeBuilder = true;
4747
private static String codeRootFolder = "src";
48-
static Set<IBuildTools> buildTools = IBuildToolManager.getDefault().getAllInstalledBuildTools();
48+
static Set<IBuildTools> buildTools = IBuildToolsManager.getDefault().getAllInstalledBuildTools();
4949

5050
@BeforeAll
5151
static void beforeAll() {
@@ -66,12 +66,12 @@ static void beforeAll() {
6666

6767
static void buildAllConfigsAsActive(String builderID, String projectName, String extensionPointID,
6868
String extensionID, String projectTypeID, String natureID, ICodeProvider codeProvider,
69-
IBuildTools targetTool, Boolean shouldMakefileExists) throws Exception {
69+
IBuildTools buildTools, Boolean shouldMakefileExists) throws Exception {
7070

7171
IProjectType projectType = AutoBuildManager.getProjectType(extensionPointID, extensionID, projectTypeID, true);
7272
IProject testProject = AutoBuildProject.createProject(
7373
String.format("%03d", Integer.valueOf(testCounter++)) + "_" + projectName, projectType, natureID,
74-
codeRootFolder, codeProvider, targetTool, false, null);
74+
codeRootFolder, codeProvider, buildTools, false, null);
7575
ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
7676
for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {
7777
cProjectDesc.setActiveConfiguration(curConfig);
@@ -81,13 +81,13 @@ static void buildAllConfigsAsActive(String builderID, String projectName, String
8181
}
8282

8383
static void buildAllConfigs(String builderName, String projectName, String extensionPointID, String extensionID,
84-
String projectTypeID, String natureID, ICodeProvider codeProvider, IBuildTools targetTool,
84+
String projectTypeID, String natureID, ICodeProvider codeProvider, IBuildTools buildTools,
8585
Boolean shouldMakefileExists) throws Exception {
8686

8787
IProjectType projectType = AutoBuildManager.getProjectType(extensionPointID, extensionID, projectTypeID, true);
8888
IProject testProject = AutoBuildProject.createProject(
8989
String.format("%03d", Integer.valueOf(testCounter++)) + "_" + projectName, projectType, natureID,
90-
codeRootFolder, codeProvider, targetTool, false, null);
90+
codeRootFolder, codeProvider, buildTools, false, null);
9191
ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
9292
Set<String> configs = new HashSet<>();
9393

@@ -103,62 +103,62 @@ static void buildAllConfigs(String builderName, String projectName, String exten
103103
}
104104

105105
private void doBuilds(String builderID, String projectName, String extensionPointID, String extensionID,
106-
String projectTypeID, String natureID, ICodeProvider codeProvider, IBuildTools targetTool,
106+
String projectTypeID, String natureID, ICodeProvider codeProvider, IBuildTools buildTools,
107107
Boolean shouldMakefileExists) throws Exception {
108108
String shortProjectName = projectName;
109109
if (projectName.length() > 41) {
110110
shortProjectName = projectName.substring(0, 40);
111111
}
112112
if (buildTypeActiveBuild) {
113113
buildAllConfigsAsActive(builderID, shortProjectName, extensionPointID, extensionID, projectTypeID, natureID,
114-
codeProvider, targetTool, shouldMakefileExists);
114+
codeProvider, buildTools, shouldMakefileExists);
115115
}
116116
if (!buildTypeActiveBuild) {
117117
buildAllConfigs(builderID, "all_" + shortProjectName, extensionPointID, extensionID, projectTypeID,
118-
natureID, codeProvider, targetTool, shouldMakefileExists);
118+
natureID, codeProvider, buildTools, shouldMakefileExists);
119119
}
120120

121121
}
122122

123123
@ParameterizedTest
124124
@MethodSource("projectCreationInfoProvider")
125125
void testDefaultBuilder(String projectName, String extensionPointID, String extensionID, String projectTypeID,
126-
String natureID, ICodeProvider codeProvider, IBuildTools targetTool) throws Exception {
126+
String natureID, ICodeProvider codeProvider, IBuildTools buildTools) throws Exception {
127127
beforeAll();
128128
if (doTestDefaultBuilder) {
129129
doBuilds(null, projectName, extensionPointID, extensionID, projectTypeID, natureID, codeProvider,
130-
targetTool, null);
130+
buildTools, null);
131131
}
132132
}
133133

134134
@ParameterizedTest
135135
@MethodSource("projectCreationInfoProvider")
136136
void testInternaltBuilder(String inProjectName, String extensionPointID, String extensionID, String projectTypeID,
137-
String natureID, ICodeProvider codeProvider, IBuildTools targetTool) throws Exception {
137+
String natureID, ICodeProvider codeProvider, IBuildTools buildTools) throws Exception {
138138
beforeAll();
139139
if (doTestInternalBuilder) {
140140
String projectName = "Internal_" + inProjectName;
141141

142142
doBuilds(AutoBuildProject.INTERNAL_BUILDER_ID, projectName, extensionPointID, extensionID, projectTypeID,
143-
natureID, codeProvider, targetTool, Boolean.FALSE);
143+
natureID, codeProvider, buildTools, Boolean.FALSE);
144144
}
145145
}
146146

147147
@ParameterizedTest
148148
@MethodSource("projectCreationInfoProvider")
149149
void testMakeBuilder(String inProjectName, String extensionPointID, String extensionID, String projectTypeID,
150-
String natureID, ICodeProvider codeProvider, IBuildTools targetTool) throws Exception {
150+
String natureID, ICodeProvider codeProvider, IBuildTools buildTools) throws Exception {
151151
beforeAll();
152152
if (doTestMakeBuilder) {
153-
Assumptions.assumeFalse(targetTool.getProviderID().equals("io.sloeber.autoBuild.Path.BuildToolProvider"),"Ignoring as make is not assumed on the path") ;
153+
Assumptions.assumeFalse(buildTools.getProviderID().equals("io.sloeber.autoBuild.Path.BuildToolProvider"),"Ignoring as make is not assumed on the path") ;
154154
String projectName = "make_" + inProjectName;
155155
if (projectName.length() > 40) {
156156
// somethimes the build fails due to to long filenames
157157
// as the project name is part of the targetName
158158
projectName = projectName.substring(0, 40);
159159
}
160160
doBuilds(AutoBuildProject.MAKE_BUILDER_ID, projectName, extensionPointID, extensionID, projectTypeID,
161-
natureID, codeProvider, targetTool, Boolean.TRUE);
161+
natureID, codeProvider, buildTools, Boolean.TRUE);
162162
}
163163
}
164164

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
import io.sloeber.autoBuild.api.AutoBuildProject;
1515
import io.sloeber.autoBuild.api.ICodeProvider;
16+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
17+
import io.sloeber.autoBuild.buildTools.api.IBuildToolsManager;
1618
import io.sloeber.autoBuild.helpers.Shared;
1719
import io.sloeber.autoBuild.integration.AutoBuildManager;
1820
import io.sloeber.autoBuild.internal.AutoBuildCommon;
19-
import io.sloeber.buildTool.api.IBuildToolManager;
20-
import io.sloeber.buildTool.api.IBuildTools;
21-
import io.sloeber.schema.api.IProjectType;
21+
import io.sloeber.autoBuild.schema.api.IProjectType;
2222

2323
import org.eclipse.cdt.core.CCProjectNature;
2424
import org.eclipse.cdt.core.CCorePlugin;
@@ -64,7 +64,7 @@ static Stream<Arguments> projectCreationInfoProvider() {
6464
continue;
6565
}
6666
String projectID = projectType.getId();
67-
IBuildTools buildTools = IBuildToolManager.getDefault().getAnyInstalledBuildTools(projectType);
67+
IBuildTools buildTools = IBuildToolsManager.getDefault().getAnyInstalledBuildTools(projectType);
6868
if(buildTools==null) {
6969
continue;
7070
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.junit.jupiter.api.BeforeAll;
2121

2222
import io.sloeber.autoBuild.api.AutoBuildProject;
23+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
24+
import io.sloeber.autoBuild.buildTools.api.IBuildToolsManager;
2325
import io.sloeber.autoBuild.helpers.Shared;
24-
import io.sloeber.buildTool.api.IBuildToolManager;
25-
import io.sloeber.buildTool.api.IBuildTools;
2626

2727
@SuppressWarnings({ "nls", "static-method" })
2828
public class AutoBuildIssues {
@@ -100,7 +100,7 @@ public void setDescriptionDoesNotSetDescription() throws Exception {
100100
String projectName = "setDescription";
101101
CoreModel coreModel = CoreModel.getDefault();
102102

103-
IBuildTools buildTools = IBuildToolManager.getDefault().getAnyInstalledBuildTools(defaultProjectType);
103+
IBuildTools buildTools = IBuildToolsManager.getDefault().getAnyInstalledBuildTools(defaultProjectType);
104104
IProject testProject = AutoBuildProject.createProject(projectName, defaultProjectType, defaultNatureID,codeRootFolder,cpp_exeCodeProvider,
105105
buildTools, false, null);
106106

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
3131
import io.sloeber.autoBuild.api.IAutoBuildMakeRule;
3232
import io.sloeber.autoBuild.api.IAutoBuildMakeRules;
33+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
34+
import io.sloeber.autoBuild.buildTools.api.IBuildToolsManager;
3335
import io.sloeber.autoBuild.extensionPoint.providers.AutoBuildMakeRules;
3436
import io.sloeber.autoBuild.helpers.Shared;
3537
import io.sloeber.autoBuild.integration.AutoBuildConfigurationDescription;
3638
import io.sloeber.autoBuild.integration.AutoBuildManager;
37-
import io.sloeber.buildTool.api.IBuildToolManager;
38-
import io.sloeber.buildTool.api.IBuildTools;
39-
import io.sloeber.schema.api.IBuilder;
40-
import io.sloeber.schema.api.IOption;
41-
import io.sloeber.schema.api.IProjectType;
42-
import io.sloeber.schema.api.ITool;
39+
import io.sloeber.autoBuild.schema.api.IBuilder;
40+
import io.sloeber.autoBuild.schema.api.IOption;
41+
import io.sloeber.autoBuild.schema.api.IProjectType;
42+
import io.sloeber.autoBuild.schema.api.ITool;
4343

4444
@SuppressWarnings({ "static-method", "nls", "boxing" })
4545
public class AutoBuildRegression {
@@ -78,7 +78,7 @@ public void createCloseOpenProject() throws Exception {
7878
String projectName = "createCloseOpenProject";
7979

8080
IProjectType projectType= AutoBuildManager.getProjectType( extensionPointID, defaultExtensionID, defaultProjectTypeID, true);
81-
IBuildTools buildTools = IBuildToolManager.getDefault().getAnyInstalledBuildTools(projectType);
81+
IBuildTools buildTools = IBuildToolsManager.getDefault().getAnyInstalledBuildTools(projectType);
8282
IProject testProject = AutoBuildProject.createProject(projectName, projectType, CCProjectNature.CC_NATURE_ID,codeRootFolder,
8383
cpp_exeCodeProvider, buildTools, false, null);
8484

@@ -118,7 +118,7 @@ public void setBuilder() throws Exception {
118118
String projectName = "setBuilder";
119119

120120
IProjectType projectType= AutoBuildManager.getProjectType( extensionPointID, defaultExtensionID, defaultProjectTypeID, true);
121-
IBuildTools buildTools = IBuildToolManager.getDefault().getAnyInstalledBuildTools(projectType);
121+
IBuildTools buildTools = IBuildToolsManager.getDefault().getAnyInstalledBuildTools(projectType);
122122
IProject testProject = AutoBuildProject.createProject(projectName, projectType, CCProjectNature.CC_NATURE_ID,codeRootFolder,
123123
cpp_exeCodeProvider, buildTools, false, null);
124124

@@ -179,7 +179,7 @@ void testOptions(String optionID, String optionValue, String commandContribution
179179
IProject testProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
180180
if (testProject == null || !testProject.exists()) {
181181
IProjectType projectType= AutoBuildManager.getProjectType( extensionPointID, "io.sloeber.autoBuild.test", "io.sloeber.autoBuild.projectType.test.options", true);
182-
IBuildTools buildTools = IBuildToolManager.getDefault().getAnyInstalledBuildTools(projectType);
182+
IBuildTools buildTools = IBuildToolsManager.getDefault().getAnyInstalledBuildTools(projectType);
183183
testProject = AutoBuildProject.createProject(projectName, projectType,
184184
CCProjectNature.CC_NATURE_ID,codeRootFolder,
185185
cpp_exeCodeProvider, buildTools, false, null);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
import org.junit.jupiter.api.BeforeAll;
1818

1919
import io.sloeber.autoBuild.api.AutoBuildProject;
20+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
21+
import io.sloeber.autoBuild.buildTools.api.IBuildToolsManager;
2022
import io.sloeber.autoBuild.helpers.Shared;
21-
import io.sloeber.buildTool.api.IBuildToolManager;
22-
import io.sloeber.buildTool.api.IBuildTools;
2323

2424
@SuppressWarnings({ "restriction", "nls", "static-method" })
2525
public class CConfigurationDescriptionInvestigation {
@@ -40,7 +40,7 @@ static void beforeAll() {
4040
public void testConfigDescription() {
4141
beforeAll();
4242
String projectName = "testConfigDescription";
43-
IBuildTools buildTools = IBuildToolManager.getDefault().getAnyInstalledBuildTools(defaultProjectType);
43+
IBuildTools buildTools = IBuildToolsManager.getDefault().getAnyInstalledBuildTools(defaultProjectType);
4444
IProject testProject = AutoBuildProject.createProject(projectName, defaultProjectType, defaultNatureID,codeRootFolder, cpp_exeCodeProvider, buildTools, false, null);
4545
ICProjectDescription projectDesc = CoreModel.getDefault().getProjectDescription(testProject, true);
4646
for (ICConfigurationDescription curConf : projectDesc.getConfigurations()) {

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewProjectBuildToolsPage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
import org.eclipse.swt.layout.GridData;
66
import org.eclipse.swt.layout.GridLayout;
77
import org.eclipse.swt.widgets.Composite;
8+
9+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
810
import io.sloeber.autoBuild.ui.tabs.BuildToolManagerTab;
911
import io.sloeber.autoBuild.ui.tabs.DialogCompleteEvent;
10-
import io.sloeber.buildTool.api.IBuildTools;
1112

1213
public class NewProjectBuildToolsPage extends WizardPage {
1314

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewProjectProjectTypePage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import org.eclipse.swt.layout.GridLayout;
77
import org.eclipse.swt.widgets.Composite;
88

9+
import io.sloeber.autoBuild.schema.api.IProjectType;
910
import io.sloeber.autoBuild.ui.tabs.DialogCompleteEvent;
1011
import io.sloeber.autoBuild.ui.tabs.ProjectSettingsTab;
11-
import io.sloeber.schema.api.IProjectType;
1212

1313
public class NewProjectProjectTypePage extends WizardPage {
1414
private ProjectSettingsTab myProjectSettingsTab;

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewProjectWizard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
import io.sloeber.autoBuild.api.AutoBuildProject;
2727
import io.sloeber.autoBuild.api.ICodeProvider;
28+
import io.sloeber.autoBuild.buildTools.api.IBuildTools;
2829
import io.sloeber.autoBuild.integration.AutoBuildProjectGenerator;
30+
import io.sloeber.autoBuild.schema.api.IProjectType;
2931
import io.sloeber.autoBuild.ui.internal.Messages;
30-
import io.sloeber.buildTool.api.IBuildTools;
31-
import io.sloeber.schema.api.IProjectType;
3232

3333
public class NewProjectWizard extends TemplateWizard {
3434
private WizardNewProjectCreationPage myMainPage;

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewVarDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
import org.eclipse.swt.widgets.Shell;
4949
import org.eclipse.swt.widgets.Text;
5050

51+
import io.sloeber.autoBuild.schema.api.IOption;
5152
import io.sloeber.autoBuild.ui.internal.Messages;
52-
import io.sloeber.schema.api.IOption;
5353

5454
/**
5555
* the dialog used to create or edit the build macro

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/ToolListLabelProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.eclipse.swt.graphics.Image;
2525
import org.eclipse.swt.widgets.Display;
2626

27+
import io.sloeber.autoBuild.schema.api.IOptionCategory;
28+
import io.sloeber.autoBuild.schema.api.ITool;
2729
import io.sloeber.autoBuild.ui.internal.Messages;
28-
import io.sloeber.schema.api.IOptionCategory;
29-
import io.sloeber.schema.api.ITool;
3030

3131
/**
3232
* @noextend This class is not intended to be subclassed by clients.

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/ui/tabs/BuildOptionComboFieldEditor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.eclipse.swt.widgets.Label;
3131
import org.eclipse.ui.PlatformUI;
3232

33-
import io.sloeber.schema.api.IOption;
33+
import io.sloeber.autoBuild.schema.api.IOption;
3434

3535
/**
3636
* @noextend This class is not intended to be subclassed by clients.

0 commit comments

Comments
 (0)