From 1961357f1a7d66d621eec8497326455f5a3bc7e1 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <dschaefer@blackberry.com>
Date: Fri, 2 Sep 2016 14:38:03 -0400
Subject: [PATCH] Add source features and other general build fixes.

Change-Id: I3853dcdf0b37aeb528f5a6db78b354bce94b9eca
---
 .../build.properties                          |  3 +-
 .../org.eclipse.launchbar.remote/feature.xml  |  4 +--
 features/org.eclipse.launchbar.remote/pom.xml | 34 ++++++++++++++++++-
 features/org.eclipse.launchbar/pom.xml        | 34 ++++++++++++++++++-
 4 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/features/org.eclipse.launchbar.remote/build.properties b/features/org.eclipse.launchbar.remote/build.properties
index 64f93a9f0b7..b3a611b5c93 100644
--- a/features/org.eclipse.launchbar.remote/build.properties
+++ b/features/org.eclipse.launchbar.remote/build.properties
@@ -1 +1,2 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.launchbar.remote/feature.xml b/features/org.eclipse.launchbar.remote/feature.xml
index 9467061f58c..b5d687e641d 100644
--- a/features/org.eclipse.launchbar.remote/feature.xml
+++ b/features/org.eclipse.launchbar.remote/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.launchbar.remote"
-      label="Remote Launch Targets"
+      label="%featureName"
       version="1.0.1.qualifier"
-      provider-name="Eclipse CDT"
+      provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
diff --git a/features/org.eclipse.launchbar.remote/pom.xml b/features/org.eclipse.launchbar.remote/pom.xml
index 7d5a47c5c8a..a2529b02841 100644
--- a/features/org.eclipse.launchbar.remote/pom.xml
+++ b/features/org.eclipse.launchbar.remote/pom.xml
@@ -14,6 +14,38 @@
 	<groupId>org.eclipse.launchbar.features</groupId>
 	<artifactId>org.eclipse.launchbar.remote</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
-
 	<packaging>eclipse-feature</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-extras-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/features/org.eclipse.launchbar/pom.xml b/features/org.eclipse.launchbar/pom.xml
index b59d46824d1..9d83cf6ea77 100644
--- a/features/org.eclipse.launchbar/pom.xml
+++ b/features/org.eclipse.launchbar/pom.xml
@@ -14,6 +14,38 @@
 	<groupId>org.eclipse.launchbar.features</groupId>
 	<artifactId>org.eclipse.launchbar</artifactId>
 	<version>2.0.1-SNAPSHOT</version>
-
 	<packaging>eclipse-feature</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-extras-version}</version>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>attach-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>