Update generated ant bundle to 1.10.1 Fix missing launcher bundle on s390, rhbz#1445162 Add missing BR on libsecret
252 lines
9.2 KiB
Diff
252 lines
9.2 KiB
Diff
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
|
|
@@ -410,6 +410,36 @@
|
|
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.x86"
|
|
@@ -488,6 +518,39 @@
|
|
download-size="0"
|
|
install-size="0"
|
|
version="0.0.0"
|
|
+ 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"/>
|
|
|
|
--- 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
|
|
@@ -349,6 +349,68 @@
|
|
</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.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-win32.win32.x86_64</id>
|
|
<activation>
|
|
@@ -563,9 +563,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/ppc/**/*"/>
|
|
<include name="gtk/linux/ppc64/**/*"/>
|
|
<include name="gtk/linux/ppc64le/**/*"/>
|
|
+ <include name="gtk/linux/s390x/**/*"/>
|
|
<include name="gtk/linux/x86/**/*"/>
|
|
<include name="gtk/linux/x86_64/**/*"/>
|
|
<include name="win32/win32/x86/**/*"/>
|
|
--- 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
|
|
@@ -40,3 +40,12 @@
|
|
|
|
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.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
|
|
+
|
|
+root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
|
|
+root.linux.gtk.s390x.permissions.755=launcher
|
|
--- a/eclipse.platform.swt.binaries/pom.xml 2017-04-05 01:57:59.142576722 +0100
|
|
+++ b/eclipse.platform.swt.binaries/pom.xml 2017-04-05 02:00:00.153247342 +0100
|
|
@@ -55,9 +55,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.ppc</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.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>
|
|
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:15:34.857977599 +0100
|
|
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 2017-04-21 10:18:22.878025820 +0100
|
|
@@ -49,4 +49,19 @@
|
|
requires.10.namespace = org.eclipse.equinox.p2.iu
|
|
requires.10.name = org.eclipse.swt.cocoa.macosx.x86_64
|
|
requires.10.range = [$version$,$version$]
|
|
-requires.10.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
|
|
\ No newline at end of file
|
|
+requires.10.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.11.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.11.name = org.eclipse.swt.gtk.linux.arm
|
|
+requires.11.range = [$version$,$version$]
|
|
+requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.12.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.12.name = org.eclipse.swt.gtk.linux.aarch64
|
|
+requires.12.range = [$version$,$version$]
|
|
+requires.12.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
|
|
+
|
|
+requires.13.namespace = org.eclipse.equinox.p2.iu
|
|
+requires.13.name = org.eclipse.swt.gtk.linux.s390x
|
|
+requires.13.range = [$version$,$version$]
|
|
+requires.13.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
|
|
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-19 13:31:15.000000000 +0100
|
|
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh 2017-04-23 16:58:34.022207885 +0100
|
|
@@ -127,7 +127,7 @@
|
|
defaultJava=DEFAULT_JAVA_EXEC
|
|
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
;;
|
|
- "arm*")
|
|
+ arm*)
|
|
defaultOSArch="arm"
|
|
defaultJava=DEFAULT_JAVA_EXEC
|
|
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
|
--- a/rt.equinox.framework/pom.xml 2017-04-26 22:19:15.548461372 +0100
|
|
+++ b/rt.equinox.framework/pom.xml 2017-04-26 22:20:41.348571492 +0100
|
|
@@ -73,6 +73,18 @@
|
|
<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</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>
|