Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Grunberg2016-11-04 14:33:43 -0400
committerRoland Grunberg2016-11-04 14:58:12 -0400
commit5d6f8c3b2b6e98eaa4498b83e82664162f5b2b40 (patch)
tree1a6d81289b4c69eb2f6d235be49c406221954dc9
parent735b1ab48853d1e8bd5dcee102c6343588c00cd4 (diff)
downloadorg.eclipse.cdt-5d6f8c3b2b6e98eaa4498b83e82664162f5b2b40.tar.gz
org.eclipse.cdt-5d6f8c3b2b6e98eaa4498b83e82664162f5b2b40.tar.xz
org.eclipse.cdt-5d6f8c3b2b6e98eaa4498b83e82664162f5b2b40.zip
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>
-rw-r--r--cross/org.eclipse.cdt.launch.remote-feature/feature.xml7
-rw-r--r--cross/org.eclipse.cdt.launch.remote-feature/pom.xml33
-rw-r--r--releng/org.eclipse.cdt.repo/category.xml3
3 files changed, 36 insertions, 7 deletions
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 1bd4b9a487..7fad2ab47d 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 72b2030e74..b8b9eb2f40 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>
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 47020a13da..dbdcf0cd64 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -47,6 +47,9 @@
<feature url="features/org.eclipse.cdt.launch.remote_0.0.0.qualifier.jar" id="org.eclipse.cdt.launch.remote" version="0.0.0">
<category name="extra"/>
</feature>
+ <feature url="features/org.eclipse.cdt.launch.remote.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.launch.remote.source" version="0.0.0">
+ <category name="extra"/>
+ </feature>
<feature url="features/org.eclipse.cdt.msw_0.0.0.qualifier.jar" id="org.eclipse.cdt.msw" version="0.0.0">
<category name="extra"/>
</feature>

Back to the top