From 46f84a4b0361049e15699c0e3fd69a7768f0d1d6 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@qnx.com>
Date: Mon, 11 May 2015 16:49:45 -0400
Subject: [PATCH] Bug 466941 - fix Anduino plugin names and providers.

Externalize them and give the proper provider (not me :).

Change-Id: Ic47a0c1251c50a05b3058a9e22fb869045babd47
---
 .../META-INF/MANIFEST.MF                             |  5 +++--
 .../org.eclipse.cdt.arduino.core/build.properties    |  5 +++--
 .../org.eclipse.cdt.arduino.core/plugin.properties   | 12 ++++++++++++
 .../org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF  |  4 +++-
 .../org.eclipse.cdt.arduino.ui/build.properties      |  3 ++-
 .../org.eclipse.cdt.arduino.ui/plugin.properties     | 12 ++++++++++++
 6 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
 create mode 100644 toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties

diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF
index 9226c305c68..74ddfb8f14b 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Arduino C++ Core
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.arduino.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.arduino.core.internal.Activator
-Bundle-Vendor: Doug Schaefer
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
@@ -20,3 +20,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: libs/freemarker-2.3.22.jar,
  .
 Export-Package: org.eclipse.cdt.arduino.core
+Bundle-Localization: plugin
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties
index 3d058e35069..a20aa47b2f0 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/build.properties
@@ -3,6 +3,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                templates/,\
-               libs/freemarker-2.3.22.jar,\
                about.html,\
-               schema/
+               schema/,\
+               plugin.properties,\
+               libs/
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
new file mode 100644
index 00000000000..3ad49eae7cc
--- /dev/null
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2015 QNX Software Systems 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:
+#     QNX Software Systems - initial API and implementation
+###############################################################################
+pluginName=Arduino C++ Core
+providerName=Eclipse CDT
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF
index 70675b0bd7c..4fc1219ff94 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Arduino UI
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.arduino.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.cdt.arduino.ui.internal.Activator
@@ -20,3 +20,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.cdt.native.serial;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties
index 1eb98901393..f37f9d18057 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/build.properties
@@ -2,5 +2,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               about.html
+               about.html,\
+               plugin.properties
 source.. = src/
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties
new file mode 100644
index 00000000000..f5b109db8e2
--- /dev/null
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/plugin.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2015 QNX Software Systems 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:
+#     QNX Software Systems - initial API and implementation
+###############################################################################
+pluginName=Arduino C++ UI
+providerName=Eclipse CDT