From 00cce01cfc865bc29becdad879cfd782a99d84cf Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Thu, 26 Feb 2009 13:27:28 +0000 Subject: [PATCH] API cleanup in make plugins --- .../META-INF/MANIFEST.MF | 2 +- build/org.eclipse.cdt.make.core/.project | 6 +++++ .../META-INF/MANIFEST.MF | 20 ++++++++-------- .../eclipse/cdt/make/core/MakeBuilder.java | 4 ++++ .../META-INF/MANIFEST.MF | 24 +++++++++---------- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF index 6f6befabeec..4c684849c4f 100644 --- a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Make Core Tests Plug-in Bundle-SymbolicName: org.eclipse.cdt.make.core.tests;singleton:=true -Bundle-Version: 5.0.100.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin Export-Package: org.eclipse.cdt.make.builder.tests, org.eclipse.cdt.make.core.tests diff --git a/build/org.eclipse.cdt.make.core/.project b/build/org.eclipse.cdt.make.core/.project index f448e9a452b..6fc02efd1c4 100644 --- a/build/org.eclipse.cdt.make.core/.project +++ b/build/org.eclipse.cdt.make.core/.project @@ -20,9 +20,15 @@ + + org.eclipse.pde.api.tools.apiAnalysisBuilder + + + org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + org.eclipse.pde.api.tools.apiAnalysisNature diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF index fb39e6bb2dd..6df102be2c8 100644 --- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true -Bundle-Version: 5.1.0.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,15 +10,15 @@ Export-Package: org.eclipse.cdt.make.core, org.eclipse.cdt.make.core.makefile, org.eclipse.cdt.make.core.makefile.gnu, org.eclipse.cdt.make.core.scannerconfig, - org.eclipse.cdt.make.internal.core, - org.eclipse.cdt.make.internal.core.makefile, - org.eclipse.cdt.make.internal.core.makefile.gnu, - org.eclipse.cdt.make.internal.core.makefile.posix, - org.eclipse.cdt.make.internal.core.scannerconfig, - org.eclipse.cdt.make.internal.core.scannerconfig.gnu, - org.eclipse.cdt.make.internal.core.scannerconfig.jobs, - org.eclipse.cdt.make.internal.core.scannerconfig.util, - org.eclipse.cdt.make.internal.core.scannerconfig2 + org.eclipse.cdt.make.internal.core;x-internal:=true, + org.eclipse.cdt.make.internal.core.makefile;x-internal:=true, + org.eclipse.cdt.make.internal.core.makefile.gnu;x-internal:=true, + org.eclipse.cdt.make.internal.core.makefile.posix;x-internal:=true, + org.eclipse.cdt.make.internal.core.scannerconfig;x-internal:=true, + org.eclipse.cdt.make.internal.core.scannerconfig.gnu;x-internal:=true, + org.eclipse.cdt.make.internal.core.scannerconfig.jobs;x-internal:=true, + org.eclipse.cdt.make.internal.core.scannerconfig.util;x-internal:=true, + org.eclipse.cdt.make.internal.core.scannerconfig2;x-internal:=true Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)", org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java index b889ded3460..1b52d5ec80e 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java @@ -61,6 +61,7 @@ public class MakeBuilder extends ACBuilder { /** * @see IncrementalProjectBuilder#build */ + @Override protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { boolean bPerformBuild = true; IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(args, MakeBuilder.BUILDER_ID); @@ -89,6 +90,7 @@ public class MakeBuilder extends ACBuilder { } + @Override protected void clean(IProgressMonitor monitor) throws CoreException { final IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(getProject(), BUILDER_ID); if (shouldBuild(CLEAN_BUILD, info)) { @@ -98,6 +100,7 @@ public class MakeBuilder extends ACBuilder { /* (non-Javadoc) * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor) */ + @Override protected IStatus run(IProgressMonitor monitor) { try { ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() { @@ -260,6 +263,7 @@ public class MakeBuilder extends ACBuilder { * Refresh project. Can be overridden to not call actual refresh or to do something else. * Method is called after build is complete. * @param project + * @since 6.0 */ protected void refreshProject(IProject project) { try { diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF index f7a0d56e67c..e611970bd1f 100644 --- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF @@ -2,20 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true -Bundle-Version: 5.0.100.qualifier +Bundle-Version: 6.0.0.qualifier Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.cdt.make.internal.ui, - org.eclipse.cdt.make.internal.ui.compare, - org.eclipse.cdt.make.internal.ui.editor, - org.eclipse.cdt.make.internal.ui.part, - org.eclipse.cdt.make.internal.ui.preferences, - org.eclipse.cdt.make.internal.ui.properties, - org.eclipse.cdt.make.internal.ui.scannerconfig, - org.eclipse.cdt.make.internal.ui.text, - org.eclipse.cdt.make.internal.ui.text.makefile, - org.eclipse.cdt.make.internal.ui.wizards, +Export-Package: org.eclipse.cdt.make.internal.ui;x-internal:=true, + org.eclipse.cdt.make.internal.ui.compare;x-internal:=true, + org.eclipse.cdt.make.internal.ui.editor;x-internal:=true, + org.eclipse.cdt.make.internal.ui.part;x-internal:=true, + org.eclipse.cdt.make.internal.ui.preferences;x-internal:=true, + org.eclipse.cdt.make.internal.ui.properties;x-internal:=true, + org.eclipse.cdt.make.internal.ui.scannerconfig;x-internal:=true, + org.eclipse.cdt.make.internal.ui.text;x-internal:=true, + org.eclipse.cdt.make.internal.ui.text.makefile;x-internal:=true, + org.eclipse.cdt.make.internal.ui.wizards;x-internal:=true, org.eclipse.cdt.make.ui, org.eclipse.cdt.make.ui.actions, org.eclipse.cdt.make.ui.dialogs, @@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.cdt.core;bundle-version="[5.0.0,6.0.0)", org.eclipse.cdt.ui;bundle-version="[5.0.0,6.0.0)", - org.eclipse.cdt.make.core;bundle-version="[5.0.0,6.0.0)", + org.eclipse.cdt.make.core;bundle-version="[6.0.0,7.0.0)", org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)", org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional,