Added org.eclipse.core.runtime.compatability as a

dependency to satisfy Eclipse 3.0M6 requirements.

2 files changed, 41 insertions, 16 deletions

diff --git a/build/org.eclipse.cdt.make.ui/.classpath b/build/org.eclipse.cdt.make.ui/.classpath
index 065ac06e197..4e3a29e15dc 100644
--- a/build/org.eclipse.cdt.make.ui/.classpath
+++ b/build/org.eclipse.cdt.make.ui/.classpath
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.ide_3.0.0/idesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.ide_3.0.0/ide.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_3.0.0/viewssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_3.0.0/views.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_3.0.0/texteditorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_3.0.0/editorssrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_3.0.0/editors.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.core"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.ui"/>
+	<classpathentry kind="src" path="/org.eclipse.cdt.make.core"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime.compatibility_3.0.0/compatibilitysrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime.compatibility_3.0.0/compatibility.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi.util_3.0.0/utilsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi.util_3.0.0/util.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/osgisrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/osgi.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/coresrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/core.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/resolversrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/resolver.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/defaultAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/defaultAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.osgi_3.0.0/eclipseAdaptorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.osgi_3.0.0/eclipseAdaptor.jar"/>
+	<classpathentry sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.configurator_3.0.0/configuratorsrc.zip" kind="var" path="ECLIPSE_HOME/plugins/org.eclipse.update.configurator_3.0.0/configurator.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 761e8aa0fa4..7bed92a07d9 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -23,6 +23,7 @@
       <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.compatibility"/>
    </requires>
 
 
@@ -33,8 +34,8 @@
             icon="icons/ctool16/newc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             project="true"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.ui.wizards.NewMakeCProjectWizard">
          <description>
             %WizardNewCMakeProject.description
@@ -60,8 +61,8 @@
             icon="icons/ctool16/newcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard"
-            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             project="true"
+            finalPerspective="org.eclipse.cdt.ui.CPerspective"
             id="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard">
          <description>
             %WizardNewCCMakeProject.description
@@ -85,8 +86,8 @@
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.ICContainer"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -108,8 +109,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.ITranslationUnit"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -131,8 +132,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.IBinary"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -154,8 +155,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.cdt.core.model.IArchive"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.CViewContribution">
          <action
                label="%ActionMakeCreateTarget.label"
@@ -177,8 +178,8 @@
          </filter>
       </objectContribution>
       <objectContribution
-            adaptable="false"
             objectClass="org.eclipse.core.resources.IResource"
+            adaptable="false"
             id="org.eclipse.cdt.make.ui.popupMenu.NavigatorContribution">
          <action
                label="%ActionMakeBuildTarget.label"
@@ -204,14 +205,14 @@
          point="org.eclipse.ui.commands">
       <command
             name="%CommandTargetBuild.name"
-            category="org.eclipse.ui.category.project"
             description="%CommandTargetBuild.description"
+            category="org.eclipse.ui.category.project"
             id="org.eclipse.cdt.make.ui.targetBuildCommand">
       </command>
       <command
             name="%CommandTargetCreate.name"
-            category="org.eclipse.ui.category.project"
             description="%CommandTargetCreate.description"
+            category="org.eclipse.ui.category.project"
             id="org.eclipse.cdt.make.ui.targetCreateCommand">
       </command>
    </extension>
@@ -231,8 +232,8 @@
       </scope>
       <command
             name="%ActionDefinition.comment.name"
-            category="org.eclipse.cdt.make.ui.category.source"
             description="%ActionDefinition.comment.description"
+            category="org.eclipse.cdt.make.ui.category.source"
             id="org.eclipse.cdt.make.ui.edit.text.makefile.comment">
       </command>
       <keyBinding
@@ -243,8 +244,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            category="org.eclipse.cdt.make.ui.category.source"
             description="%ActionDefinition.uncomment.description"
+            category="org.eclipse.cdt.make.ui.category.source"
             id="org.eclipse.cdt.make.ui.edit.text.makefile.uncomment">
       </command>
       <keyBinding
@@ -266,8 +267,8 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            adaptable="true"
             objectClass="org.eclipse.core.resources.IProject"
+            adaptable="true"
             name="%PropertyMakeProject.name"
             class="org.eclipse.cdt.make.internal.ui.properties.MakePropertyPage"
             id="org.eclipse.cdt.make.ui.properties.MakePropertyPage">
@@ -299,8 +300,8 @@
          <action
                label="%ActionMakeUpdate.label"
                icon="icons/ctool16/update_old.gif"
-               class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
                tooltip="%ActionMakeUpdate.tooltip"
+               class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
                toolbarPath="Normal"
                id="org.eclipse.cdt.make.ui.UpdateMakeAction">
             <enablement>
@@ -386,8 +387,8 @@
          <view
                relative="org.eclipse.ui.views.ContentOutline"
                visible="true"
-               id="org.eclipse.cdt.make.ui.views.MakeView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.make.ui.views.MakeView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.make.ui.views.MakeView">