[eclipse] Update to latest I-build of Luna 4.4.0
mbooth
mbooth at fedoraproject.org
Thu Apr 17 08:29:58 UTC 2014
commit a0e15dca45fca17a0923a949ab8bd121747f2d41
Author: Mat Booth <mat.booth at redhat.com>
Date: Wed Apr 16 12:39:56 2014 +0100
Update to latest I-build of Luna 4.4.0
- Fix missing copy resource step on ppc64le
- Don't build bundles that are only applicable on non-linux platforms
eclipse-bug-386377.patch | 145 +++++++++++------------------
eclipse-change-build-packagings.patch | 16 ++++
eclipse-no-source-for-dependencies.patch | 21 ++++-
eclipse-secondary-arches.patch | 133 ++++++++++++++++++++++-----
eclipse.spec | 75 ++++++++++------
get-eclipse.sh | 2 +-
sources | 2 +-
7 files changed, 248 insertions(+), 146 deletions(-)
---
diff --git a/eclipse-bug-386377.patch b/eclipse-bug-386377.patch
index ac92081..29dfe95 100644
--- a/eclipse-bug-386377.patch
+++ b/eclipse-bug-386377.patch
@@ -1,33 +1,16 @@
-From 7aae376547c5f3306e311ce91c475c9a9667a0a0 Mon Sep 17 00:00:00 2001
-From: Krzysztof Daniel <kdaniel at redhat.com>
-Date: Tue, 30 Jul 2013 12:22:42 +0200
-Subject: [PATCH] Build executables in the first run.
-
----
- bundles/org.eclipse.equinox.executable/pom.xml | 265 ---------------------
- .../pom.xml | 56 ++++-
- .../pom.xml | 55 +++++
- .../pom.xml | 55 +++++
- .../pom.xml | 56 +++++
- .../pom.xml | 56 +++++
- 6 files changed, 277 insertions(+), 266 deletions(-)
-
-diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
-index 5a15c5b..d4fb54e 100644
---- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
-@@ -28,5 +28,59 @@
- <ws>cocoa</ws>
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
+@@ -27,4 +27,59 @@
+ <ws>gtk</ws>
<arch>x86_64</arch>
</properties>
--
-+ <profiles>
-+ <profile>
-+ <id>build-native-launchers-cocoa.macosx.x86_64</id>
++ <profiles>
++ <profile>
++ <id>build-native-launchers-gtk.linux.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>cocoa.macosx.x86_64</value>
++ <value>gtk.linux.x86_64</value>
+ </property>
+ </activation>
+ <build>
@@ -41,7 +24,7 @@ index 5a15c5b..d4fb54e 100644
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/carbon/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/carbon/" target="build_eclipse"/>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
@@ -75,23 +58,22 @@ index 5a15c5b..d4fb54e 100644
+ </plugins>
+ </build>
+ </profile>
-+ </profiles>
++ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
-index 59f46ae..e7616ed 100644
---- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
-@@ -28,4 +28,59 @@
- <ws>gtk</ws>
- <arch>x86</arch>
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml 2014-04-16 15:53:08.145402094 +0100
+@@ -27,4 +27,60 @@
+ <ws>win32</ws>
+ <arch>x86_64</arch>
</properties>
++
+ <profiles>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.x86</id>
++ <id>build-native-launchers-win32.win32.x86_64</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.x86</value>
++ <value>win32.win32.x86_64</value>
+ </property>
+ </activation>
+ <build>
@@ -105,7 +87,7 @@ index 59f46ae..e7616ed 100644
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
@@ -141,21 +123,20 @@ index 59f46ae..e7616ed 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
-index d639b6e..8bf7d74 100644
---- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
-@@ -28,4 +28,59 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig 2014-04-16 15:57:02.805249103 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml 2014-04-16 15:57:26.204834155 +0100
+@@ -27,4 +27,60 @@
<ws>gtk</ws>
- <arch>x86_64</arch>
+ <arch>ppc64le</arch>
</properties>
++
+ <profiles>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.x86_64</id>
++ <id>build-native-launchers-gtk.linux.ppc64le</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.x86_64</value>
++ <value>gtk.linux.ppc64le</value>
+ </property>
+ </activation>
+ <build>
@@ -205,22 +186,19 @@ index d639b6e..8bf7d74 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
-index e0b59be..f82005c 100644
---- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
-@@ -29,4 +29,60 @@
- <ws>win32</ws>
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
+@@ -27,4 +27,59 @@
+ <ws>gtk</ws>
<arch>x86</arch>
</properties>
-+
+ <profiles>
+ <profile>
-+ <id>build-native-launchers-win32.win32.x86</id>
++ <id>build-native-launchers-gtk.linux.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>win32.win32.x86</value>
++ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <build>
@@ -234,7 +212,7 @@ index e0b59be..f82005c 100644
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
-+ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
++ <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
@@ -270,22 +248,20 @@ index e0b59be..f82005c 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
-index ce4252c..4b72b1f 100644
---- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
-@@ -29,4 +29,60 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml 2014-04-16 15:53:08.145402094 +0100
+@@ -27,4 +27,60 @@
<ws>win32</ws>
- <arch>x86_64</arch>
+ <arch>x86</arch>
</properties>
+
+ <profiles>
+ <profile>
-+ <id>build-native-launchers-win32.win32.x86_64</id>
++ <id>build-native-launchers-win32.win32.x86</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>win32.win32.x86_64</value>
++ <value>win32.win32.x86</value>
+ </property>
+ </activation>
+ <build>
@@ -335,10 +311,8 @@ index ce4252c..4b72b1f 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
-index ce4252c..4b72b1f 100644
---- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml 2014-04-16 15:53:08.145402094 +0100
@@ -27,4 +27,60 @@
<ws>gtk</ws>
<arch>s390</arch>
@@ -400,10 +374,8 @@ index ce4252c..4b72b1f 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
-index ce4252c..4b72b1f 100644
---- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml 2014-04-16 15:53:08.146402075 +0100
@@ -27,4 +27,60 @@
<ws>gtk</ws>
<arch>s390x</arch>
@@ -465,22 +437,20 @@ index ce4252c..4b72b1f 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
-index ce4252c..4b72b1f 100644
---- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
-@@ -29,4 +29,60 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml 2014-04-16 15:57:28.315796703 +0100
+@@ -27,4 +27,60 @@
<ws>gtk</ws>
- <arch>ppc</arch>
+ <arch>ppc64</arch>
</properties>
+
+ <profiles>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc</id>
++ <id>build-native-launchers-gtk.linux.ppc64</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.ppc</value>
++ <value>gtk.linux.ppc64</value>
+ </property>
+ </activation>
+ <build>
@@ -530,22 +500,20 @@ index ce4252c..4b72b1f 100644
+ </profile>
+ </profiles>
</project>
-diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
-index ce4252c..4b72b1f 100644
---- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
-+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
-@@ -28,4 +28,60 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig 2014-04-15 14:32:03.000000000 +0100
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml 2014-04-16 15:53:08.146402075 +0100
+@@ -27,4 +27,60 @@
<ws>gtk</ws>
- <arch>ppc64</arch>
+ <arch>ppc</arch>
</properties>
+
+ <profiles>
+ <profile>
-+ <id>build-native-launchers-gtk.linux.ppc64</id>
++ <id>build-native-launchers-gtk.linux.ppc</id>
+ <activation>
+ <property>
+ <name>native</name>
-+ <value>gtk.linux.ppc64</value>
++ <value>gtk.linux.ppc</value>
+ </property>
+ </activation>
+ <build>
@@ -595,6 +563,3 @@ index ce4252c..4b72b1f 100644
+ </profile>
+ </profiles>
</project>
---
-1.8.3.1
-
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index d4a81b4..822dd89 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -81,3 +81,19 @@
id="org.eclipse.jdt.core.manipulation"
download-size="0"
install-size="0"
+--- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml.orig 2014-04-16 13:31:33.300795779 +0100
++++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml 2014-04-16 13:31:41.995647371 +0100
+@@ -132,13 +132,6 @@
+ version="0.0.0"/>
+
+ <plugin
+- id="org.eclipse.swt.examples.ole.win32"
+- ws="win32"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"/>
+-
+- <plugin
+ id="org.eclipse.sdk.examples"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 116424f..e77022d 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -1,6 +1,6 @@
--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200
+++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200
-@@ -40,6 +40,21 @@
+@@ -40,6 +40,24 @@
<excludes>
<plugin id="org.sat4j.core"/>
<plugin id="org.sat4j.pb"/>
@@ -19,6 +19,9 @@
+ <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
+ <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
+ <plugin id="org.eclipse.ecf.ssl"/>
++ <plugin id="org.eclipse.equinox.security.macosx"/>
++ <plugin id="org.eclipse.equinox.security.win32.x86"/>
++ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
</excludes>
</configuration>
</execution>
@@ -55,10 +58,12 @@
</configuration>
--- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig 2013-02-20 16:32:38.000000000 +0100
+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml 2013-02-21 10:08:50.404275226 +0100
-@@ -57,6 +57,8 @@
+@@ -57,6 +57,10 @@
<excludes>
<plugin id="org.eclipse.jdt"/>
<plugin id="org.eclipse.jdt.doc.user"/>
++ <plugin id="org.eclipse.jdt.launching.macosx" />
++ <plugin id="org.eclipse.jdt.launching.ui.macosx" />
+ <plugin id="org.junit" />
+ <plugin id="org.hamcrest.core" />
</excludes>
@@ -100,7 +105,7 @@
\ No newline at end of file
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2013-03-14 11:35:02.000000000 +0100
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2013-03-14 12:53:51.015502076 +0100
-@@ -72,6 +72,15 @@
+@@ -72,6 +72,19 @@
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.smil"/>
<plugin id="org.w3c.dom.svg"/>
@@ -113,15 +118,23 @@
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le" />
++ <plugin id="org.eclipse.swt.win32.win32.x86" />
++ <plugin id="org.eclipse.swt.win32.win32.x86_64" />
++ <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" />
++ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
</excludes>
</configuration>
</execution>
--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig 2014-03-24 12:58:43.355826288 +0000
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2014-03-24 13:04:46.463916138 +0000
-@@ -75,6 +75,8 @@
+@@ -75,6 +75,12 @@
<plugin id="org.eclipse.core.net.win32.x86"/>
<plugin id="org.eclipse.core.net.win32.x86_64"/>
<plugin id="org.eclipse.equinox.security.macosx"/>
++ <plugin id="org.eclipse.equinox.security.win32.x86"/>
++ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
++ <plugin id="org.eclipse.compare.win32"/>
++ <plugin id="org.eclipse.ui.win32"/>
+ <plugin id="com.jcraft.jsch"/>
+ <plugin id="org.apache.ant"/>
</excludes>
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 81e86d4..4132106 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -2,10 +2,30 @@ diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 6c567f8..969eafb 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
-@@ -209,29 +209,19 @@
- <arch>x86_64</arch>
+@@ -209,49 +209,19 @@
+ <arch>s390x</arch>
</environment>
<environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>sparc</arch>
@@ -38,11 +58,35 @@ index 6c567f8..969eafb 100644
</environment>
</environments>
</configuration>
+--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
++++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+@@ -130,21 +130,6 @@
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86</arch>
+- </environment>
+- <environment>
+- <os>win32</os>
+- <ws>win32</ws>
+- <arch>x86_64</arch>
+- </environment>
+- <environment>
+- <os>macosx</os>
+- <ws>cocoa</ws>
+- <arch>x86_64</arch>
+- </environment>
+ </environments>
+ </configuration>
+ </plugin>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 80a32e4..85de879 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -27,6 +27,10 @@ root.solaris.gtk.sparc.permissions.755=eclipse
+@@ -32,6 +32,12 @@ root.solaris.gtk.sparc.permissions.755=eclipse
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
root.solaris.gtk.x86.permissions.755=eclipse
@@ -50,6 +94,8 @@ index 80a32e4..85de879 100644
+root.linux.gtk.arm.permissions.755=eclipse
+root.linux.gtk.aarch64=target/resources/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
+root.linux.gtk.aarch64.permissions.755=eclipse
++root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
++root.linux.gtk.ppc64le.permissions.755=eclipse
root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
@@ -102,6 +148,33 @@ index bb03da8..257d417 100644
<execution>
<id>copy-resources-gtk.linux.x86</id>
<phase>validate</phase>
+@@ -91,6 +129,26 @@
+ </directory>
+ <includes>
+ <include>about_files/*</include>
++ <include>about.html</include>
++ </includes>
++ </resource>
++ </resources>
++ </configuration>
++ </execution>
++ <execution>
++ <id>copy-resources-gtk.linux.ppc64le</id>
++ <phase>validate</phase>
++ <goals>
++ <goal>copy-resources</goal>
++ </goals>
++ <configuration>
++ <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc64le</outputDirectory>
++ <resources>
++ <resource>
++ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le
++ </directory>
++ <includes>
++ <include>about_files/*</include>
+ <include>about.html</include>
+ </includes>
+ </resource>
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index 7dd0536..66d79ee 100644
--- a/eclipse.platform.swt.binaries/pom.xml
@@ -116,16 +189,29 @@ index 7dd0536..66d79ee 100644
<module>bundles/org.eclipse.swt.gtk.linux.x86</module>
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
<module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
+diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
+index b46cdc6..0fb36a5 100644
+--- a/rt.equinox.framework/pom.xml
++++ b/rt.equinox.framework/pom.xml
+@@ -55,6 +55,9 @@
+ <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
++ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
index f5fb504..1187e84 100644
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-@@ -429,6 +429,8 @@
- <equals arg1="${swt.arch}" arg2="ia64"/>
+@@ -425,6 +425,7 @@
<equals arg1="${swt.arch}" arg2="ppc64"/>
+ <equals arg1="${swt.arch}" arg2="ppc64le"/>
<equals arg1="${swt.arch}" arg2="s390x"/>
+ <equals arg1="${swt.arch}" arg2="aarch64"/>
-+ <equals arg1="${swt.arch}" arg2="ppc64le"/>
</or>
</condition>
<echo>Is64=${is64}</echo>
@@ -133,7 +219,7 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip
index 7e1f520..734dd10 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -420,6 +420,36 @@
+@@ -409,6 +409,36 @@
install-size="0"
version="0.0.0"
fragment="true"/>
@@ -170,7 +256,7 @@ index 7e1f520..734dd10 100644
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -594,6 +624,39 @@
+@@ -583,6 +613,39 @@
version="0.0.0"
fragment="true"
unpack="false"/>
@@ -214,7 +300,20 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
index 29d3871..45526c8 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-@@ -119,6 +119,16 @@
+@@ -104,6 +104,12 @@
+ [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
++ "ppc64le")
++ defaultOSArch="ppc64le"
++ defaultJava=DEFAULT_JAVA_EXEC
++ [ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
++ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
++ ;;
+ "s390")
+ defaultOSArch="s390"
+ defaultJava=DEFAULT_JAVA_EXEC
+@@ -119,6 +125,16 @@
defaultJava=DEFAULT_JAVA_EXEC
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
@@ -235,7 +334,7 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
index fac13bf..e487001 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-@@ -206,6 +206,221 @@
+@@ -259,6 +259,221 @@
</plugins>
</build>
</profile>
@@ -457,17 +556,3 @@ index fac13bf..e487001 100644
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
-diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
-index b46cdc6..0fb36a5 100644
---- a/rt.equinox.framework/pom.xml
-+++ b/rt.equinox.framework/pom.xml
-@@ -55,6 +55,9 @@
- <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
- <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
- <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
-+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
- <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
- <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
- <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
diff --git a/eclipse.spec b/eclipse.spec
index 57072f0..c594f2a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -16,7 +16,7 @@ Epoch: 1
%global eclipse_micro 0
%global initialize 1
%global eb_commit 7923630a54ee16ba70e90b11ac3184cab5f306fb
-%global eclipse_tag I20140408-1645
+%global eclipse_tag I20140415-0800
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@@ -44,7 +44,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.10.git201404081645%{?dist}
+Release: 0.11.git201404150800%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -155,7 +155,7 @@ BuildRequires: lucene-analysis >= 4.7.1-1
BuildRequires: junit >= 4.10-5
BuildRequires: hamcrest >= 0:1.1-11
BuildRequires: %{?scl_prefix}sat4j >= 2.3.5-1
-BuildRequires: objectweb-asm >= 5.0.1-1
+BuildRequires: %{?scl_prefix}objectweb-asm >= 5.0.1-1
BuildRequires: zip
BuildRequires: sac >= 1.3-12
BuildRequires: batik >= 1.8
@@ -273,7 +273,7 @@ Group: Development/Tools
Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
-Requires: objectweb-asm >= 5.0.1-1
+Requires: %{?scl_prefix}objectweb-asm >= 5.0.1-1
# For PDE Build wrapper script + creating jars
Requires: zip
Requires: bash
@@ -293,7 +293,6 @@ Requires: mockito
Eclipse Tests.
%prep
-
%setup -q %{SOURCE0} -n R4_platform-aggregator-%{eclipse_tag}
tar --strip-components=1 -xf %{SOURCE1}
@@ -315,9 +314,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%{!?scl:%patch14}
%patch15
%patch16
-pushd rt.equinox.framework
-%patch17 -p1
-popd
+%patch17
%patch18
%patch19 -p1
%patch20
@@ -350,26 +347,50 @@ popd
%pom_disable_module bundles/org.eclipse.equinox.weaving.hook rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.compendium.sdk rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.core.sdk rt.equinox.bundles
-%pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
-%pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework
%pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2
%pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles
%pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles
-%pom_disable_module features/master-equinox eclipse.platform.releng
%pom_disable_module features/master eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.releng.tests eclipse.platform.releng
%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.discovery rt.equinox.p2
%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2
+%pom_disable_module org.eclipse.ua.tests eclipse.platform.ua
-%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc eclipse.platform.swt.binaries
-%pom_disable_module bundles/org.eclipse.swt.gtk.aix.ppc64 eclipse.platform.swt.binaries
-%pom_disable_module bundles/org.eclipse.swt.gtk.solaris.sparc eclipse.platform.swt.binaries
-%pom_disable_module bundles/org.eclipse.swt.gtk.solaris.x86 eclipse.platform.swt.binaries
-%pom_disable_module bundles/org.eclipse.swt.gtk.hpux.ia64 eclipse.platform.swt.binaries
+# We don't need support for Eclipse 2.x style plugins
+%pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
+%pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework
-%pom_disable_module org.eclipse.ua.tests eclipse.platform.ua
+# Remove platform-specific stuff that we don't care about to reduce build time
+# (i.e., all bundles that are only applicable on non-linux platforms)
+for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux)'` ; do
+ grep -q ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml && %pom_disable_module bundles/$b eclipse.platform.swt.binaries
+done
+for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux)'` ; do
+ grep -q ">bundles/$b<" rt.equinox.framework/pom.xml && %pom_disable_module bundles/$b rt.equinox.framework
+done
+%pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug
+%pom_disable_module org.eclipse.jdt.launching.ui.macosx eclipse.jdt.debug
+%pom_disable_module bundles/org.eclipse.equinox.security.macosx rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.security.win32.x86 rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.equinox.security.win32.x86_64 rt.equinox.bundles
+%pom_disable_module bundles/org.eclipse.compare.win32 eclipse.platform.team
+%pom_disable_module bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 eclipse.platform.team
+%pom_disable_module bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64 eclipse.platform.team
+%pom_disable_module bundles/org.eclipse.e4.ui.workbench.renderers.swt.cocoa eclipse.platform.ui
+%pom_disable_module bundles/org.eclipse.ui.win32 eclipse.platform.ui
+%pom_disable_module bundles/org.eclipse.core.filesystem.hpux.ia64 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem.macosx eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem.solaris.sparc eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem.win32.x86 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem.win32.x86_64 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.aix.ppc64 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.solaris.sparcv9 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.resources.win32.x86 eclipse.platform.resources
+%pom_disable_module bundles/org.eclipse.core.resources.win32.x86_64 eclipse.platform.resources
+%pom_disable_module examples/org.eclipse.swt.examples.ole.win32 eclipse.platform.swt
# This part generates secondary fragments using primary fragments
for dir in eclipse.platform.swt.binaries/bundles \
@@ -378,6 +399,12 @@ for dir in eclipse.platform.swt.binaries/bundles \
utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64le
done
+# Remove the SWT build sections from every linux arch that is not currently being built
+# (this is not really necessary but further reduces the build time)
+for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt.gtk.linux.(?!%{eclipse_arch})'` ; do
+ %pom_xpath_remove "/pom:project/pom:build" eclipse.platform.swt.binaries/bundles/$b
+done
+
#hack - there should be a patch providing a profile for each arch
mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
@@ -425,15 +452,6 @@ sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.eq
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
-#this is not really necessary but reduces the build time.
-pushd eclipse.platform.swt.binaries/bundles/
- for bundle in `ls | grep "org.eclipse.swt" | grep -v -e "org.eclipse.swt.gtk.linux.%{eclipse_arch}$"` ; do
- if [ -e $bundle/pom.xml ]; then
- %pom_xpath_remove "/pom:project/pom:build" $bundle/pom.xml
- fi
- done
-popd
-
sed -i -e 's at Dhelp.lucene.tokenizer=standard at XX:MaxPermSize=384M at g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
%build
@@ -964,6 +982,11 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
+* Tue Apr 15 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.0-0.11.git201404150800
+- Update to latest I-build of Luna 4.4.0
+- Fix missing copy resource step on ppc64le
+- Don't build bundles that are only applicable on non-linux platforms
+
* Thu Apr 10 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.0-0.10.git201404081645
- Drop unnecessary BR on GConf2-devel
- Drop unneeded patch: fix-swt-build-in-rawhide
diff --git a/get-eclipse.sh b/get-eclipse.sh
index d3dbc0c..e8fce97 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=I20140408-1645
+TAG=I20140415-0800
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 500487b..44a06d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ed5ba30c72af1eedd895399c9cf8f463 org.eclipse.linuxtools.eclipse-build-7923630a54ee16ba70e90b11ac3184cab5f306fb.tar.bz2
-c3b98ecede19efe44fe8b1150a4cc711 R4_platform-aggregator-I20140408-1645.tar.xz
+a994bd729a37fecd5002dc6b60c31d8e R4_platform-aggregator-I20140415-0800.tar.xz
More information about the scm-commits
mailing list