rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
467bdc5dca
eclipse/eclipse-secondary-arches.patch
Mat Booth 8fcf627b49 Update to Mars.1 
- Fix JDT javafx and annotation processor tests
2015-10-05 14:30:13 +01:00

338 lines
12 KiB
Diff
Raw Blame History

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
+++ b/eclipse.platform.swt.binaries/pom.xml
@@ -63,6 +63,8 @@
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</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.aarch64</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>
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
@@ -64,6 +64,8 @@
<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.ppc</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
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
@@ -419,6 +419,26 @@
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.aarch64"
+ os="linux"
+ ws="gtk"
+ arch="aarch64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
<plugin
id="org.eclipse.equinox.launcher.gtk.linux.x86"
@@ -583,6 +613,28 @@
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"/>
+
+ <plugin
+ id="org.eclipse.swt.gtk.linux.aarch64"
+ os="linux"
+ ws="gtk"
+ arch="aarch64"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
<plugin
id="org.eclipse.swt.gtk.linux.ppc"
diff --git 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
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 +125,16 @@
defaultJava=DEFAULT_JAVA_EXEC
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
;;
+ arm*)
+ defaultOSArch="arm"
+ defaultJava=DEFAULT_JAVA_EXEC
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
+ "aarch64")
+ defaultOSArch="aarch64"
+ defaultJava=DEFAULT_JAVA_EXEC
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ ;;
*)
echo "*** Unknown MODEL <${MODEL}>"
;;
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
@@ -219,6 +219,189 @@
</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>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </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>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.aarch64</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.aarch64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.s390x</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.s390x</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-native-launchers-gtk.linux.s390</id>
+ <activation>
+ <property>
+ <name>native</name>
+ <value>gtk.linux.s390</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile-executable-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>build-native-launchers-win32.win32.x86_64</id>
<activation>
@@ -347,8 +530,8 @@
<include name="gtk/solaris/x86/**/*"/>
<include name="win32/win32/x86/**/*"/>
<include name="win32/win32/x86_64/**/*"/>
- </fileset>
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
+ <include name="gtk/linux/arm/**/*"/>
+ <include name="gtk/linux/aarch64/**/*"/>
<include name="gtk/linux/s390/**/*"/>
<include name="gtk/linux/s390x/**/*"/>
</fileset>
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
@@ -59,4 +59,8 @@
root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root
root.linux.gtk.s390.permissions.755=launcher
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
+root.linux.gtk.aarch64.permissions.755=launcher
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
+root.linux.gtk.arm.permissions.755=launcher
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2015-06-11 13:16:13.638692229 +0100
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2015-06-11 13:17:38.715576669 +0100
@@ -85,3 +85,13 @@
requires.17.name = org.eclipse.swt.gtk.hpux.ia64
requires.17.range = [$version$,$version$]
requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)(!(org.eclipse.swt.buildtime=true)))
+
+requires.18.namespace = org.eclipse.equinox.p2.iu
+requires.18.name = org.eclipse.swt.gtk.linux.arm
+requires.18.range = [$version$,$version$]
+requires.18.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
+
+requires.19.namespace = org.eclipse.equinox.p2.iu
+requires.19.name = org.eclipse.swt.gtk.linux.aarch64
+requires.19.range = [$version$,$version$]
+requires.19.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
Reference in New Issue View Git Blame Copy Permalink