Upversioned the plugins, etc to 2.0.0.

Made sure the jar files got included in the zips.

16 files changed, 55 insertions, 59 deletions

diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml
index 9824916abbf..0fb9263b4fc 100644
--- a/core/org.eclipse.cdt.core.aix/fragment.xml
+++ b/core/org.eclipse.cdt.core.aix/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.aix"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
@@ -12,11 +12,11 @@
       <library name="cdtaix.jar"/>
    </runtime>
 
+
    <extension
          point="org.eclipse.cdt.core.ProcessList">
       <processList
             class="org.eclipse.cdt.internal.core.linux.ProcessList">
       </processList>
    </extension>
-
 </fragment>
diff --git a/core/org.eclipse.cdt.core.linux/build.properties b/core/org.eclipse.cdt.core.linux/build.properties
index 5676697c351..6e10a326c55 100644
--- a/core/org.eclipse.cdt.core.linux/build.properties
+++ b/core/org.eclipse.cdt.core.linux/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_linux.jar
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 			   
+               os/
 source.cdt_linux.jar = src/
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index 989c14ab6e7..84e7988771e 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.linux"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core.qnx/build.properties b/core/org.eclipse.cdt.core.qnx/build.properties
index ec4ae70ed60..ef4622fb432 100644
--- a/core/org.eclipse.cdt.core.qnx/build.properties
+++ b/core/org.eclipse.cdt.core.qnx/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_qnx.jar
+source.cdt_qnx.jar = src/
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
-source.cdt_qnx.jar = src/
+               os/
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index 11745e6d5dd..3026a159cc6 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.qnx"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core.solaris/build.properties b/core/org.eclipse.cdt.core.solaris/build.properties
index bcd4a1a0251..3c308d2f2d2 100644
--- a/core/org.eclipse.cdt.core.solaris/build.properties
+++ b/core/org.eclipse.cdt.core.solaris/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_solaris.jar
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/                
+               os/
 source.cdt_solaris.jar = src/
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index 495da0f7b5e..ecef10d34cc 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.solaris"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core.tests/plugin.xml b/core/org.eclipse.cdt.core.tests/plugin.xml
index fe0fd3442e1..7114e7571e4 100644
--- a/core/org.eclipse.cdt.core.tests/plugin.xml
+++ b/core/org.eclipse.cdt.core.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.core.tests"
    name="org.eclipse.cdt.core.tests"
-   version="1.2.0"
+   version="2.0.0"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
@@ -13,10 +13,7 @@
    </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.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
@@ -209,7 +206,7 @@
                      builtIn="false">
                </listOptionValue>
                <listOptionValue
-		             value="&quot;../includes&quot;"
+                     value="&quot;../includes&quot;"
                      builtIn="false">
                </listOptionValue>
             </option>
diff --git a/core/org.eclipse.cdt.core.win32/build.properties b/core/org.eclipse.cdt.core.win32/build.properties
index ca4d06b082b..776fc95bb2e 100644
--- a/core/org.eclipse.cdt.core.win32/build.properties
+++ b/core/org.eclipse.cdt.core.win32/build.properties
@@ -1,9 +1,10 @@
 bin.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/ 
+               os/,\
+               cdt_win32.jar
 src.includes = fragment.xml,\
                fragment.properties,\
                about.html,\
-			   os/               
+               os/
 source.cdt_win32.jar = src/
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index d56f46969d6..d543dc3661e 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -3,7 +3,7 @@
 <fragment
    id="org.eclipse.cdt.core.win32"
    name="%fragmentName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="1.2.0">
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 9b6e7bcb3af..cdada4ac275 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -1,6 +1,10 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               cdtparser.jar,\
+               cdtcore.jar
+jars.compile.order = cdtparser.jar,\
+                     cdtcore.jar
 src.includes = about.html,\
                schema/
 javadoc.packages = org.eclipse.cdt.core.*,\
@@ -18,5 +22,3 @@ source.cdtcore.jar = build/,\
                      search/,\
                      dependency/
 source.cdtparser.jar = parser/
-jars.compile.order = cdtparser.jar,\
-                     cdtcore.jar
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index f31224caffb..31688d78655 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.core"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.core.CCorePlugin">
 
@@ -19,9 +19,6 @@
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.apache.xerces"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.debug.core"/>
       <import plugin="org.eclipse.team.core"/>
    </requires>
 
diff --git a/core/org.eclipse.cdt.ui.tests/build.properties b/core/org.eclipse.cdt.ui.tests/build.properties
index 566fba87bee..66865c3199e 100644
--- a/core/org.eclipse.cdt.ui.tests/build.properties
+++ b/core/org.eclipse.cdt.ui.tests/build.properties
@@ -4,7 +4,8 @@ source.cdtuitests.jar = src/,\
 bin.includes = plugin.xml,\
                about.html,\
                plugin.properties,\
-               test.xml
+               test.xml,\
+               cdtuitests.jar
 src.includes = plugin.xml,\
                about.html,\
                plugin.properties,\
diff --git a/core/org.eclipse.cdt.ui.tests/plugin.xml b/core/org.eclipse.cdt.ui.tests/plugin.xml
index 054005b77fa..f858df8da55 100644
--- a/core/org.eclipse.cdt.ui.tests/plugin.xml
+++ b/core/org.eclipse.cdt.ui.tests/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.ui.tests"
    name="org.eclipse.cdt.ui.tests"
