From e938acbcb4f29264bf23b59fb966c44e8483c0ed Mon Sep 17 00:00:00 2001 From: Chris Recoskie Date: Wed, 2 Jun 2010 12:41:49 +0000 Subject: [PATCH] Bug 315117 - xlc scanner discovery scheduling rule issue --- xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF | 4 +++- .../core/scannerconfig/PerFileXLCScannerInfoCollector.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF index 166d60c6401..75427568638 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF +++ b/xlc/org.eclipse.cdt.make.xlc.core/META-INF/MANIFEST.MF @@ -11,7 +11,9 @@ Require-Bundle: org.eclipse.cdt.make.core, org.eclipse.core.runtime, org.eclipse.cdt.managedbuilder.core Export-Package: org.eclipse.cdt.make.xlc.core.activator, - org.eclipse.cdt.make.xlc.core.scannerconfig + org.eclipse.cdt.make.xlc.core.messages, + org.eclipse.cdt.make.xlc.core.scannerconfig, + org.eclipse.cdt.make.xlc.core.scannerconfig.util Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.cdt.make.xlc.core.activator.Activator Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java index 1d5f6599824..fcd524e28b5 100644 --- a/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java +++ b/xlc/org.eclipse.cdt.make.xlc.core/src/org/eclipse/cdt/make/xlc/core/scannerconfig/PerFileXLCScannerInfoCollector.java @@ -1640,7 +1640,7 @@ public class PerFileXLCScannerInfoCollector implements IScannerInfoCollector3, I Job job = new ScannerConfigUpdateJob(context, pathInfo, context.isDefaultContext(), changedResources); - ISchedulingRule rule = project; + ISchedulingRule rule = ResourcesPlugin.getWorkspace().getRoot(); job.setRule(rule); job.schedule();