Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2006-10-11 08:28:54 -0400
committerAnton Leherbauer2006-10-11 08:28:54 -0400
commitb7f5c2f33ee90c07982cd674106f93904a223db4 (patch)
treed93331a1f5ea5fb72b718124ccdc07acfeb0015b
parentad88076d703440f909c8d91e8e8822fe9327b0d6 (diff)
downloadorg.eclipse.cdt-b7f5c2f33ee90c07982cd674106f93904a223db4.tar.gz
org.eclipse.cdt-b7f5c2f33ee90c07982cd674106f93904a223db4.tar.xz
org.eclipse.cdt-b7f5c2f33ee90c07982cd674106f93904a223db4.zip
Upversion to 4.0.0 and fix dependency version ranges (bug 157543)
-rw-r--r--build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF10
-rw-r--r--build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF28
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF14
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF8
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF20
-rw-r--r--core/org.eclipse.cdt.core.aix/META-INF/MANIFEST.MF4
-rw-r--r--core/org.eclipse.cdt.core.aix/build.properties1
-rw-r--r--core/org.eclipse.cdt.core.linux.ia64/META-INF/MANIFEST.MF8
-rw-r--r--core/org.eclipse.cdt.core.linux.ppc/META-INF/MANIFEST.MF8
-rw-r--r--core/org.eclipse.cdt.core.linux.x86/META-INF/MANIFEST.MF8
-rw-r--r--core/org.eclipse.cdt.core.linux.x86_64/META-INF/MANIFEST.MF8
-rw-r--r--core/org.eclipse.cdt.core.macosx/META-INF/MANIFEST.MF4
-rw-r--r--core/org.eclipse.cdt.core.macosx/build.properties1
-rw-r--r--core/org.eclipse.cdt.core.qnx/META-INF/MANIFEST.MF4
-rw-r--r--core/org.eclipse.cdt.core.qnx/build.properties1
-rw-r--r--core/org.eclipse.cdt.core.tests/META-INF/MANIFEST.MF2
-rw-r--r--core/org.eclipse.cdt.core.win32/META-INF/MANIFEST.MF6
-rw-r--r--core/org.eclipse.cdt.core/META-INF/MANIFEST.MF12
-rw-r--r--core/org.eclipse.cdt.core/plugin.properties8
-rw-r--r--core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--core/org.eclipse.cdt.ui/META-INF/MANIFEST.MF39
-rw-r--r--debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF10
-rw-r--r--debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF12
-rw-r--r--debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF26
-rw-r--r--debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF30
-rw-r--r--doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF8
-rw-r--r--doc/org.eclipse.cdt.doc.isv/build.properties1
-rw-r--r--doc/org.eclipse.cdt.doc.isv/plugin.properties12
-rw-r--r--doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF2
-rw-r--r--launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF26
-rw-r--r--releng/org.eclipse.cdt-feature/feature.xml51
-rw-r--r--releng/org.eclipse.cdt.sdk-feature/feature.xml6
-rw-r--r--releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.cdt.testing-feature/feature.xml31
-rw-r--r--releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.cdt/META-INF/MANIFEST.MF6
40 files changed, 234 insertions, 195 deletions
diff --git a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
index 0ac309fb04..00becff334 100644
--- a/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Make Core Tests Plug-in
Bundle-SymbolicName: org.eclipse.cdt.make.core.tests
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-ClassPath: makecoretests.jar
Bundle-Activator: org.eclipse.cdt.make.core.tests.MakeTestsPlugin
Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
index 3f29dd3799..052eb8c33d 100644
--- a/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.make.core; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.make.core.MakeCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -19,8 +19,8 @@ Export-Package: org.eclipse.cdt.make.core,
org.eclipse.cdt.make.internal.core.scannerconfig.jobs,
org.eclipse.cdt.make.internal.core.scannerconfig.util,
org.eclipse.cdt.make.internal.core.scannerconfig2
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.variables,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
index 5f6e1fd8b3..eab1be0f42 100644
--- a/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.make.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.make.ui; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.make.internal.ui.MakeUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -20,17 +20,17 @@ Export-Package: org.eclipse.cdt.make.internal.ui,
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,
- org.eclipse.ui.navigator
+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.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.make.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional
Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
index 732dc6d1b9..def01a183f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core.tests; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-ClassPath: mbscoretests.jar
Bundle-Activator: org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin
Bundle-Vendor: Eclipse.org
diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
index cc7ab0e0d1..1db75599ee 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -20,10 +20,10 @@ Export-Package: org.eclipse.cdt.managedbuilder.buildmodel,
org.eclipse.cdt.managedbuilder.makegen.internal,
org.eclipse.cdt.managedbuilder.projectconverter,
org.eclipse.cdt.managedbuilder.scannerconfig
-Require-Bundle: org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.cdt.make.core,
- org.eclipse.ui,
- org.eclipse.core.variables
+Require-Bundle: org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ 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.cdt.make.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)"
Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
index 354202dc8c..dbc9a92a23 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.gnu.ui; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.cdt.managedbuilder.gnu.cygwin,
org.eclipse.cdt.managedbuilder.gnu.ui
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.cdt.core
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)"
Eclipse-LazyStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
index a9c1ddf7ec..895e9ef187 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Managed Build UI Tests Plug-in
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui.tests; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.cdt.managedbuilder.ui.tests.testplugin.TestsPlugin
Bundle-Vendor: Eclipse.org
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
index 2b8c23f1ef..b9b14e977b 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.ui; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.internal.ui.ManagedBuilderUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,13 +10,13 @@ Export-Package: org.eclipse.cdt.managedbuilder.internal.ui,
org.eclipse.cdt.managedbuilder.ui.actions,
org.eclipse.cdt.managedbuilder.ui.properties,
org.eclipse.cdt.managedbuilder.ui.wizards
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.core.runtime,
- org.eclipse.core.variables,
- org.eclipse.ui.navigator
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)";resolution:=optional
Eclipse-LazyStart: true
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 3159d25665..affd7d48b5 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 db5b755329..b3eff63cc5 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 f06f75c500..dc51f0dde2 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 22f062c138..2ddd46c29e 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 0ddebabfda..943d98f3e9 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 c4291ec2b8..23912f2dbe 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 818fad86ef..966c1da7ad 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 91d0b8e245..5a89e2aef8 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 808d2ff737..1d460eab31 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 10e27fa23c..695b30efe1 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 a872c68a69..96dc74dd12 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 cbb02d6fb6..7e4dee3ab5 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 03d92597b2..fdd417c9e5 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 b0318f73ef..346c4016b2 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 cd726dc868..b056be9192 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 74e86944d5..e551068018 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
diff --git a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
index 41b3f4bf21..3294c5b1b1 100644
--- a/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.core; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.core.CDebugCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -17,8 +17,8 @@ Export-Package: org.eclipse.cdt.debug.core,
org.eclipse.cdt.debug.internal.core.breakpoints,
org.eclipse.cdt.debug.internal.core.model,
org.eclipse.cdt.debug.internal.core.sourcelookup
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.cdt.core,
- org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
index 35bfd3d390..e34b8c0939 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.mi.core; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.mi.core.MIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -18,9 +18,9 @@ Export-Package: org.eclipse.cdt.debug.mi.core,
org.eclipse.cdt.debug.mi.core.command.factories.win32,
org.eclipse.cdt.debug.mi.core.event,
org.eclipse.cdt.debug.mi.core.output
-Require-Bundle: org.eclipse.cdt.debug.core,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.cdt.core,
- org.eclipse.core.runtime
+Require-Bundle: org.eclipse.cdt.debug.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
index 687f71473d..3884b6f42e 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.mi.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.mi.ui; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.mi.internal.ui.MIUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,16 +12,16 @@ Export-Package: org.eclipse.cdt.debug.mi.internal.ui,
org.eclipse.cdt.debug.mi.internal.ui.preferences,
org.eclipse.cdt.debug.mi.internal.ui.propertypages,
org.eclipse.cdt.debug.mi.ui
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.cdt.debug.mi.core,
- org.eclipse.cdt.debug.ui,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.console,
- org.eclipse.jface.text
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.debug.mi.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.debug.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.debug.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
index 0d63ee89f4..851e16bfb2 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.cdt.debug.ui.tests
Bundle-SymbolicName: org.eclipse.cdt.debug.ui.tests
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-ClassPath: cdtdebuguitests.jar
Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
Bundle-Localization: plugin
diff --git a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
index e07c9fb759..f191bf0169 100644
--- a/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.cdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.ui; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.ui.CDebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -21,19 +21,19 @@ Export-Package:
org.eclipse.cdt.debug.ui,
org.eclipse.cdt.debug.ui.importexecutable,
org.eclipse.cdt.debug.ui.sourcelookup
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.debug.ui,
- org.eclipse.debug.core,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.ui,
- org.eclipse.cdt.core,
- org.eclipse.core.runtime,
- org.eclipse.ui.console,
- org.eclipse.ui.views
+Require-Bundle: org.eclipse.ui.ide;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.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.debug.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)",
+ org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
index 12eaacdece..e69e66eeb9 100644
--- a/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.isv/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: C/C++ Plugin Developer Guide
+Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.doc.isv; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help
+Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/doc/org.eclipse.cdt.doc.isv/build.properties b/doc/org.eclipse.cdt.doc.isv/build.properties
index 1e62607c4f..7b4fb2b05b 100644
--- a/doc/org.eclipse.cdt.doc.isv/build.properties
+++ b/doc/org.eclipse.cdt.doc.isv/build.properties
@@ -18,4 +18,5 @@ bin.includes = META-INF/,\
topics_Guide.xml,\
topics_Reference.xml,\
plugin.xml,\
+ plugin.properties,\
notices.html
diff --git a/doc/org.eclipse.cdt.doc.isv/plugin.properties b/doc/org.eclipse.cdt.doc.isv/plugin.properties
new file mode 100644
index 0000000000..9c6b9057e1
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.isv/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2000, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+pluginName=C/C++ Plugin Developer Guide
+providerName=Eclipse.org
diff --git a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
index 30f737042a..2a21ba01ba 100644
--- a/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.cdt.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.doc.user; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Eclipse-LazyStart: true
diff --git a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
index 3430905111..122b9deee2 100644
--- a/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.launch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.launch; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -10,16 +10,16 @@ Export-Package: org.eclipse.cdt.launch,
org.eclipse.cdt.launch.internal,
org.eclipse.cdt.launch.internal.ui,
org.eclipse.cdt.launch.ui
-Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.core.expressions,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.ui,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.debug.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.variables
+Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.cdt.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.debug.core;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.cdt.debug.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.variables;bundle-version="[3.1.100,4.0.0)"
Eclipse-LazyStart: true
diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index 6c0ba6e655..e181cd3be4 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.cdt"
label="%featureName"
- version="3.1.0.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -23,22 +23,39 @@
</url>
<requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.team.core"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
- <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.ui"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.compare"/>
- <import plugin="org.eclipse.ui.console"/>
- <import plugin="org.eclipse.core.filebuffers"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.core.boot"/>
+ <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
+ <import plugin="org.eclipse.core.filebuffers" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.forms" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.search" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.compare" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.core" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
+ <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.navigator" version="3.2.0" match="compatible"/>
+ <import plugin="com.ibm.icu" version="3.4.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.refactoring" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.intro" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ui.cheatsheets" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.debug.core" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.ui" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.debug.ui" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.debug.mi.core" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.make.core" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.cdt.managedbuilder.core" version="4.0.0" match="compatible"/>
+ <import plugin="org.eclipse.ltk.core.refactoring" version="3.2.0" match="compatible"/>
+ <import plugin="org.eclipse.ltk.ui.refactoring" version="3.2.0" match="compatible"/>
</requires>
<plugin
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature.xml b/releng/org.eclipse.cdt.sdk-feature/feature.xml
index b9f03cd352..b3748f19bc 100644
--- a/releng/org.eclipse.cdt.sdk-feature/feature.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.cdt.sdk"
label="%featureName"
- version="3.1.0.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName">
<description>
@@ -30,6 +30,10 @@
version="0.0.0"
name="%featureName"/>
+ <requires>
+ <import plugin="org.eclipse.help" version="3.2.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.cdt.sdk"
download-size="0"
diff --git a/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
index 49c1ced306..4e884bfd64 100644
--- a/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.cdt.sdk/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.sdk
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index e832319b8c..e58da69855 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.cdt.testing"
label="%featureName"
- version="3.1.0.qualifier"
+ version="4.0.0.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
@@ -19,19 +19,30 @@
</url>
<requires>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.core.resources"/>
- <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.core.runtime.compatibility"/>
<import plugin="org.eclipse.jface.text"/>
+ <import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.cdt.ui"/>
<import plugin="org.eclipse.swt"/>
- <import plugin="org.eclipse.cdt.managedbuilder.core"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.ide"/>
+ <import plugin="org.junit"/>
+ <import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.cdt.make.core"/>
+ <import plugin="org.eclipse.ui.editors"/>
+ <import plugin="org.eclipse.ui.views"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor"/>
+ <import plugin="org.eclipse.help"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.search"/>
+ <import plugin="org.eclipse.compare"/>
+ <import plugin="org.eclipse.ui.console"/>
+ <import plugin="org.eclipse.core.expressions"/>
+ <import plugin="com.ibm.icu"/>
+ <import plugin="org.eclipse.jface"/>
+ <import plugin="org.eclipse.core.filebuffers"/>
+ <import plugin="org.eclipse.cdt.refactoring"/>
+ <import plugin="org.eclipse.ltk.core.refactoring"/>
+ <import plugin="org.eclipse.ltk.ui.refactoring"/>
</requires>
<plugin
diff --git a/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF
index db86788699..a2a413632b 100644
--- a/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.cdt.testing/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.testing
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
index 4ec3375459..7de047df5d 100644
--- a/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.cdt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui.intro,
- org.eclipse.ui.cheatsheets
+Require-Bundle: org.eclipse.ui.intro;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)"
Eclipse-LazyStart: true

Back to the top