-   version="1.2.0"
+   version="2.0.0"
    class="org.eclipse.cdt.testplugin.CTestPlugin">
 
    <runtime>
@@ -12,15 +12,9 @@
       </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.apache.xerces"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.cdt.core"/>
       <import plugin="org.eclipse.cdt.ui"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.ui"/>
diff --git a/core/org.eclipse.cdt.ui/build.properties b/core/org.eclipse.cdt.ui/build.properties
index 223fb70851e..6b55904498a 100644
--- a/core/org.eclipse.cdt.ui/build.properties
+++ b/core/org.eclipse.cdt.ui/build.properties
@@ -2,7 +2,8 @@ bin.includes = about.html,\
                plugin.xml,\
                about.html,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               cdtui.jar
 source.cdtui.jar = src/,\
                    utils.ui/
 src.includes = about.html,\
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index a17ff02d33d..43632749ca7 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="org.eclipse.cdt.ui"
    name="%pluginName"
-   version="1.2.0"
+   version="2.0.0"
    provider-name="%providerName"
    class="org.eclipse.cdt.ui.CUIPlugin">
 
@@ -165,26 +165,26 @@
          id="org.eclipse.cdt.ui.ceditor"
          point="org.eclipse.ui.editors">
       <editor
-            name="%CEditor.name"
             default="true"
-            icon="icons/full/obj16/c_file_obj.gif"
+            name="%CEditor.name"
             extensions="c, h, cc, hh, cpp, cxx, hpp"
-            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            icon="icons/full/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.CEditor"
+            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
       <editor
             name="%Editors.DefaultTextEditor"
-            icon="icons/full/obj16/file_obj.gif"
             extensions="mk"
-            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
+            icon="icons/full/obj16/file_obj.gif"
             class="org.eclipse.ui.editors.text.TextEditor"
+            contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor"
             id="org.eclipse.ui.DefaultTextEditor">
       </editor>
       <editor
             name="%AsmEditor.name"
-            icon="icons/full/obj16/c_file_obj.gif"
             extensions="s"
+            icon="icons/full/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
       </editor>
@@ -253,16 +253,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -273,16 +273,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -312,24 +312,24 @@
          <action
                label="%OpenNewFileWizardAction.label"
                icon="icons/full/ctool16/newfile_wiz.gif"
-               tooltip="%OpenNewFileWizardAction.tooltip"
                class="org.eclipse.cdt.internal.ui.wizards.OpenNewFileWizardAction"
+               tooltip="%OpenNewFileWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFileWizardAction">
          </action>
          <action
                label="%OpenNewFolderWizardAction.label"
                icon="icons/full/ctool16/newfolder_wiz.gif"
-               tooltip="%OpenNewFolderWizardAction.tooltip"
                class="org.eclipse.cdt.internal.ui.wizards.OpenNewFolderWizardAction"
+               tooltip="%OpenNewFolderWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFolderWizardAction">
          </action>
          <action
                label="%OpenClassWizardAction.label"
                icon="icons/full/ctool16/newclass_wiz.gif"
-               tooltip="%OpenClassWizardAction.tooltip"
                class="org.eclipse.cdt.ui.actions.OpenClassWizardAction"
+               tooltip="%OpenClassWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenClassWizardAction">
             <enablement>
@@ -370,8 +370,8 @@
       </category>
       <command
             name="%ActionDefinition.comment.name"
-            description="%ActionDefinition.comment.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.comment.description"
             id="org.eclipse.cdt.ui.edit.text.c.comment">
       </command>
       <keyBinding
@@ -382,8 +382,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            description="%ActionDefinition.uncomment.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.uncomment.description"
             id="org.eclipse.cdt.ui.edit.text.c.uncomment">
       </command>
       <keyBinding
@@ -394,8 +394,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.opendecl.name"
-            description="%ActionDefinition.opendecl.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.opendecl.description"
             id="org.eclipse.cdt.ui.edit.opendecl">
       </command>
       <keyBinding
@@ -412,8 +412,8 @@
       <page
             showScopeSection="true"
             label="%CSearchPage.label"
-            icon="icons/full/obj16/csearch_obj.gif"
             extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
+            icon="icons/full/obj16/csearch_obj.gif"
             class="org.eclipse.cdt.internal.ui.search.CSearchPage"
             sizeHint="460, 160"
             id="org.eclipse.cdt.ui.CSearchPage">
@@ -425,24 +425,24 @@
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ElementNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%ElementNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
+            tooltip="%ElementNameSorter.tooltip"
             id="org.eclipse.search.internal.ui.ElementNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ParentNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%ParentNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
+            tooltip="%ParentNameSorter.tooltip"
             id="org.eclipse.search.internal.ui.ParentNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%PathNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%PathNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
+            tooltip="%PathNameSorter.tooltip"
             id="org.eclipse.search.internal.ui.PathNameSorter">
       </sorter>
    </extension>
@@ -484,16 +484,16 @@
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            parserID="org.eclipse.cdt.core.GNU_ELF"
             class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
+            parserID="org.eclipse.cdt.core.GNU_ELF"
             id="ElfBinaryParserPage">
       </parserPage>
    </extension>
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            parserID="org.eclipse.cdt.core.Cygwin_PE"
             class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
+            parserID="org.eclipse.cdt.core.Cygwin_PE"
             id="PEBinaryParserPage">
       </parserPage>
    </extension>