Clean should not try to remove the buildfolder

As deleting the build folder causes issues.
Centralised a method on the configuration so there is only one
implementation

Author: jan

io.sloeber.autoBuild/src/io/sloeber/autoBuild/api/IAutoBuildConfigurationDescription.java

@@ -19,6 +19,8 @@
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IProgressMonitor;
+
 import io.sloeber.autoBuild.buildTools.api.IBuildTools;
 import io.sloeber.autoBuild.buildTools.api.IBuildToolsManager.ToolFlavour;
 import io.sloeber.autoBuild.integration.AutoBuildConfigurationDescription;
@@ -454,5 +456,13 @@ public static ICSourceEntry[] getResolvedSourceEntries(IAutoBuildConfigurationDe
      */
     public 	LinkedHashMap<String, String> getPostbuildSteps();
 
+    /***
+     * delete the build folder
+     * Not actually deletes the build folder but all the members.
+     *
+     * @param monitor
+     */
+	void deleteBuildFolder(IProgressMonitor monitor);
+
 
 }

io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/BuildRunnerForMake.java

@@ -64,14 +64,8 @@ public class BuildRunnerForMake implements IBuildRunner {
 	@Override
 	public void invokeClean(int kind, IAutoBuildConfigurationDescription autoData,
 			IMarkerGenerator markerGenerator, IConsole console, IProgressMonitor monitor) throws CoreException {
-		IFolder buildRoot = autoData.getBuildFolder();
-		if(!buildRoot.exists()) {
-			return ;
-		}
-		//Do not delete the build folder as it may be in use with other processes (like discovery)
-		for(IResource curMember:buildRoot.members()) {
-			curMember.delete(true, monitor);
-		}
+		autoData.deleteBuildFolder(monitor);
+
 		//buildRoot.create(true, true, monitor);
 //		for now I do not run make clean due to the fact rm -f is probably not on the system path
 		//return invokeBuild(IncrementalProjectBuilder.CLEAN_BUILD, envp, autoData, markerGenerator, console, monitor);

io.sloeber.autoBuild/src/io/sloeber/autoBuild/extensionPoint/providers/InternalBuildRunner.java

@@ -86,16 +86,7 @@ private static void createFolder(IFolder folder, boolean force, boolean local, I
 	@Override
 	public void invokeClean(int kind, IAutoBuildConfigurationDescription autoData, IMarkerGenerator markerGenerator,
 			IConsole console, IProgressMonitor monitor) throws CoreException {
-		IFolder buildRoot = autoData.getBuildFolder();
-		if(!buildRoot.exists()) {
-			return ;
-		}
-		//Do not delete the build folder as it may be in use with other processes (like discovery)
-		for(IResource curMember:buildRoot.members()) {
-			curMember.delete(true, monitor);
-		}
-//		buildRoot.delete(true, monitor);
-//		buildRoot.create(true, true, monitor);
+		autoData.deleteBuildFolder(monitor);
 		return ;
 	}
 

io.sloeber.autoBuild/src/io/sloeber/autoBuild/integration/AutoBuildConfigurationDescription.java

@@ -33,8 +33,10 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
 import org.osgi.framework.Bundle;
 
 import io.sloeber.autoBuild.api.AutoBuildCommon;
@@ -1128,16 +1130,33 @@ public void forceCleanBeforeBuild() {
 		myForceCleanBeforeBuild = true;
 	}
 
-	public void forceFullBuildIfNeeded(IProgressMonitor monitor) throws CoreException {
+	public void forceFullBuildIfNeeded(IProgressMonitor monitor)  {
 		if (myForceCleanBeforeBuild) {
 			myForceCleanBeforeBuild = false;
-			IFolder buildFolder = getBuildFolder();
-			if (buildFolder != null && buildFolder.exists()) {
-				buildFolder.delete(true, monitor);
-			}
-
+			deleteBuildFolder(monitor);
 		}
+	}
 
+	@Override
+	public void deleteBuildFolder(IProgressMonitor monitor) {
+		//Do not delete the build folder as it may be in use with other processes (like discovery)
+
+		IFolder buildFolder = getBuildFolder();
+		if (buildFolder != null && buildFolder.exists()) {
+			try {
+				for(IResource curMember:buildFolder.members()) {
+					try {
+						curMember.delete(true, monitor);
+					} catch (CoreException e) {
+						Activator.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+				                "Failed to delete member "+curMember.getName(), e));
+					}
+
+				}
+			} catch (CoreException e) {
+				e.printStackTrace();
+			}
+		}
 	}
 
 	private static String getSpecFile(String languageId) {

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

@@ -23,6 +23,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ui.console.ConsolePlugin;
 import org.eclipse.ui.console.IConsole;
@@ -285,15 +286,7 @@ public static void deleteBuildFolder(IProject project, String cfgName) {
         IAutoBuildConfigurationDescription autoData = IAutoBuildConfigurationDescription
                 .getConfig(cdtConfigurationDescription);
 
-        IFolder buildFolder = autoData.getBuildFolder();
-        if (buildFolder.exists()) {
-            try {
-                buildFolder.delete(true, null);
-            } catch (CoreException e) {
-                Activator.log(new Status(IStatus.ERROR, CORE_PLUGIN_ID,
-                        Messages.Helpers_delete_folder_failed.replace(FOLDER, cfgName), e));
-            }
-        }
+        autoData.deleteBuildFolder(new NullProgressMonitor());
     }
 
     /**