Upversion to 4.0.0 and fix dependency version ranges (bug 157543)

16 files changed, 55 insertions, 61 deletions

diff --git a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
index 3159d256657..affd7d48b52 100644
--- a/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.aix
 Bundle-SymbolicName: org.eclipse.cdt.core.aix; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdtaix.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.aix/build.properties b/core/org.eclipse.cdt.core.aix/build.properties
index db5b7553290..b3eff63cc51 100644
--- a/core/org.eclipse.cdt.core.aix/build.properties
+++ b/core/org.eclipse.cdt.core.aix/build.properties
@@ -11,7 +11,6 @@
 source.cdtaix.jar = src/
 bin.includes = fragment.xml,\
                cdtaix.jar,\
-               fragment.properties,\
                about.html,\
                META-INF/,\
                os/
diff --git a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
index f06f75c5003..dc51f0dde21 100644
--- a/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT Core ia64 Fragment
+Bundle-Name: %fragmentName.linux.ia64
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.ia64
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: Eclipse.org
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Version: 4.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
index 22f062c1382..2ddd46c29e8 100644
--- a/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT Core ppc Fragment
+Bundle-Name: %fragmentName.linux.ppc
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.ppc
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: Eclipse.org
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Version: 4.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
index 0ddebabfda0..943d98f3e91 100644
--- a/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: X86 Fragment
+Bundle-Name: %fragmentName.linux.x86
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: Eclipse.org
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Version: 4.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
index c4291ec2b8b..23912f2dbe0 100644
--- a/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT Core x86_64 Fragment
+Bundle-Name: %fragmentName.linux.x86_64
 Bundle-SymbolicName: org.eclipse.cdt.core.linux.x86_64
-Bundle-Version: 3.1.0.qualifier
-Bundle-Vendor: Eclipse.org
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Bundle-Version: 4.0.0.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
index 818fad86ef0..966c1da7add 100644
--- a/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.macosx
 Bundle-SymbolicName: org.eclipse.cdt.core.macosx; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdt_macosx.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.macosx/build.properties b/core/org.eclipse.cdt.core.macosx/build.properties
index 91d0b8e245a..5a89e2aef8f 100644
--- a/core/org.eclipse.cdt.core.macosx/build.properties
+++ b/core/org.eclipse.cdt.core.macosx/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = fragment.xml,\
-               fragment.properties,\
                about.html,\
                cdt_macosx.jar,\
                os/,\
diff --git a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
index 808d2ff7378..1d460eab31d 100644
--- a/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.qnx
 Bundle-SymbolicName: org.eclipse.cdt.core.qnx; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdt_qnx.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.qnx/build.properties b/core/org.eclipse.cdt.core.qnx/build.properties
index 10e27fa23ce..695b30efe18 100644
--- a/core/org.eclipse.cdt.core.qnx/build.properties
+++ b/core/org.eclipse.cdt.core.qnx/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = fragment.xml,\
-               fragment.properties,\
                about.html,\
                os/,\
                cdt_qnx.jar,\
diff --git a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
index a872c68a696..96dc74dd127 100644
--- a/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.cdt.core.tests
 Bundle-SymbolicName: org.eclipse.cdt.core.tests; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdtcoretests.jar
 Bundle-Activator: org.eclipse.cdt.core.testplugin.CTestPlugin
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
index cbb02d6fb63..7e4dee3ab5c 100644
--- a/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %fragmentName.win32
 Bundle-SymbolicName: org.eclipse.cdt.core.win32; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdt_win32.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.cdt.core;bundle-version="[3.1.0,4.0.0)"
-Bundle-Localization: plugin
+Fragment-Host: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
+Bundle-Localization: fragment
diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 03d92597b21..fdd417c9e51 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -70,10 +70,10 @@ Export-Package: org.eclipse.cdt.core,
  org.eclipse.cdt.utils.spawner,
  org.eclipse.cdt.utils.xcoff,
  org.eclipse.cdt.utils.xcoff.parser
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.text,
- org.eclipse.core.variables,
- org.eclipse.core.filebuffers
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)",
+ org.eclipse.core.filebuffers;bundle-version="[3.2.0,4.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index b0318f73ef4..346c4016b25 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -21,7 +21,6 @@ CProject.name=C Project
 ProcessList.name=Process List
 ErrorParser.name=Error Parser
 CodeFormatter.name=C/C++ Code Formatter
-CodeFormatter.name=C/C++ Code Formatters
 
 CTaskName=C/C++ Task
 
@@ -52,14 +51,15 @@ fileTypeMapping.cppHeaderFile=C++ Header File
 
 fragmentName.aix = C/C++ Development Tools Core for AIX
 fragmentName.linux = C/C++ Development Tools Core for Linux
+fragmentName.linux.ia64 = C/C++ Development Tools Core for Linux (ia64)
+fragmentName.linux.ppc = C/C++ Development Tools Core for Linux (ppc)
+fragmentName.linux.x86 = C/C++ Development Tools Core for Linux (x86)
+fragmentName.linux.x86_64 = C/C++ Development Tools Core for Linux (x86_64)
 fragmentName.qnx = C/C++ Development Tools Core for QNX
 fragmentName.solaris = C/C++ Development Tools Core for Solaris
 fragmentName.win32 = C/C++ Development Tools Core for Windows
 fragmentName.macosx = C/C++ Development Tools Core for MacOS X
 
-CodeFormatter.name=C/C++ Code Formatter
-CodeFormatter.name=C/C++ Code Formatters
-DefaultCodeFormatter.name=Default Formatter
 DefaultCodeFormatter.name=Default Formatter
 
 cSourceName=C Source File
diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
index cd726dc8687..b056be9192c 100644
--- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.cdt.ui.tests
 Bundle-SymbolicName: org.eclipse.cdt.ui.tests; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ClassPath: cdtuitests.jar
 Bundle-Activator: org.eclipse.cdt.ui.testplugin.CTestPlugin
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
index 74e86944d53..e551068018a 100644
--- a/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.ui; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.ui.CUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -54,25 +54,22 @@ Export-Package: org.eclipse.cdt.internal.corext,
  org.eclipse.cdt.ui.wizards,
  org.eclipse.cdt.ui.wizards.conversion,
  org.eclipse.cdt.utils.ui.controls
-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.ui,
- org.eclipse.ui.forms,
- org.eclipse.core.resources,
- org.eclipse.search,
- org.eclipse.compare,
- org.eclipse.cdt.core,
- org.eclipse.ui.console,
- org.eclipse.core.filebuffers,
- org.eclipse.core.runtime,
- org.eclipse.help,
- org.eclipse.ui.navigator,
- org.eclipse.core.expressions,
- org.eclipse.ui.navigator.resources,
- com.ibm.icu,
- org.eclipse.cdt.refactoring
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.compare;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ com.ibm.icu;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.cdt.refactoring;bundle-version="[4.0.0,5.0.0)"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4