From 5d6f8c3b2b6e98eaa4498b83e82664162f5b2b40 Mon Sep 17 00:00:00 2001
From: Roland Grunberg
Date: Fri, 4 Nov 2016 14:33:43 -0400
Subject: Bug 507078 - o.e.cdt.launch.remote.source should be in separate
 feature.

The org.eclipse.cdt.launch.remote feature is the only non-source,
non-sdk feature to include the corresponding source plugin for it's main
provided plugin. An org.eclipse.cdt.launch.remote source-feature should
be created to provide the source plugin.

Change-Id: I2e396270f0d19f023e75452c316da0e4eda495b1
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
---
 .../feature.xml                                    |  7 -----
 .../org.eclipse.cdt.launch.remote-feature/pom.xml  | 33 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'cross')

diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 1bd4b9a487f..7fad2ab47d6 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -30,11 +30,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.cdt.launch.remote.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
index 72b2030e745..b8b9eb2f401 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
@@ -15,4 +15,37 @@
 	<version>9.1.0-SNAPSHOT</version>
 	<artifactId>org.eclipse.cdt.launch.remote</artifactId>
 	<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>attached-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
-- 
cgit v1.2.3