From 47a94fe3d9d66d11d016e2d46cd0fce460efded8 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 9 Sep 2021 14:44:41 -0400 Subject: [PATCH] Bug 575903: Call correct clean method The old clean method was removed from use in Bug 571134 but this call to it was missed. Change-Id: I01310a3e3c1f45534e55d146f9480ac323446dd4 --- .../org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF | 2 +- .../cdt/managedbuilder/internal/core/CommonBuilder.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF index e0598f5f9fe..4a1aa871d86 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true -Bundle-Version: 9.3.100.qualifier +Bundle-Version: 9.3.200.qualifier Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java index caa200bf558..fb12dc5f22a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java @@ -969,7 +969,7 @@ public class CommonBuilder extends ACBuilder implements IIncrementalProjectBuild //in case an error occured, make it behave in the old stile: if (cfg.needsRebuild()) { //make a full clean if an info needs a rebuild - clean(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)); + clean((Map) null, new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)); makefileRegenerationNeeded = true; } else if (delta != null && !makefileRegenerationNeeded) { // Create a delta visitor to detect the build type @@ -977,7 +977,8 @@ public class CommonBuilder extends ACBuilder implements IIncrementalProjectBuild bInfo.getBuildInfo().getManagedProject().getConfigurations()); delta.accept(visitor); if (visitor.shouldBuildFull()) { - clean(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)); + clean((Map) null, + new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)); makefileRegenerationNeeded = true; } }