278 lines
11 KiB
Diff
278 lines
11 KiB
Diff
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
|
|
index c13fae9ff..7f798e4f1 100644
|
|
--- a/eclipse.platform.swt.binaries/pom.xml
|
|
+++ b/eclipse.platform.swt.binaries/pom.xml
|
|
@@ -54,7 +54,12 @@
|
|
|
|
<modules>
|
|
<module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</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.ppc64</module>
|
|
<module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
|
|
+ <module>bundles/org.eclipse.swt.gtk.linux.riscv64</module>
|
|
+ <module>bundles/org.eclipse.swt.gtk.linux.s390x</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.win32.win32.x86</module>
|
|
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
|
index a1e3f456b..e138f98a3 100755
|
|
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
|
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
|
|
@@ -195,7 +195,7 @@ esac
|
|
|
|
|
|
# For 64-bit CPUs, we have a switch
|
|
-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' ]; then
|
|
+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'riscv64' ]; then
|
|
SWT_PTR_CFLAGS=-DJNI64
|
|
if [ -d /lib64 ]; then
|
|
XLIB64=-L/usr/X11R6/lib64
|
|
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
|
|
index 64628e51c..28da2e7d3 100644
|
|
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
|
|
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
|
|
@@ -34,3 +34,28 @@ requires.7.namespace = org.eclipse.equinox.p2.iu
|
|
requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
|
|
requires.7.range = [$version$,$version$]
|
|
requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.8.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.8.name = org.eclipse.swt.gtk.linux.ppc64
|
|
+requires.8.range = [$version$,$version$]
|
|
+requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.9.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.9.name = org.eclipse.swt.gtk.linux.arm
|
|
+requires.9.range = [$version$,$version$]
|
|
+requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.10.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.10.name = org.eclipse.swt.gtk.linux.aarch64
|
|
+requires.10.range = [$version$,$version$]
|
|
+requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.11.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.11.name = org.eclipse.swt.gtk.linux.s390x
|
|
+requires.11.range = [$version$,$version$]
|
|
+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.12.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.12.name = org.eclipse.swt.gtk.linux.riscv64
|
|
+requires.12.range = [$version$,$version$]
|
|
+requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=riscv64)(!(org.eclipse.swt.buildtime=true)))
|
|
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 51790c259..1ceafc95b 100644
|
|
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
|
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
|
|
@@ -418,6 +418,46 @@
|
|
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.s390x"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="s390x"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"/>
|
|
+
|
|
+ <plugin
|
|
+ id="org.eclipse.equinox.launcher.gtk.linux.riscv64"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="riscv64"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"/>
|
|
|
|
<plugin
|
|
id="org.eclipse.equinox.launcher.gtk.linux.x86"
|
|
@@ -499,6 +539,50 @@
|
|
fragment="true"
|
|
unpack="false"/>
|
|
|
|
+ <plugin
|
|
+ id="org.eclipse.swt.gtk.linux.s390x"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="s390x"
|
|
+ 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"/>
|
|
+
|
|
+ <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.riscv64"
|
|
+ os="linux"
|
|
+ ws="gtk"
|
|
+ arch="riscv64"
|
|
+ download-size="0"
|
|
+ install-size="0"
|
|
+ version="0.0.0"
|
|
+ fragment="true"
|
|
+ unpack="false"/>
|
|
+
|
|
<plugin
|
|
id="org.eclipse.swt.gtk.linux.ppc64le"
|
|
os="linux"
|
|
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
|
|
index 8ffe18e76..ebc821dc6 100644
|
|
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
|
|
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties
|
|
@@ -34,3 +34,18 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher
|
|
|
|
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
|
|
root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
|
|
+
|
|
+root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
|
|
+root.linux.gtk.arm.permissions.755=launcher
|
|
+
|
|
+root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
|
|
+root.linux.gtk.aarch64.permissions.755=launcher
|
|
+
|
|
+root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
|
|
+root.linux.gtk.ppc64.permissions.755=launcher
|
|
+
|
|
+root.linux.gtk.riscv64=bin/gtk/linux/riscv64,gtk_root
|
|
+root.linux.gtk.riscv64.permissions.755=launcher
|
|
+
|
|
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
|
|
+root.linux.gtk.s390x.permissions.755=launcher
|
|
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 2b8fe11e0..b19cf298e 100755
|
|
--- 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
|
|
@@ -106,7 +106,7 @@ case $defaultOS in
|
|
"s390x")
|
|
defaultOSArch="s390x"
|
|
defaultJava=DEFAULT_JAVA_EXEC
|
|
- OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
|
|
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
;;
|
|
arm*)
|
|
defaultOSArch="arm"
|
|
@@ -118,6 +118,11 @@ case $defaultOS in
|
|
defaultJava=DEFAULT_JAVA_EXEC
|
|
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
;;
|
|
+ "riscv64")
|
|
+ defaultOSArch="riscv64"
|
|
+ defaultJava=DEFAULT_JAVA_EXEC
|
|
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
+ ;;
|
|
*)
|
|
echo "*** Unknown MODEL <${MODEL}>"
|
|
;;
|
|
diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
|
index e56be0149..9f2727d00 100644
|
|
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
|
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
|
|
@@ -123,7 +123,12 @@
|
|
<copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
|
|
<fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
|
|
<include name="cocoa/macosx/x86_64/**/*"/>
|
|
+ <include name="gtk/linux/arm/**/*"/>
|
|
+ <include name="gtk/linux/aarch64/**/*"/>
|
|
+ <include name="gtk/linux/ppc64/**/*"/>
|
|
<include name="gtk/linux/ppc64le/**/*"/>
|
|
+ <include name="gtk/linux/riscv64/**/*"/>
|
|
+ <include name="gtk/linux/s390x/**/*"/>
|
|
<include name="gtk/linux/x86/**/*"/>
|
|
<include name="gtk/linux/x86_64/**/*"/>
|
|
<include name="win32/win32/x86/**/*"/>
|
|
diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
|
|
index ab9ba3bac..16cf0944f 100644
|
|
--- a/rt.equinox.framework/pom.xml
|
|
+++ b/rt.equinox.framework/pom.xml
|
|
@@ -73,6 +73,42 @@
|
|
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
|
|
</modules>
|
|
</profile>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.ppc64</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.ppc64</value>
|
|
+ </property>
|
|
+ </activation>
|
|
+ <modules>
|
|
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
|
|
+ </modules>
|
|
+ </profile>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.riscv64</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.riscv64</value>
|
|
+ </property>
|
|
+ </activation>
|
|
+ <modules>
|
|
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.riscv64</module>
|
|
+ </modules>
|
|
+ </profile>
|
|
+ <profile>
|
|
+ <id>build-native-launchers-gtk.linux.s390x</id>
|
|
+ <activation>
|
|
+ <property>
|
|
+ <name>native</name>
|
|
+ <value>gtk.linux.s390x</value>
|
|
+ </property>
|
|
+ </activation>
|
|
+ <modules>
|
|
+ <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
|
|
+ </modules>
|
|
+ </profile>
|
|
</profiles>
|
|
|
|
<modules>
|