|
 |
7511cd7 |
diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
|
|
7511cd7 |
index 7e1f520..734dd10 100644
|
|
|
7511cd7 |
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
|
|
7511cd7 |
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
|
 |
c242877 |
@@ -393,6 +393,46 @@
|
|
|
c242877 |
unpack="false"/>
|
|
|
c242877 |
|
|
|
c242877 |
|
|
|
7511cd7 |
+ id="org.eclipse.equinox.launcher.gtk.linux.arm"
|
|
|
7511cd7 |
+ os="linux"
|
|
|
7511cd7 |
+ ws="gtk"
|
|
|
7511cd7 |
+ arch="arm"
|
|
|
7511cd7 |
+ download-size="0"
|
|
|
7511cd7 |
+ install-size="0"
|
|
|
7511cd7 |
+ version="0.0.0"
|
|
|
7511cd7 |
+ fragment="true"/>
|
|
|
7511cd7 |
+
|
|
|
7511cd7 |
+
|
|
|
7511cd7 |
+ id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
|
|
|
7511cd7 |
+ os="linux"
|
|
|
7511cd7 |
+ ws="gtk"
|
|
|
7511cd7 |
+ arch="aarch64"
|
|
|
7511cd7 |
+ download-size="0"
|
|
|
7511cd7 |
+ install-size="0"
|
|
|
7511cd7 |
+ version="0.0.0"
|
|
|
7511cd7 |
+ fragment="true"/>
|
|
|
74c26cc |
+
|
|
|
74c26cc |
+
|
|
|
74c26cc |
+ id="org.eclipse.equinox.launcher.gtk.linux.s390x"
|
|
|
74c26cc |
+ os="linux"
|
|
|
74c26cc |
+ ws="gtk"
|
|
|
74c26cc |
+ arch="s390x"
|
|
|
74c26cc |
+ download-size="0"
|
|
|
74c26cc |
+ install-size="0"
|
|
|
74c26cc |
+ version="0.0.0"
|
|
|
74c26cc |
+ fragment="true"/>
|
|
|
c242877 |
+
|
|
|
c242877 |
+
|
|
|
c242877 |
+ id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
|
|
c242877 |
+ os="linux"
|
|
|
c242877 |
+ ws="gtk"
|
|
|
c242877 |
+ arch="x86"
|
|
|
c242877 |
+ download-size="0"
|
|
|
c242877 |
+ install-size="0"
|
|
|
c242877 |
+ version="0.0.0"
|
|
|
c242877 |
+ fragment="true"/>
|
|
|
c242877 |
+
|
|
|
c242877 |
+
|
|
|
c242877 |
id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
|
|
|
c242877 |
os="macosx"
|
|
|
c242877 |
ws="cocoa"
|
|
|
c242877 |
@@ -480,6 +520,50 @@
|
|
|
74c26cc |
download-size="0"
|
|
|
74c26cc |
install-size="0"
|
|
|
7511cd7 |
version="0.0.0"
|
|
|
74c26cc |
+ fragment="true"
|
|
|
74c26cc |
+ unpack="false"/>
|
|
|
c736234 |
+
|
|
|
c736234 |
+
|
|
|
c736234 |
+ id="org.eclipse.swt.gtk.linux.s390x"
|
|
|
c736234 |
+ os="linux"
|
|
|
c736234 |
+ ws="gtk"
|
|
|
c736234 |
+ arch="s390x"
|
|
|
c736234 |
+ download-size="0"
|
|
|
c736234 |
+ install-size="0"
|
|
|
c736234 |
+ version="0.0.0"
|
|
|
c736234 |
+ fragment="true"
|
|
|
c736234 |
+ unpack="false"/>
|
|
|
c736234 |
+
|
|
|
7511cd7 |
+
|
|
|
7511cd7 |
+ id="org.eclipse.swt.gtk.linux.arm"
|
|
|
7511cd7 |
+ os="linux"
|
|
|
7511cd7 |
+ ws="gtk"
|
|
|
7511cd7 |
+ arch="arm"
|
|
|
7511cd7 |
+ download-size="0"
|
|
|
7511cd7 |
+ install-size="0"
|
|
|
7511cd7 |
+ version="0.0.0"
|
|
|
7511cd7 |
+ fragment="true"
|
|
|
7511cd7 |
+ unpack="false"/>
|
|
|
7511cd7 |
+
|
|
|
7511cd7 |
+
|
|
|
7511cd7 |
+ id="org.eclipse.swt.gtk.linux.aarch64"
|
|
|
7511cd7 |
+ os="linux"
|
|
|
7511cd7 |
+ ws="gtk"
|
|
|
7511cd7 |
+ arch="aarch64"
|
|
|
7511cd7 |
+ download-size="0"
|
|
|
7511cd7 |
+ install-size="0"
|
|
|
7511cd7 |
+ version="0.0.0"
|
|
|
c242877 |
+ fragment="true"
|
|
|
c242877 |
+ unpack="false"/>
|
|
|
c242877 |
+
|
|
|
c242877 |
+
|
|
|
c242877 |
+ id="org.eclipse.swt.gtk.linux.x86"
|
|
|
c242877 |
+ os="linux"
|
|
|
c242877 |
+ ws="gtk"
|
|
|
c242877 |
+ arch="x86"
|
|
|
c242877 |
+ download-size="0"
|
|
|
c242877 |
+ install-size="0"
|
|
|
c242877 |
+ version="0.0.0"
|
|
|
74c26cc |
fragment="true"
|
|
|
74c26cc |
unpack="false"/>
|
|
|
7511cd7 |
|
|
|
365159b |
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 15:09:42.000000000 +0000
|
|
|
365159b |
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 2014-11-28 16:52:00.315007846 +0000
|
|
|
4085f55 |
@@ -123,7 +123,11 @@
|
|
|
46cd6ac |
<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
|
|
|
46cd6ac |
<fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
|
|
|
46cd6ac |
<include name="cocoa/macosx/x86_64/**/*"/>
|
|
|
46cd6ac |
+ <include name="gtk/linux/arm/**/*"/>
|
|
|
46cd6ac |
+ <include name="gtk/linux/aarch64/**/*"/>
|
|
|
46cd6ac |
<include name="gtk/linux/ppc64le/**/*"/>
|
|
|
46cd6ac |
+ <include name="gtk/linux/s390x/**/*"/>
|
|
|
c242877 |
+ <include name="gtk/linux/x86/**/*"/>
|
|
|
46cd6ac |
<include name="gtk/linux/x86_64/**/*"/>
|
|
|
c242877 |
<include name="win32/win32/x86_64/**/*"/>
|
|
|
c242877 |
</fileset>
|
|
|
365159b |
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:44:03.436891441 +0000
|
|
|
365159b |
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties 2015-01-30 14:45:25.232480509 +0000
|
|
|
c242877 |
@@ -32,3 +32,15 @@
|
|
|
365159b |
|
|
|
c736234 |
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
|
|
|
c736234 |
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
|
|
|
c736234 |
+
|
|
|
4085f55 |
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
|
|
|
4085f55 |
+root.linux.gtk.arm.permissions.755=launcher
|
|
|
4085f55 |
+
|
|
|
365159b |
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
|
|
|
365159b |
+root.linux.gtk.aarch64.permissions.755=launcher
|
|
|
c736234 |
+
|
|
|
c736234 |
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
|
|
|
c736234 |
+root.linux.gtk.s390x.permissions.755=launcher
|
|
|
c242877 |
+
|
|
|
c242877 |
+root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
|
|
|
c242877 |
+root.linux.gtk.x86.permissions.755=launcher
|
|
|
c736234 |
--- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100
|
|
|
c736234 |
+++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100
|
|
|
4085f55 |
@@ -54,7 +54,11 @@
|
|
|
365159b |
|
|
|
c736234 |
<modules>
|
|
|
c736234 |
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
|
|
|
c736234 |
+ <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
|
|
|
c736234 |
+ <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
|
|
|
c736234 |
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
|
|
|
c736234 |
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
|
|
|
c242877 |
+ <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
|
|
|
c736234 |
<module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
|
|
|
c242877 |
<module>bundles/org.eclipse.swt.win32.win32.x86_64</module>
|
|
|
c242877 |
</modules>
|
|
|
8ae0eb0 |
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100
|
|
|
8ae0eb0 |
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
|
|
|
c242877 |
@@ -24,3 +24,23 @@
|
|
|
c242877 |
requires.5.name = org.eclipse.swt.gtk.linux.ppc64le
|
|
|
c242877 |
requires.5.range = [$version$,$version$]
|
|
|
c242877 |
requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
|
|
|
c242877 |
+
|
|
|
c242877 |
+requires.6.namespace = org.eclipse.equinox.p2.iu
|
|
|
c242877 |
+requires.6.name = org.eclipse.swt.gtk.linux.arm
|
|
|
c242877 |
+requires.6.range = [$version$,$version$]
|
|
|
c242877 |
+requires.6.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
|
|
c242877 |
+
|
|
|
c242877 |
+requires.7.namespace = org.eclipse.equinox.p2.iu
|
|
|
c242877 |
+requires.7.name = org.eclipse.swt.gtk.linux.aarch64
|
|
|
c242877 |
+requires.7.range = [$version$,$version$]
|
|
|
c242877 |
+requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
|
|
4085f55 |
+
|
|
|
4085f55 |
+requires.8.namespace = org.eclipse.equinox.p2.iu
|
|
|
c242877 |
+requires.8.name = org.eclipse.swt.gtk.linux.s390x
|
|
|
4085f55 |
+requires.8.range = [$version$,$version$]
|
|
|
c242877 |
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
|
|
|
c48d605 |
+
|
|
|
c48d605 |
+requires.9.namespace = org.eclipse.equinox.p2.iu
|
|
|
c242877 |
+requires.9.name = org.eclipse.swt.gtk.linux.x86
|
|
|
c48d605 |
+requires.9.range = [$version$,$version$]
|
|
|
c242877 |
+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86)(!(org.eclipse.swt.buildtime=true)))
|
|
|
704905c |
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100
|
|
|
704905c |
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
|
|
|
2fa4729 |
@@ -109,7 +109,7 @@
|
|
|
c48d605 |
"s390x")
|
|
|
c48d605 |
defaultOSArch="s390x"
|
|
|
a33980e |
defaultJava=DEFAULT_JAVA_EXEC
|
|
|
c48d605 |
- OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
|
|
|
c48d605 |
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
|
a33980e |
;;
|
|
|
be2a7ad |
arm*)
|
|
|
a33980e |
defaultOSArch="arm"
|
|
|
74c26cc |
--- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100
|
|
|
74c26cc |
+++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100
|
|
|
4085f55 |
@@ -73,6 +73,30 @@
|
|
|
74c26cc |
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
|
|
|
74c26cc |
</modules>
|
|
|
74c26cc |
</profile>
|
|
|
74c26cc |
+ <profile>
|
|
|
c242877 |
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
|
|
4085f55 |
+ <activation>
|
|
|
4085f55 |
+ <property>
|
|
|
4085f55 |
+ <name>native</name>
|
|
|
c242877 |
+ <value>gtk.linux.s390x</value>
|
|
|
4085f55 |
+ </property>
|
|
|
4085f55 |
+ </activation>
|
|
|
4085f55 |
+ <modules>
|
|
|
c242877 |
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
|
|
|
4085f55 |
+ </modules>
|
|
|
4085f55 |
+ </profile>
|
|
|
4085f55 |
+ <profile>
|
|
|
c242877 |
+ <id>build-native-launchers-gtk.linux.x86</id>
|
|
|
74c26cc |
+ <activation>
|
|
|
74c26cc |
+ <property>
|
|
|
74c26cc |
+ <name>native</name>
|
|
|
c242877 |
+ <value>gtk.linux.x86</value>
|
|
|
74c26cc |
+ </property>
|
|
|
74c26cc |
+ </activation>
|
|
|
74c26cc |
+ <modules>
|
|
|
c242877 |
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
|
|
|
74c26cc |
+ </modules>
|
|
|
74c26cc |
+ </profile>
|
|
|
74c26cc |
</profiles>
|
|
|
74c26cc |
|
|
|
74c26cc |
<modules>
|