365159b3a7
- Drop upstreamed jetty9/servlet and workspace picker patches - Drop upstreamed patches for bug 903537 and bug 444143 - Update eclipse-build snapshot for ant dependency - Ship missing features used by some other projects' target platform - Build with mvn_build macro - Some spec file clean-up
410 lines
14 KiB
Diff
410 lines
14 KiB
Diff
--- a/eclipse-platform-parent/pom.xml
|
|
+++ b/eclipse-platform-parent/pom.xml
|
|
@@ -243,44 +243,14 @@
|
|
<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_64</arch>
|
|
- </environment>
|
|
- <environment>
|
|
- <os>solaris</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>
|
|
+ <os>linux</os>
|
|
<ws>gtk</ws>
|
|
- <arch>ppc</arch>
|
|
+ <arch>arm</arch>
|
|
</environment>
|
|
<environment>
|
|
- <os>aix</os>
|
|
+ <os>linux</os>
|
|
<ws>gtk</ws>
|
|
- <arch>ppc64</arch>
|
|
+ <arch>aarch64</arch>
|
|
</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
|
|
@@ -58,6 +58,10 @@
|
|
root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
|
|
root.linux.gtk.s390.permissions.755=eclipse
|
|
|
|
+root.linux.gtk.arm=rootfiles/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
|
|
+root.linux.gtk.arm.permissions.755=eclipse
|
|
+root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
|
|
+root.linux.gtk.aarch64.permissions.755=eclipse
|
|
|
|
bin.includes = feature.properties
|
|
|
|
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
|
|
@@ -53,6 +53,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
|
|
@@ -54,6 +54,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,6 @@
|
|
<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/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
|
|
|