rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
835cdab9f7
eclipse/eclipse-secondary-arches.patch

481 lines
17 KiB
Diff
Raw Normal View History

Support for secondary arches (arm, ppc, ppc64, x86, x86_64, s390, s390x).
2012-10-19 06:08:58 +00:00
--- 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.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>
- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments.
2012-10-23 04:28:36 +00:00
--- 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
Don't package non-existing fragments on s390, s390x. Add BR to GConf-2-devel
2012-11-13 17:37:05 +00:00
@@ -135,8 +135,56 @@
- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments.
2012-10-23 04:28:36 +00:00
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"/>
Don't package non-existing fragments on s390, s390x. Add BR to GConf-2-devel
2012-11-13 17:37:05 +00:00
+ <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"/>
- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments.
2012-10-23 04:28:36 +00:00
+
+ <plugin
id="org.eclipse.core.resources"
download-size="0"
install-size="0"
Don't package non-existing fragments on s390, s390x. Add BR to GConf-2-devel
2012-11-13 17:37:05 +00:00
@@ -396,7 +426,54 @@
- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments.
2012-10-23 04:28:36 +00:00
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"/>
Don't package non-existing fragments on s390, s390x. Add BR to GConf-2-devel
2012-11-13 17:37:05 +00:00
+ <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"/>
- Moved launcher version change after secondary fragments creation. - Created some directories when creating secondary fragments.
2012-10-23 04:28:36 +00:00
+
+<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"
Add profiles in the equinox executable for ppc and arm.
2012-10-23 07:42:32 +00:00
--- 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>
Reenable bootstrap (for the purpose of arm build). Fix the launcher build for arm. Fix the s390 build issue.
2013-01-04 10:17:33 +00:00
+ <ant antfile="build.xml" dir="library/gtk/" />
Add profiles in the equinox executable for ppc and arm.
2012-10-23 07:42:32 +00:00
+ </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>
Reenable bootstrap (for the purpose of arm build). Fix the launcher build for arm. Fix the s390 build issue.
2013-01-04 10:17:33 +00:00
+ <ant antfile="build.xml" dir="library/gtk/" />
Add profiles in the equinox executable for ppc and arm.
2012-10-23 07:42:32 +00:00
+ </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>
Reenable bootstrap (for the purpose of arm build). Fix the launcher build for arm. Fix the s390 build issue.
2013-01-04 10:17:33 +00:00
+ <ant antfile="build.xml" dir="library/gtk/" />
Add profiles in the equinox executable for ppc and arm.
2012-10-23 07:42:32 +00:00
+ </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>
Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210. 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.
2012-11-22 11:10:01 +00:00
--- 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
Update to pre - SR2 - work in progress
2012-12-19 17:47:29 +00:00
@@ -94,6 +94,11 @@
Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210. 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.
2012-11-22 11:10:01 +00:00
defaultJava=DEFAULT_JAVA_EXEC
Update to pre - SR2 - work in progress
2012-12-19 17:47:29 +00:00
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210. 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.
2012-11-22 11:10:01 +00:00
;;
Reenable bootstrap (for the purpose of arm build). Fix the launcher build for arm. Fix the s390 build issue.
2013-01-04 10:17:33 +00:00
+ armv*)
Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210. 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.
2012-11-22 11:10:01 +00:00
+ defaultOSArch="arm"
+ defaultJava=DEFAULT_JAVA_EXEC
Update to pre - SR2 - work in progress
2012-12-19 17:47:29 +00:00
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
Get rid off javax.xml. Fix building launcher on arm. Fix RHBZ #878210. 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.
2012-11-22 11:10:01 +00:00
+ ;;
*)
echo "*** Unknown MODEL <${MODEL}>"
;;
Update to Kepler.
2013-01-28 12:46:52 +00:00
--- eclipse.platform.resources/pom.xml.orig 2013-01-28 12:13:43.000000000 +0100
+++ eclipse.platform.resources/pom.xml 2013-01-28 14:23:18.394863232 +0100
@@ -33,6 +33,9 @@
<modules>
<module>bundles/org.eclipse.core.filesystem</module>
+ <module>bundles/org.eclipse.core.filesystem.linux.arm</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.hpux.ia64</module>
<module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
<module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
Update to Kepler M6.
2013-03-15 08:27:43 +00:00
--- eclipse-platform-parent/pom.xml.orig 2013-01-28 14:28:39.000000000 +0100
+++ eclipse-platform-parent/pom.xml 2013-01-28 14:31:16.528302907 +0100
Update to Kepler.
2013-01-28 12:46:52 +00:00
@@ -151,29 +151,9 @@
<arch>x86_64</arch>
</environment>
<environment>
- <os>solaris</os>
+ <os>linux</os>
<ws>gtk</ws>
- <arch>sparc</arch>
- </environment>
- <environment>
- <os>solaris</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>hpux</os>
- <ws>gtk</ws>
- <arch>ia64</arch>
- </environment>
- <environment>
- <os>aix</os>
- <ws>gtk</ws>
- <arch>ppc</arch>
- </environment>
- <environment>
- <os>aix</os>
- <ws>gtk</ws>
- <arch>ppc64</arch>
+ <arch>arm</arch>
</environment>
</environments>
</configuration>
--- rt.equinox.framework/pom.xml.orig 2013-01-28 12:36:24.000000000 +0100
+++ rt.equinox.framework/pom.xml 2013-01-28 14:33:58.089470923 +0100
@@ -45,6 +45,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</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.platform.releng.tychoeclipsebuilder/rcp.config/build.properties.orig 2013-01-28 11:57:49.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 2013-01-28 14:42:17.165096616 +0100
@@ -25,6 +25,8 @@
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
root.solaris.gtk.x86.permissions.755=eclipse
Fix missing about files on arm and ppc.
2013-01-05 16:26:47 +00:00
+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
+root.linux.gtk.arm.permissions.755=eclipse
Update to Kepler.
2013-01-28 12:46:52 +00:00
root.linux.gtk.x86=target/resources/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=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
--- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml.bak 2013-01-28 11:57:49.000000000 +0100
+++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 2013-01-28 14:50:06.674520657 +0100
@@ -21,6 +21,25 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
+ <execution>
Fix missing about files on arm and ppc.
2013-01-05 16:26:47 +00:00
+ <id>copy-resources-gtk.linux.arm</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
+ <includes>
+ <include>about_files/*</include>
+ <include>about.html</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
Update to Kepler.
2013-01-28 12:46:52 +00:00
<execution>
<id>copy-resources-gtk.linux.x86</id>
Fix missing about files on arm and ppc.
2013-01-05 16:26:47 +00:00
<phase>validate</phase>
Reference in New Issue Copy Permalink