exclude lib folders in libraries #1703

Sloeber · Jan 14, 2025 · 90c7c40 · 90c7c40
1 parent cb3f47d
commit 90c7c40
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java b/io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java
@@ -182,16 +182,17 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
 					excludes[1] = project.getFolder(SLOEBER_ARDUINO_FOLDER_NAME).getProjectRelativePath()
 							.append(SOURCE_ENTRY_FILTER_ALL);
 					newSourceEntries[0] = new CSourceEntry(project.getFullPath(), excludes, ICSettingEntry.RESOLVED);
-					IPath excludes2[] = new IPath[9];
+					IPath excludes2[] = new IPath[10];
 					excludes2[0] = IPath.fromOSString("**/*.ino"); //$NON-NLS-1$
 					excludes2[1] = IPath.fromOSString("libraries/?*/**/doc*/**"); //$NON-NLS-1$
 					excludes2[2] = IPath.fromOSString("libraries/?*/**/?xamples/**"); //$NON-NLS-1$
 					excludes2[3] = IPath.fromOSString("libraries/?*/**/?xtras/**"); //$NON-NLS-1$
 					excludes2[4] = IPath.fromOSString("libraries/?*/**/test*/**"); //$NON-NLS-1$
 					excludes2[5] = IPath.fromOSString("libraries/?*/**/third-party/**"); //$NON-NLS-1$
 					excludes2[6] = IPath.fromOSString("libraries/**/._*"); //$NON-NLS-1$
-					excludes2[7] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
-					excludes2[8] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
+					excludes2[7] = IPath.fromOSString("libraries/?*/lib/**"); //$NON-NLS-1$
+					excludes2[8] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
+					excludes2[9] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
 
 					/*
 					 * CDT currently causes issues with ${ConfigName]
@@ -448,17 +449,17 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
 						IPath path = newProjectHandle.getFolder(rootCodeFolder).getFullPath();
 						newSourceEntries[0] = new CSourceEntry(path, null, ICSettingEntry.RESOLVED);
 					}
-					IPath excludes[] = new IPath[9];
-					excludes[0] = IPath.fromOSString("**/*.ino"); //$NON-NLS-1$
-					excludes[1] = IPath.fromOSString("libraries/?*/**/doc*/**"); //$NON-NLS-1$
-					excludes[2] = IPath.fromOSString("libraries/?*/**/?xamples/**"); //$NON-NLS-1$
-					excludes[3] = IPath.fromOSString("libraries/?*/**/?xtras/**"); //$NON-NLS-1$
-					excludes[4] = IPath.fromOSString("libraries/?*/**/test*/**"); //$NON-NLS-1$
-					excludes[5] = IPath.fromOSString("libraries/?*/**/third-party/**"); //$NON-NLS-1$
-					excludes[6] = IPath.fromOSString("libraries/**/._*"); //$NON-NLS-1$
-					excludes[7] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
-					excludes[8] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
-
+					IPath excludes2[] = new IPath[10];
+					excludes2[0] = IPath.fromOSString("**/*.ino"); //$NON-NLS-1$
+					excludes2[1] = IPath.fromOSString("libraries/?*/**/doc*/**"); //$NON-NLS-1$
+					excludes2[2] = IPath.fromOSString("libraries/?*/**/?xamples/**"); //$NON-NLS-1$
+					excludes2[3] = IPath.fromOSString("libraries/?*/**/?xtras/**"); //$NON-NLS-1$
+					excludes2[4] = IPath.fromOSString("libraries/?*/**/test*/**"); //$NON-NLS-1$
+					excludes2[5] = IPath.fromOSString("libraries/?*/**/third-party/**"); //$NON-NLS-1$
+					excludes2[6] = IPath.fromOSString("libraries/**/._*"); //$NON-NLS-1$
+					excludes2[7] = IPath.fromOSString("libraries/?*/lib/**"); //$NON-NLS-1$
+					excludes2[8] = IPath.fromOSString("libraries/?*/utility/*/*"); //$NON-NLS-1$
+					excludes2[9] = IPath.fromOSString("libraries/?*/Applications/**"); //$NON-NLS-1$
 
 					/*
 					 * CDT currently causes issues with ${ConfigName]
@@ -468,7 +469,7 @@ public void run(IProgressMonitor internalMonitor) throws CoreException {
 					 */
 					IPath arduinoRoot = newProjectHandle.getFolder(SLOEBER_ARDUINO_FOLDER_NAME).getFullPath()
 							.append(curConfig.getName());
-					newSourceEntries[1] = new CSourceEntry(arduinoRoot, excludes, ICSettingEntry.NONE);
+					newSourceEntries[1] = new CSourceEntry(arduinoRoot, excludes2, ICSettingEntry.NONE);
 					curConfig.setSourceEntries(newSourceEntries);
 					IAutoBuildConfigurationDescription iAutoBuildConfig = IAutoBuildConfigurationDescription
 							.getConfig(curConfig);