Skip to content

Commit 90c7c40

Browse files
author
jan
committed
exclude lib folders in libraries #1703
1 parent cb3f47d commit 90c7c40

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,17 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
182182
excludes[1] = project.getFolder(SLOEBER_ARDUINO_FOLDER_NAME).getProjectRelativePath()
183183
.append(SOURCE_ENTRY_FILTER_ALL);
184184
newSourceEntries[0] = new CSourceEntry(project.getFullPath(), excludes, ICSettingEntry.RESOLVED);
185-
IPath excludes2[] = new IPath[9];
185+
IPath excludes2[] = new IPath[10];
186186
excludes2[0] = IPath.fromOSString("**/*.ino"); //$NON-NLS-1$
187187
excludes2[1] = IPath.fromOSString("libraries/?*/**/doc*/**"); //$NON-NLS-1$
188188
excludes2[2] = IPath.fromOSString("libraries/?*/**/?xamples/**"); //$NON-NLS-1$
189189
excludes2[3] = IPath.fromOSString("libraries/?*/**/?xtras/**"); //$NON-NLS-1$
190190
excludes2[4] = IPath.fromOSString("libraries/?*/**/test*/**"); //$NON-NLS-1$
191191
excludes2[5] = IPath.fromOSString("libraries/?*/**/third-party/**"); //$NON-NLS-1$
192192
excludes2[6] = IPath.fromOSString("libraries/**/._*"); //$NON-NLS-1$
193-
excludes2[7] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
194-
excludes2[8] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
193+
excludes2[7] = IPath.fromOSString("libraries/?*/lib/**"); //$NON-NLS-1$
194+
excludes2[8] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
195+
excludes2[9] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
195196

196197
/*
197198
* CDT currently causes issues with ${ConfigName]
@@ -448,17 +449,17 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
448449
IPath path = newProjectHandle.getFolder(rootCodeFolder).getFullPath();
449450
newSourceEntries[0] = new CSourceEntry(path, null, ICSettingEntry.RESOLVED);
450451
}
451-
IPath excludes[] = new IPath[9];
452-
excludes[0] = IPath.fromOSString("**/*.ino"); //$NON-NLS-1$
453-
excludes[1] = IPath.fromOSString("libraries/?*/**/doc*/**"); //$NON-NLS-1$
454-
excludes[2] = IPath.fromOSString("libraries/?*/**/?xamples/**"); //$NON-NLS-1$
455-
excludes[3] = IPath.fromOSString("libraries/?*/**/?xtras/**"); //$NON-NLS-1$
456-
excludes[4] = IPath.fromOSString("libraries/?*/**/test*/**"); //$NON-NLS-1$
457-
excludes[5] = IPath.fromOSString("libraries/?*/**/third-party/**"); //$NON-NLS-1$
458-
excludes[6] = IPath.fromOSString("libraries/**/._*"); //$NON-NLS-1$
459-
excludes[7] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
460-
excludes[8] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
461-
452+
IPath excludes2[] = new IPath[10];
453+
excludes2[0] = IPath.fromOSString("**/*.ino"); //$NON-NLS-1$
454+
excludes2[1] = IPath.fromOSString("libraries/?*/**/doc*/**"); //$NON-NLS-1$
455+
excludes2[2] = IPath.fromOSString("libraries/?*/**/?xamples/**"); //$NON-NLS-1$
456+
excludes2[3] = IPath.fromOSString("libraries/?*/**/?xtras/**"); //$NON-NLS-1$
457+
excludes2[4] = IPath.fromOSString("libraries/?*/**/test*/**"); //$NON-NLS-1$
458+
excludes2[5] = IPath.fromOSString("libraries/?*/**/third-party/**"); //$NON-NLS-1$
459+
excludes2[6] = IPath.fromOSString("libraries/**/._*"); //$NON-NLS-1$
460+
excludes2[7] = IPath.fromOSString("libraries/?*/lib/**"); //$NON-NLS-1$
461+
excludes2[8] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
462+
excludes2[9] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
462463

463464
/*
464465
* CDT currently causes issues with ${ConfigName]
@@ -468,7 +469,7 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
468469
*/
469470
IPath arduinoRoot = newProjectHandle.getFolder(SLOEBER_ARDUINO_FOLDER_NAME).getFullPath()
470471
.append(curConfig.getName());
471-
newSourceEntries[1] = new CSourceEntry(arduinoRoot, excludes, ICSettingEntry.NONE);
472+
newSourceEntries[1] = new CSourceEntry(arduinoRoot, excludes2, ICSettingEntry.NONE);
472473
curConfig.setSourceEntries(newSourceEntries);
473474
IAutoBuildConfigurationDescription iAutoBuildConfig = IAutoBuildConfigurationDescription
474475
.getConfig(curConfig);

0 commit comments

Comments
 (0)