The launcher was not built properly because Equinox Launcher build script had no support for arm architectures, therefore it did not knew where to copy the binary. javax.xml is provided by the VM so there is no need to bundle it. Due to inconsistencies in packaging, some errors appear (see RHBZ #710815). This is removal in a first place (eclipse-dtp and eclipse-mylyn updates will follow). Additionally, the binary class was not copied properly into the compatibility bundle. We can't build it properly (because it was some old, unknown version), but we can build current version and hope for the best.
456 lines
15 KiB
Diff
456 lines
15 KiB
Diff
--- eclipse.platform.swt.binaries/pom.xml.bak 2012-10-18 11:29:03.000000000 +0200
|
|
+++ eclipse.platform.swt.binaries/pom.xml 2012-10-18 11:39:42.523524920 +0200
|
|
@@ -41,6 +41,7 @@
|
|
<module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
|
|
<module>bundles/org.eclipse.swt.gtk.linux.s390</module>
|
|
<module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
|
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
|
|
<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>
|
|
--- eclipse.platform.resources/pom.xml.bak 2012-10-18 11:29:04.000000000 +0200
|
|
+++ eclipse.platform.resources/pom.xml 2012-10-18 11:41:23.976257777 +0200
|
|
@@ -31,7 +31,11 @@
|
|
<module>bundles/org.eclipse.core.filesystem</module>
|
|
<module>bundles/org.eclipse.core.filesystem.hpux.ia64_32</module>
|
|
<module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
|
|
+ <module>bundles/org.eclipse.core.filesystem.linux.arm</module>
|
|
<module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
|
|
+ <module>bundles/org.eclipse.core.filesystem.linux.ppc64</module>
|
|
+ <module>bundles/org.eclipse.core.filesystem.linux.s390</module>
|
|
+ <module>bundles/org.eclipse.core.filesystem.linux.s390x</module>
|
|
<module>bundles/org.eclipse.core.filesystem.linux.x86</module>
|
|
<module>bundles/org.eclipse.core.filesystem.linux.x86_64</module>
|
|
<module>bundles/org.eclipse.core.filesystem.macosx</module>
|
|
--- eclipse.platform.team/pom.xml.bak 2012-10-18 11:29:03.000000000 +0200
|
|
+++ eclipse.platform.team/pom.xml 2012-10-18 11:43:17.422081348 +0200
|
|
@@ -49,6 +49,11 @@
|
|
<module>features/org.eclipse.cvs-feature</module>
|
|
|
|
<!-- creatively located fragments -->
|
|
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm</module>
|
|
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc</module>
|
|
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64</module>
|
|
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390</module>
|
|
+ <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x</module>
|
|
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86</module>
|
|
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
|
|
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module>
|
|
--- rt.equinox.framework/pom.xml.bak 2012-10-18 11:29:04.000000000 +0200
|
|
+++ rt.equinox.framework/pom.xml 2012-10-18 11:44:37.345691358 +0200
|
|
@@ -41,6 +41,7 @@
|
|
<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_32</module>
|
|
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</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>
|
|
--- eclipse-parent/pom.xml.bak 2012-10-18 13:32:10.000000000 +0200
|
|
+++ eclipse-parent/pom.xml 2012-10-18 13:35:25.830543677 +0200
|
|
@@ -138,30 +138,15 @@
|
|
<arch>x86_64</arch>
|
|
</environment>
|
|
<environment>
|
|
- <os>solaris</os>
|
|
+ <os>linux</os>
|
|
<ws>gtk</ws>
|
|
- <arch>sparc</arch>
|
|
+ <arch>arm</arch>
|
|
</environment>
|
|
<environment>
|
|
- <os>solaris</os>
|
|
- <ws>gtk</ws>
|
|
- <arch>x86</arch>
|
|
- </environment>
|
|
- <environment>
|
|
- <os>hpux</os>
|
|
- <ws>gtk</ws>
|
|
- <arch>ia64_32</arch>
|
|
- </environment>
|
|
- <environment>
|
|
- <os>aix</os>
|
|
+ <os>linux</os>
|
|
<ws>gtk</ws>
|
|
<arch>ppc</arch>
|
|
</environment>
|
|
- <environment>
|
|
- <os>aix</os>
|
|
- <ws>gtk</ws>
|
|
- <arch>ppc64</arch>
|
|
- </environment>
|
|
</environments>
|
|
</configuration>
|
|
</plugin>
|
|
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.bak 2012-10-19 14:53:13.000000000 +0200
|
|
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2012-10-22 19:45:57.425680855 +0200
|
|
@@ -409,6 +409,26 @@
|
|
install-size="0"
|
|
version="0.0.0"
|
|
fragment="true"/>
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="ppc"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"/>
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="arm"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"/>
|
|
|
|
<plugin
|
|
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
|
@@ -582,6 +602,29 @@
|
|
download-size="0"
|
|
install-size="0"
|
|
version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.swt.gtk.linux.ppc"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="ppc"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.swt.gtk.linux.arm"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="arm"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
fragment="true"
|
|
unpack="false"/>
|
|
|
|
--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.bak 2012-10-19 14:53:13.000000000 +0200
|
|
+++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2012-10-22 19:52:12.985023364 +0200
|
|
@@ -135,8 +135,56 @@
|
|
version="0.0.0"
|
|
fragment="true"
|
|
unpack="false"/>
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.core.net.linux.ppc"
|
|
+ os="linux"
|
|
+ arch="ppc"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
|
|
<plugin
|
|
+ id="org.eclipse.core.net.linux.ppc64"
|
|
+ os="linux"
|
|
+ arch="ppc64"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.core.net.linux.arm"
|
|
+ os="linux"
|
|
+ arch="arm"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+ <plugin
|
|
+ id="org.eclipse.core.net.linux.s390"
|
|
+ os="linux"
|
|
+ arch="s390"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+ <plugin
|
|
+ id="org.eclipse.core.net.linux.s390x"
|
|
+ os="linux"
|
|
+ arch="s390x"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
+ <plugin
|
|
id="org.eclipse.core.resources"
|
|
download-size="0"
|
|
install-size="0"
|
|
@@ -396,7 +426,54 @@
|
|
version="0.0.0"
|
|
fragment="true"
|
|
unpack="false"/>
|
|
-
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.core.filesystem.linux.ppc"
|
|
+ os="linux"
|
|
+ arch="ppc"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+<plugin
|
|
+ id="org.eclipse.core.filesystem.linux.ppc64"
|
|
+ os="linux"
|
|
+ arch="ppc64"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+ <plugin
|
|
+ id="org.eclipse.core.filesystem.linux.s390"
|
|
+ os="linux"
|
|
+ arch="s390"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+<plugin
|
|
+ id="org.eclipse.core.filesystem.linux.s390x"
|
|
+ os="linux"
|
|
+ arch="s390x"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
+<plugin
|
|
+ id="org.eclipse.core.filesystem.linux.arm"
|
|
+ os="linux"
|
|
+ arch="arm"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
<plugin
|
|
id="org.eclipse.core.filesystem.linux.x86_64"
|
|
os="linux"
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/pom.xml.bak 2012-10-22 20:39:19.000000000 +0200
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/pom.xml 2012-10-23 09:40:57.205750700 +0200
|
|
@@ -132,6 +132,170 @@
|
|
</plugins>
|
|
</build>
|
|
</profile>
|
|
+
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.ppc</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.ppc</value>
|
|
+ </property>
|
|
+ </activation>
|
|
+ <build>
|
|
+ <plugins>
|
|
+ <plugin>
|
|
+ <artifactId>maven-antrun-plugin</artifactId>
|
|
+ <version> 1.7 </version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>compile-executable-natives</id>
|
|
+ <phase>generate-resources</phase>
|
|
+ <configuration>
|
|
+ <target>
|
|
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ <dependencies>
|
|
+ <dependency>
|
|
+ <groupId>bsf</groupId>
|
|
+ <artifactId>bsf</artifactId>
|
|
+ <version>2.4.0</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>rhino</groupId>
|
|
+ <artifactId>js</artifactId>
|
|
+ <version>1.7R2</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.ant</groupId>
|
|
+ <artifactId>ant-apache-bsf</artifactId>
|
|
+ <version>1.8.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.ant</groupId>
|
|
+ <artifactId>ant-nodeps</artifactId>
|
|
+ <version>1.8.1</version>
|
|
+ </dependency>
|
|
+ </dependencies>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.ppc64</value>
|
|
+ </property>
|
|
+ </activation>
|
|
+ <build>
|
|
+ <plugins>
|
|
+ <plugin>
|
|
+ <artifactId>maven-antrun-plugin</artifactId>
|
|
+ <version> 1.7 </version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>compile-executable-natives</id>
|
|
+ <phase>generate-resources</phase>
|
|
+ <configuration>
|
|
+ <target>
|
|
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ <dependencies>
|
|
+ <dependency>
|
|
+ <groupId>bsf</groupId>
|
|
+ <artifactId>bsf</artifactId>
|
|
+ <version>2.4.0</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>rhino</groupId>
|
|
+ <artifactId>js</artifactId>
|
|
+ <version>1.7R2</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.ant</groupId>
|
|
+ <artifactId>ant-apache-bsf</artifactId>
|
|
+ <version>1.8.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.ant</groupId>
|
|
+ <artifactId>ant-nodeps</artifactId>
|
|
+ <version>1.8.1</version>
|
|
+ </dependency>
|
|
+ </dependencies>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+
|
|
+
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.arm</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.arm</value>
|
|
+ </property>
|
|
+ </activation>
|
|
+ <build>
|
|
+ <plugins>
|
|
+ <plugin>
|
|
+ <artifactId>maven-antrun-plugin</artifactId>
|
|
+ <version> 1.7 </version>
|
|
+ <executions>
|
|
+ <execution>
|
|
+ <id>compile-executable-natives</id>
|
|
+ <phase>generate-resources</phase>
|
|
+ <configuration>
|
|
+ <target>
|
|
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
|
|
+ </target>
|
|
+ </configuration>
|
|
+ <goals>
|
|
+ <goal>run</goal>
|
|
+ </goals>
|
|
+ </execution>
|
|
+ </executions>
|
|
+ <dependencies>
|
|
+ <dependency>
|
|
+ <groupId>bsf</groupId>
|
|
+ <artifactId>bsf</artifactId>
|
|
+ <version>2.4.0</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>rhino</groupId>
|
|
+ <artifactId>js</artifactId>
|
|
+ <version>1.7R2</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.ant</groupId>
|
|
+ <artifactId>ant-apache-bsf</artifactId>
|
|
+ <version>1.8.3</version>
|
|
+ </dependency>
|
|
+ <dependency>
|
|
+ <groupId>org.apache.ant</groupId>
|
|
+ <artifactId>ant-nodeps</artifactId>
|
|
+ <version>1.8.1</version>
|
|
+ </dependency>
|
|
+ </dependencies>
|
|
+ </plugin>
|
|
+ </plugins>
|
|
+ </build>
|
|
+ </profile>
|
|
+
|
|
<profile>
|
|
<id>build-native-launchers-win32.win32.x86_64</id>
|
|
<activation>
|
|
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh.bak 2012-11-20 07:45:12.580081610 -0500
|
|
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh 2012-11-20 07:49:33.792018170 -0500
|
|
@@ -94,6 +94,21 @@
|
|
defaultJava=DEFAULT_JAVA_EXEC
|
|
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
;;
|
|
+ "armv7l")
|
|
+ defaultOSArch="arm"
|
|
+ defaultJava=DEFAULT_JAVA_EXEC
|
|
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
+ ;;
|
|
+ "armv7hl")
|
|
+ defaultOSArch="arm"
|
|
+ defaultJava=DEFAULT_JAVA_EXEC
|
|
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
+ ;;
|
|
+ "armv5tel")
|
|
+ defaultOSArch="arm"
|
|
+ defaultJava=DEFAULT_JAVA_EXEC
|
|
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
+ ;;
|
|
*)
|
|
echo "*** Unknown MODEL <${MODEL}>"
|
|
;;
|