Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-03-23 07:25:38 +0000
committerDavid Williams2015-03-23 07:25:38 +0000
commitbfb6e8cbaefa1957288b20b9a7e7a3ef02d14b05 (patch)
tree5512337f8521f6766ab49f096aa0ed11b219e305 /eclipse.platform.releng.tychoeclipsebuilder
parent57939b55e98147746b134f6c21a7182da91760ac (diff)
downloadeclipse.platform.releng.aggregator-bfb6e8cbaefa1957288b20b9a7e7a3ef02d14b05.tar.gz
eclipse.platform.releng.aggregator-bfb6e8cbaefa1957288b20b9a7e7a3ef02d14b05.tar.xz
eclipse.platform.releng.aggregator-bfb6e8cbaefa1957288b20b9a7e7a3ef02d14b05.zip
Bug 462815 - Avoid materializing products not delivered
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder')
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml3
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml77
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml4
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml38
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product1
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml38
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product1
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/repos/rcprepo.xml1
8 files changed, 6 insertions, 157 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index 89dc95834..1754096c5 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -25,6 +25,9 @@
id="org.eclipse.swt.tools.feature"
version="0.0.0" />
<feature
+ id="org.eclipse.rcp.configuration"
+ version="0.0.0" />
+ <feature
id="org.eclipse.equinox.executable"
version="0.0.0" />
<feature
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index 320858b31..78fb52c73 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -39,83 +39,6 @@
<format>'${buildId}'</format>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- <configuration>
- <profile>SDKProfile</profile>
- <products>
- <product>
- <id>org.eclipse.platform.sdk</id>
- <rootFolder>eclipse</rootFolder>
- <rootFolders>
- <macosx>Eclipse.app</macosx>
- </rootFolders>
- </product>
- </products>
- </configuration>
- </execution>
- <execution>
- <id>archive-products</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>archive-products</goal>
- </goals>
- <configuration>
- <formats>
- <win32>zip</win32>
- <linux>tar.gz</linux>
- <macosx>tar.gz</macosx>
- </formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>eclipse-sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-winsigner-plugin</artifactId>
- <version>${cbi-plugins.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <!--
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-macsigner-plugin</artifactId>
- <version>${cbi-plugins.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- -->
</plugins>
</build>
- </profile>
- </profiles>
</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
index efc910387..f2244d5f1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
@@ -71,11 +71,11 @@
<iu
id="org.eclipse.jdt.source.feature.group"
version="" />
- <!-- Why isn't rcp.config used here, instead of 'executable' directly?
+ <!-- Why isn't rcp.config used here, instead of 'executable' directly? -->
<iu
id="org.eclipse.rcp.configuration.feature.group"
version="" />
- -->
+
<iu
id="org.eclipse.equinox.executable"
version="" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
index b918ed5c3..29705a3df 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
@@ -36,44 +36,6 @@
<format>'${buildId}'</format>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- <configuration>
- <profile>SDKProfile</profile>
- <products>
- <product>
- <id>org.eclipse.rcp.sdk.id</id>
- <rootFolder>eclipse</rootFolder>
- <rootFolders>
- <macosx>Eclipse.app</macosx>
- </rootFolders>
- </product>
- </products>
- </configuration>
- </execution>
- <execution>
- <id>archive-products</id>
- <goals>
- <goal>archive-products</goal>
- </goals>
- <configuration>
- <formats>
- <win32>zip</win32>
- <linux>tar.gz</linux>
- <macosx>tar.gz</macosx>
- </formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
index 793c4dc5e..6ed9086b1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
@@ -164,7 +164,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</plugins>
<features>
- <feature id="org.eclipse.rcp.configuration"/>
<feature id="org.eclipse.rcp"/>
<feature id="org.eclipse.rcp.source"/>
</features>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
index df78e2366..98b1abb2b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
@@ -36,44 +36,6 @@
<format>'${buildId}'</format>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-director-plugin</artifactId>
- <executions>
- <execution>
- <id>materialize-products</id>
- <goals>
- <goal>materialize-products</goal>
- </goals>
- <configuration>
- <profile>SDKProfile</profile>
- <products>
- <product>
- <id>org.eclipse.rcp.id</id>
- <rootFolder>eclipse</rootFolder>
- <rootFolders>
- <macosx>Eclipse.app</macosx>
- </rootFolders>
- </product>
- </products>
- </configuration>
- </execution>
- <execution>
- <id>archive-products</id>
- <goals>
- <goal>archive-products</goal>
- </goals>
- <configuration>
- <formats>
- <win32>zip</win32>
- <linux>tar.gz</linux>
- <macosx>tar.gz</macosx>
- </formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
index 424a41774..b3864ff4c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/rcp.product
@@ -161,7 +161,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</plugins>
<features>
- <feature id="org.eclipse.rcp.configuration"/>
<feature id="org.eclipse.rcp"/>
</features>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/repos/rcprepo.xml b/eclipse.platform.releng.tychoeclipsebuilder/repos/rcprepo.xml
index 5e7680e4f..114e250f4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/repos/rcprepo.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/repos/rcprepo.xml
@@ -27,6 +27,7 @@
<destination kind="artifact" location="file://${featureTemp}" name="@{feature} Repo" format="file://${buildRepo}" />
<iu id="${runtimeIU}" version="" />
<iu id="${sdkIU}" version="" />
+ <iu id="org.eclipse.rcp.configuration.feature.group" version=""/>
<iu id="org.eclipse.equinox.executable" version="" />
<iu id="a.jre.javase" version="" />
<slicingOptions platformFilter="true" includeOptional="false" includeNonGreedy="false" followStrict="true" />

Back to the top