Fix up plugin and feature names and stuff.

10 files changed, 17 insertions, 9 deletions

diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
index 95b763bd6bb..6c7b9174c90 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.cdt.debug.gdbjtag"
-      label="GDB Hardware Debugging"
+      label="%featureName"
       version="4.0.0.qualifier"
-      provider-name="Eclipse.org">
+      provider-name="%providerName">
 
    <description>
       %description
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
index 7bc3ae00b2e..ad1363caad6 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT GDB Hardware Debug Core Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator
@@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.variables
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.cdt.debug.gdbjtag.core
+Bundle-Vendor: %providerName
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/build.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core/build.properties
index 0e2ad0e705e..518030a77ac 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/build.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/build.properties
@@ -13,4 +13,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               about.html
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
index a6727884de1..903c80d9ce0 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
@@ -9,3 +9,5 @@
 #     QNX Software Systems - initial API and implementation
 ###############################################################################
 launchConfig.name=GDB Hardware Debugging
+pluginName=CDT GDB Hardware Debug Core Plug-in
+providerName=Eclipse.org
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF
index 2064658390a..6d293661ccb 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CDT GDB Hardware Debug UI Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.ui;singleton:=true
 Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.ui.Activator
@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.variables,
  org.eclipse.cdt.managedbuilder.ui
 Eclipse-LazyStart: true
+Bundle-Vendor: %providerName
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/build.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/build.properties
index 770b0cc0b22..70c80abdd5e 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/build.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/build.properties
@@ -14,4 +14,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               about.html
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.properties
index b14cacd2154..0614d11fe86 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/plugin.properties
@@ -8,3 +8,5 @@
 # Contributors:
 #     QNX Software Systems - initial API and implementation
 ###############################################################################
+pluginName=CDT GDB Hardware Debug UI Plug-in
+providerName=Eclipse.org
diff --git a/releng/org.eclipse.cdt.sdk/about.properties b/releng/org.eclipse.cdt.sdk/about.properties
index d11af8739b7..d9e35bc6ee8 100644
--- a/releng/org.eclipse.cdt.sdk/about.properties
+++ b/releng/org.eclipse.cdt.sdk/about.properties
@@ -19,5 +19,5 @@ blurb=Eclipse C/C++ Development Tools SDK\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others, 2005, 2006.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others, 2005, 2007.  All rights reserved.\n\
 Visit http://www.eclipse.org/cdt
diff --git a/releng/org.eclipse.cdt.testing/about.properties b/releng/org.eclipse.cdt.testing/about.properties
index 51f7bbe2779..a6dabb06789 100644
--- a/releng/org.eclipse.cdt.testing/about.properties
+++ b/releng/org.eclipse.cdt.testing/about.properties
@@ -19,5 +19,5 @@ blurb=Eclipse C/C++ Development Tools Testing Framework\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Eclipse contributors and others, 2000, 2006.  All rights reserved.\n\
+(c) Copyright Eclipse contributors and others, 2000, 2007.  All rights reserved.\n\
 Visit http://www.eclipse.org/cdt
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF
index 58573da0eb5..675d486c1fd 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.errorparsers.xlc; singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.errorparsers.xlc.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,