Made all of the plugins OSGi components.

3 files changed, 40 insertions, 27 deletions

diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..bce809bf534
--- /dev/null
+++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true
+Bundle-Version: 3.1.0
+Bundle-ClassPath: cdtmakeui.jar
+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.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,
+ org.eclipse.cdt.make.ui,
+ org.eclipse.cdt.make.ui.actions,
+ org.eclipse.cdt.make.ui.dialogs,
+ org.eclipse.cdt.make.ui.views,
+ org.eclipse.cdt.make.ui.wizards
+Require-Bundle: org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.jface.text,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.core.resources,
+ org.eclipse.ui,
+ org.eclipse.cdt.core,
+ org.eclipse.cdt.ui,
+ org.eclipse.cdt.make.core,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.ui
+Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.make.ui/build.properties b/build/org.eclipse.cdt.make.ui/build.properties
index 9d96d01f83c..e004a1d2eb9 100644
--- a/build/org.eclipse.cdt.make.ui/build.properties
+++ b/build/org.eclipse.cdt.make.ui/build.properties
@@ -13,5 +13,6 @@ bin.includes = plugin.xml,\
                cdtmakeui.jar,\
                icons/,\
                *.html,\
-               plugin.properties
+               plugin.properties,\
+               META-INF/
 source.cdtmakeui.jar = src/
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index e8447fbbaa2..7ee36209505 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.make.ui"
-   name="%pluginName"
-   version="3.1.0"
-   provider-name="%providerName"
-   class="org.eclipse.cdt.make.internal.ui.MakeUIPlugin">
+<plugin>
 
-   <runtime>
-      <library name="cdtmakeui.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.cdt.core"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.cdt.make.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.ui"/>
-   </requires>
-   <extension-point id="DiscoveryProfilePage" name="%discoveryProfilePage.name" schema="schema/DiscoveryProfilePage.exsd"/>
+     <extension-point id="DiscoveryProfilePage" name="%discoveryProfilePage.name" schema="schema/DiscoveryProfilePage.exsd"/>
 
 
    <extension