Upversioned the plugins, etc to 2.0.0.

Made sure the jar files got included in the zips.

9 files changed, 28 insertions, 39 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/build.properties b/debug/org.eclipse.cdt.debug.core/build.properties
index fd42cdb9524..68056ad95d9 100644
--- a/debug/org.eclipse.cdt.debug.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.core/build.properties
@@ -1,6 +1,7 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               cdtdebugcore.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html
diff --git a/debug/org.eclipse.cdt.debug.core/plugin.xml b/debug/org.eclipse.cdt.debug.core/plugin.xml
index 786994fe9c3..2eb7e3d3768 100644
--- a/debug/org.eclipse.cdt.debug.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.core.CDebugCorePlugin">
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/build.properties b/debug/org.eclipse.cdt.debug.mi.core/build.properties
index 2484ad9c887..1c84c5c4628 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.core/build.properties
@@ -1,6 +1,7 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               cdtmicore.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html
diff --git a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
index b33467db189..f2cf60dba6d 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.core.MIPlugin">
 
@@ -25,25 +25,25 @@
       <debugger
             platform="native"
             name="%GDBDebugger.name"
-            modes="run,core,attach"
-            cpu="native"
             class="org.eclipse.cdt.debug.mi.core.GDBDebugger"
+            cpu="native"
+            modes="run,core,attach"
             id="org.eclipse.cdt.debug.mi.core.CDebugger">
       </debugger>
       <debugger
             platform="win32"
             name="%CygwinGDBDebugger.name"
-            modes="run,core,attach"
-            cpu="native"
             class="org.eclipse.cdt.debug.mi.core.CygwinGDBDebugger"
+            cpu="native"
+            modes="run,core,attach"
             id="org.eclipse.cdt.debug.mi.core.CygwinCDebugger">
       </debugger>
       <debugger
             platform="native"
             name="%GDBServer.name"
-            modes="run"
-            cpu="native"
             class="org.eclipse.cdt.debug.mi.core.GDBServerDebugger"
+            cpu="native"
+            modes="run"
             id="org.eclipse.cdt.debug.mi.core.GDBServerCDebugger">
       </debugger>
    </extension>
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/build.properties b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
index 3f8bc18ddb9..86e748287d4 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/build.properties
@@ -1,7 +1,8 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               cdtmiui.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 48d01ffcda7..fae2bdebb94 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.mi.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin">
 
@@ -13,17 +13,11 @@
       </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.debug.mi.core"/>
       <import plugin="org.eclipse.cdt.debug.ui"/>
       <import plugin="org.eclipse.cdt.debug.core"/>
-      <import plugin="org.eclipse.cdt.launch"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.debug.ui"/>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
index 525a8a55b67..9c553226936 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui.tests"
    name="org.eclipse.cdt.debug.ui.tests"
-   version="1.2.0"
+   version="2.0.0"
    class="org.eclipse.cdt.debug.testplugin.CTestPlugin">
 
    <runtime>
@@ -13,21 +13,13 @@
    </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.apache.xerces"/>
-      <import plugin="org.eclipse.core.boot"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.swt"/>
       <import plugin="org.junit"/>
       <import plugin="org.eclipse.cdt.debug.core"/>
       <import plugin="org.eclipse.cdt.debug.mi.core"/>
       <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.update.core"/>
    </requires>
 
 
diff --git a/debug/org.eclipse.cdt.debug.ui/build.properties b/debug/org.eclipse.cdt.debug.ui/build.properties
index be3d607c076..566017b98c1 100644
--- a/debug/org.eclipse.cdt.debug.ui/build.properties
+++ b/debug/org.eclipse.cdt.debug.ui/build.properties
@@ -1,11 +1,12 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               icons/
+               icons/,\
+               cdtdebugui.jar
 src.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
                icons/
-source.cdtdebugui.jar = src/
 javadoc.packages = org.eclipse.cdt.debug.ui.*,\
                    org.eclipse.cdt.debug.ui.sourcelookup.*
+source.cdtdebugui.jar = src/
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index d4a02b348b9..dc45ed0d521 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.debug.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.debug.ui.CDebugUIPlugin">
 
@@ -14,7 +14,6 @@
    </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"/>
@@ -941,8 +940,8 @@
             targetID="org.eclipse.debug.ui.DebugView"
             id="org.eclipse.cdt.debug.ui.debugview.toolbar">
          <action
-               toolbarPath="threadGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
+               toolbarPath="threadGroup"
                hoverIcon="icons/full/clcl16/restart.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.RestartActionDelegate"
                disabledIcon="icons/full/dlcl16/restart.gif"
@@ -960,8 +959,8 @@
          </action>
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/show_paths.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
@@ -978,8 +977,8 @@
          </action>
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/disassembly.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                disabledIcon="icons/full/dlcl16/disassembly.gif"
@@ -997,8 +996,8 @@
          </action>
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/debugger_console.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.DebuggerConsoleActionDelegate"
                disabledIcon="icons/full/dlcl16/debugger_console.gif"
@@ -1020,8 +1019,8 @@
             id="org.eclipse.cdt.debug.ui.breakpointview.toolbar">
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/show_paths.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
@@ -1041,8 +1040,8 @@
             targetID="org.eclipse.debug.ui.ExpressionView"
             id="org.eclipse.debug.ui.expressionsView.toolbar">
          <action
-               toolbarPath="expressionGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate"
+               toolbarPath="expressionGroup"
                hoverIcon="icons/full/clcl16/watch_globals.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.AddGlobalsActionDelegate"
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
@@ -1064,8 +1063,8 @@
             id="org.eclipse.debug.ui.sharedLibrariesView.toolbar">
          <action
                style="toggle"
-               toolbarPath="renderGroup"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               toolbarPath="renderGroup"
                hoverIcon="icons/full/clcl16/show_paths.gif"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                disabledIcon="icons/full/dlcl16/show_paths.gif"
@@ -1258,8 +1257,8 @@
             id="org.eclipse.cdt.debug.ui.DefaultSourceLocator">
       </sourceLocator>
       <sourceLocator
-            class="org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator"
             name="%OldDefaultSourceLocator.name"
+            class="org.eclipse.cdt.debug.ui.sourcelookup.DefaultSourceLocator"
             id="org.eclipse.cdt.launch.DefaultSourceLocator">
       </sourceLocator>
    </extension>