eclipse/eclipse-change-build-packagings.patch
Mat Booth 03b08aee67 Update to latest I-build to fix bundle dep cycle in PDE builds
- Add test framework to contributor tools subpackage
- Update eclipse-build snapshot to symlink and require xz-java
2015-05-05 18:05:27 +01:00

95 lines
4.0 KiB
Diff

--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig 2014-04-08 15:47:19.927087084 +0100
+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml 2014-04-08 15:48:00.045367311 +0100
@@ -19,7 +19,7 @@
%license
</license>
- <requires>
+ <!--requires>
<import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
<import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
@@ -29,7 +29,7 @@
<import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/>
<import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/>
<import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/>
- </requires>
+ </requires-->
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig 2015-03-31 10:28:54.530277349 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml 2015-03-31 10:29:46.232519773 +0100
@@ -4,18 +4,12 @@
id="org.eclipse.sdk.tests"
version="0.0.0" />
<feature
- id="org.eclipse.equinox.p2.sdk"
- version="0.0.0" />
- <feature
id="org.eclipse.equinox.p2.discovery.feature"
version="0.0.0" />
<feature
id="org.eclipse.core.runtime.feature"
version="0.0.0" />
<feature
- id="org.eclipse.equinox.sdk"
- version="0.0.0" />
- <feature
id="org.eclipse.sdk.examples.source"
version="0.0.0" />
<feature
@@ -25,9 +19,6 @@
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
@@ -37,9 +28,6 @@
id="org.eclipse.e4.core.tools.feature.source"
version="0.0.0" />
<feature
- id="org.eclipse.osgi.compatibility.plugins.feature"
- version="0.0.0" />
- <feature
id="org.eclipse.pde.api.tools.ee.feature"
version="0.0.0" />
<bundle
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig 2015-05-05 11:43:27.284457130 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml 2015-05-05 11:47:54.058051862 +0100
@@ -118,30 +118,10 @@
<!-- source repositories to mirror from -->
<repository>
- <url>${project.baseUri}/../rcp/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- <repository>
- <url>${project.baseUri}/../rcp.sdk/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- <repository>
<url>${project.baseUri}/../platform/target/repository</url>
<layout>p2</layout>
<!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
</repository>
- <repository>
- <url>${project.baseUri}/../platform.sdk/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
- <repository>
- <url>${project.baseUri}/../sdk/target/repository</url>
- <layout>p2</layout>
- <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
- </repository>
<repository>
<url>${project.baseUri}/../eclipse-junit-tests/target/repository</url>
<layout>p2</layout>