Skip to content

Commit e0be78f

Browse files
author
jan
committed
checkin bad stuff to be able to work on master
1 parent cd545e2 commit e0be78f

File tree

7 files changed

+415
-62
lines changed

7 files changed

+415
-62
lines changed

‎io.sloeber.core/src/io/sloeber/core/api/BoardDescriptor.java

+393-31
Large diffs are not rendered by default.

‎io.sloeber.core/src/io/sloeber/core/tools/Helpers.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ public class Helpers extends Common {
103103
* @param configurationDescription
104104
* @param IncludePath
105105
*/
106-
public static void addIncludeFolder( ICConfigurationDescription configurationDescription, IPath IncludePath)
106+
public static void addIncludeFolder(ICFolderDescription folderDescription, IPath IncludePath)
107107
{
108-
addIncludeFolder( configurationDescription, IncludePath,true) ;
108+
addIncludeFolder( folderDescription, IncludePath,true) ;
109109
}
110110
/**
111111
* This method is the internal working class that adds the provided include path
@@ -117,9 +117,9 @@ public static void addIncludeFolder( ICConfigurationDescription configurationDes
117117
* The path to add to the include folders
118118
* @see addLibraryDependency {@link #addLibraryDependency(IProject, IProject)}
119119
*/
120-
public static void addIncludeFolder(ICConfigurationDescription configurationDescription, IPath IncludePath,boolean isWorkspacePath) {
120+
public static void addIncludeFolder(ICFolderDescription folderDescription, IPath IncludePath,boolean isWorkspacePath) {
121121
// find all languages
122-
ICFolderDescription folderDescription = configurationDescription.getRootFolderDescription();
122+
//ICFolderDescription folderDescription = configurationDescription.getRootFolderDescription();
123123
ICLanguageSetting[] languageSettings = folderDescription.getLanguageSettings();
124124
int pathSetting=ICSettingEntry.VALUE_WORKSPACE_PATH;
125125
if(!isWorkspacePath)
@@ -252,6 +252,7 @@ public static void LinkFolderToFolder(IProject project, IPath source, IPath targ
252252
public static void addCodeFolder(IProject project, IPath toLinkFolder, String LinkName,
253253
ICConfigurationDescription configurationDescription,boolean forceRoot) throws CoreException {
254254
IFolder link = project.getFolder(LinkName);
255+
ICFolderDescription folderDescription = configurationDescription.getRootFolderDescription();
255256

256257
LinkFolderToFolder(project, toLinkFolder, new Path(LinkName));
257258

@@ -261,27 +262,27 @@ public static void addCodeFolder(IProject project, IPath toLinkFolder, String Li
261262
String possibleIncludeFolder = "utility";
262263
File file = toLinkFolder.append(possibleIncludeFolder).toFile();
263264
if (file.exists()) {
264-
addIncludeFolder(configurationDescription, link.getFullPath().append(possibleIncludeFolder));
265+
addIncludeFolder(folderDescription, link.getFullPath().append(possibleIncludeFolder));
265266
}
266267

267268
if (forceRoot) {
268-
addIncludeFolder(configurationDescription, link.getFullPath());
269+
addIncludeFolder(folderDescription, link.getFullPath());
269270
} else {
270271
// add src or root give priority to src
271272
possibleIncludeFolder = Library.LIBRARY_SOURCE_FODER;
272273
file = toLinkFolder.append(possibleIncludeFolder).toFile();
273274
if (file.exists()) {
274-
addIncludeFolder(configurationDescription, link.getFullPath().append(possibleIncludeFolder));
275+
addIncludeFolder(folderDescription, link.getFullPath().append(possibleIncludeFolder));
275276
} else {
276-
addIncludeFolder(configurationDescription, link.getFullPath());
277+
addIncludeFolder(folderDescription, link.getFullPath());
277278
}
278279
}
279280

280281
possibleIncludeFolder = "arch";
281282
file = toLinkFolder.append(possibleIncludeFolder).toFile();
282283
if (file.exists()) {
283284
InternalBoardDescriptor boardDescriptor = new InternalBoardDescriptor(configurationDescription);
284-
addIncludeFolder(configurationDescription,
285+
addIncludeFolder(folderDescription,
285286
link.getFullPath().append(possibleIncludeFolder).append(boardDescriptor.getArchitecture()));
286287
}
287288
}

‎io.sloeber.core/src/io/sloeber/core/tools/ShouldHaveBeenInCDT.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525

2626
import io.sloeber.core.api.ConfigurationDescriptor;
2727

28-
@SuppressWarnings("restriction")
29-
// TOFIX Get this code in CDT so I should not have to do this
28+
3029
public class ShouldHaveBeenInCDT {
3130
/*
3231
* Copied from wizard STDWizardHandler package package
@@ -54,7 +53,7 @@ public class ShouldHaveBeenInCDT {
5453
* @throws CoreException
5554
*/
5655
public static ICProjectDescription setCProjectDescription(IProject project,
57-
ArrayList<ConfigurationDescriptor> alCfgs, boolean isManagedBuild, boolean enableParallelBuild, IProgressMonitor monitor)
56+
ArrayList<ConfigurationDescriptor> alCfgs, boolean enableParallelBuild, IProgressMonitor monitor)
5857
throws CoreException {
5958

6059
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
@@ -75,7 +74,7 @@ public static ICProjectDescription setCProjectDescription(IProject project,
7574
}
7675
IBuilder bld = cfg.getEditableBuilder();
7776
if (bld != null) {
78-
bld.setManagedBuildOn(isManagedBuild);
77+
bld.setManagedBuildOn(true);
7978
cfg.setArtifactName("${ProjName}"); //$NON-NLS-1$
8079
} else {
8180
System.out.println("Messages.StdProjectTypeHandler_3"); //$NON-NLS-1$

‎io.sloeber.tests/src/io/sloeber/core/CompileAndUpload.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
import io.sloeber.core.api.CodeDescriptor;
3333
import io.sloeber.core.api.CompileOptions;
34-
import io.sloeber.core.api.ConfigurationDescriptor;
3534
import io.sloeber.core.api.PackageManager;
3635
import io.sloeber.core.api.Preferences;
3736
import io.sloeber.core.api.Sketch;
@@ -155,9 +154,7 @@ public void Build_Verify_upload(CodeDescriptor codeDescriptor,
155154
try {
156155

157156
theTestProject = this.myBoard.getBoardDescriptor().createProject(
158-
projectName, null,
159-
ConfigurationDescriptor.getDefaultDescriptors(),
160-
codeDescriptor, compileOptions, monitor);
157+
projectName, null, codeDescriptor, compileOptions, monitor);
161158
Shared.waitForAllJobsToFinish(); // for the indexer
162159
} catch (Exception e) {
163160
e.printStackTrace();

‎io.sloeber.tests/src/io/sloeber/core/RegressionTest.java

+6-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import io.sloeber.core.api.BoardDescriptor;
2121
import io.sloeber.core.api.CodeDescriptor;
2222
import io.sloeber.core.api.CompileOptions;
23-
import io.sloeber.core.api.ConfigurationDescriptor;
2423
import io.sloeber.core.api.PackageManager;
2524
import io.sloeber.core.api.Preferences;
2625
import io.sloeber.providers.Arduino;
@@ -89,7 +88,7 @@ public void issue555() {
8988
try {
9089

9190
theTestProject = unoBoardid.createProject(projectName, null,
92-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, new CompileOptions(null), monitor);
91+
codeDescriptor, new CompileOptions(null), monitor);
9392
Shared.waitForAllJobsToFinish(); // for the indexer
9493
} catch (Exception e) {
9594
e.printStackTrace();
@@ -135,8 +134,7 @@ public void issue687() throws Exception {
135134
CodeDescriptor codeDescriptor = CodeDescriptor.createCustomTemplate(templateFolder);
136135
try {
137136
theTestProject = unoBoardid.createProject(projectName, null,
138-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, new CompileOptions(null),
139-
new NullProgressMonitor());
137+
codeDescriptor, new CompileOptions(null), new NullProgressMonitor());
140138
Shared.waitForAllJobsToFinish(); // for the indexer
141139
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
142140
if (Shared.hasBuildErrors(theTestProject)) {
@@ -164,8 +162,7 @@ public void issue1047_Board_Names_Can_Be_used_as_Strings() throws Exception {
164162
CodeDescriptor codeDescriptor = CodeDescriptor.createCustomTemplate(templateFolder);
165163
try {
166164
IProject theTestProject = unoBoard.getBoardDescriptor().createProject(projectName, null,
167-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, new CompileOptions(null),
168-
new NullProgressMonitor());
165+
codeDescriptor, new CompileOptions(null), new NullProgressMonitor());
169166
Shared.waitForAllJobsToFinish(); // for the indexer
170167
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
171168
if (Shared.hasBuildErrors(theTestProject)) {
@@ -207,7 +204,7 @@ public void are_jantjes_options_taken_into_account() throws Exception {
207204
compileOptions.set_C_CompileOptions("-DTEST_C");
208205
compileOptions.set_CPP_CompileOptions("-DTEST_CPP");
209206
theTestProject = unoBoardid.createProject(projectName, null,
210-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, compileOptions, monitor);
207+
codeDescriptor, compileOptions, monitor);
211208
ICProjectDescription prjCDesc = CoreModel.getDefault().getProjectDescription(theTestProject);
212209

213210
CoreModel.getDefault().getProjectDescriptionManager().setProjectDescription(theTestProject, prjCDesc, true,
@@ -246,7 +243,7 @@ public void are_defines_before_includes_taken_into_account() throws Exception {
246243
try {
247244

248245
theTestProject = unoBoardid.createProject(projectName, null,
249-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, new CompileOptions(null), monitor);
246+
codeDescriptor, new CompileOptions(null), monitor);
250247

251248
Shared.waitForAllJobsToFinish(); // for the indexer
252249
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
@@ -282,7 +279,7 @@ public void is_extern_C_taken_into_account() throws Exception {
282279
try {
283280

284281
theTestProject = unoBoardid.createProject(projectName, null,
285-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, new CompileOptions(null), monitor);
282+
codeDescriptor, new CompileOptions(null), monitor);
286283

287284
Shared.waitForAllJobsToFinish(); // for the indexer
288285
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);

‎io.sloeber.tests/src/io/sloeber/core/Shared.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import io.sloeber.core.api.BoardDescriptor;
2828
import io.sloeber.core.api.CodeDescriptor;
2929
import io.sloeber.core.api.CompileOptions;
30-
import io.sloeber.core.api.ConfigurationDescriptor;
3130
import io.sloeber.core.api.PackageManager;
3231
import io.sloeber.core.common.ConfigurationPreferences;
3332
import io.sloeber.providers.MCUBoard;
@@ -136,7 +135,7 @@ public static boolean BuildAndVerify(String projectName, BoardDescriptor boardDe
136135
try {
137136
compileOptions.setEnableParallelBuild(true);
138137
theTestProject = boardDescriptor.createProject(projectName, null,
139-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescriptor, compileOptions, monitor);
138+
codeDescriptor, compileOptions, monitor);
140139
waitForAllJobsToFinish(); // for the indexer
141140
} catch (Exception e) {
142141
e.printStackTrace();

‎io.sloeber.ui/src/io/sloeber/ui/wizard/newsketch/NewSketchWizard.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.sloeber.core.api.BoardDescriptor;
2424
import io.sloeber.core.api.CodeDescriptor;
2525
import io.sloeber.core.api.CompileOptions;
26-
import io.sloeber.core.api.ConfigurationDescriptor;
2726
import io.sloeber.ui.Activator;
2827
import io.sloeber.ui.Messages;
2928
import io.sloeber.ui.helpers.MyPreferences;
@@ -126,8 +125,7 @@ protected void createProjectWrapper(IProgressMonitor monitor) {
126125
compileOptions.setEnableParallelBuild(MyPreferences.getEnableParallelBuildForNewProjects());
127126
this.mProject = boardID.createProject(this.mWizardPage.getProjectName(),
128127
(!this.mWizardPage.useDefaults()) ? this.mWizardPage.getLocationURI() : null,
129-
ConfigurationDescriptor.getDefaultDescriptors(), codeDescription, compileOptions,
130-
monitor);
128+
codeDescription, compileOptions, monitor);
131129

132130
} catch (Exception e) {
133131
this.mProject = null;

0 commit comments

Comments
 (0)