diff options
| author | Alexander Kurtakov | 2015-09-03 13:17:22 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2015-11-13 17:33:41 +0000 |
| commit | f9a4df947e4da913325b8523f9812b59da0cdacb (patch) | |
| tree | 0e9d4abfb81a390defe41eb99a8f09dab06a4cb3 | |
| parent | df8289155d6db4a52817db79d942316bfa3c9ece (diff) | |
| download | rt.equinox.framework-f9a4df947e4da913325b8523f9812b59da0cdacb.tar.gz rt.equinox.framework-f9a4df947e4da913325b8523f9812b59da0cdacb.tar.xz rt.equinox.framework-f9a4df947e4da913325b8523f9812b59da0cdacb.zip | |
Bug 431197 - Provide launchers for arm and aarch64I20151117-0800
Add fragments hook them in the build system but conditionally via
profiles.
Change-Id: Ia93e5ac1a495bc4c953f861e583747ce89c22256
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
17 files changed, 383 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/.project b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/.project new file mode 100644 index 000000000..ba357258a --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/.project @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.equinox.launcher.gtk.linux.aarch64</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + </natures> +</projectDescription> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF new file mode 100644 index 000000000..9ee743ade --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.aarch64;singleton:=true +Bundle-Version: 1.1.300.qualifier +Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=aarch64)) +Bundle-Localization: launcher.gtk.linux.aarch64 +Eclipse-BundleShape: dir diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html new file mode 100644 index 000000000..395df3ba9 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2006</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). +Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor’s license +that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties new file mode 100644 index 000000000..151945e61 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties @@ -0,0 +1,17 @@ +############################################################################### +# Copyright (c) 2015 Red Hat Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Red Hat Inc. - initial API and implementation +############################################################################### +bin.includes = META-INF/,\ + eclipse_*.so,\ + launcher.gtk.linux.aarch64.properties,\ + about.html + +generateSourceBundle=false +binaryTag=v20150602-1017 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties new file mode 100644 index 000000000..22e0fea38 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/launcher.gtk.linux.aarch64.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2015 Red Hat Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Red Hat Inc. - initial API and implementation +############################################################################### +pluginName = Equinox Launcher Linux AARCH64 Fragment +providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml new file mode 100644 index 000000000..b4a996851 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/pom.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Red Hat Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Red Hat Inc. - initial implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>launcher-binary-parent</artifactId> + <groupId>org.eclipse.equinox.framework</groupId> + <version>4.6.0-SNAPSHOT</version> + <relativePath>../../launcher-binary-parent</relativePath> + </parent> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.equinox.launcher.gtk.linux.aarch64</artifactId> + <version>1.1.300-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <properties> + <os>linux</os> + <ws>gtk</ws> + <arch>aarch64</arch> + </properties> +</project> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/.project b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/.project new file mode 100644 index 000000000..4c275d757 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/.project @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.equinox.launcher.gtk.linux.arm</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + </natures> +</projectDescription> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF new file mode 100644 index 000000000..50c11efbf --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.arm;singleton:=true +Bundle-Version: 1.1.300.qualifier +Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=arm)) +Bundle-Localization: launcher.gtk.linux.arm +Eclipse-BundleShape: dir diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html new file mode 100644 index 000000000..395df3ba9 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2006</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). +Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor’s license +that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html>
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties new file mode 100644 index 000000000..45e023dd2 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties @@ -0,0 +1,17 @@ +############################################################################### +# Copyright (c) 2011 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +bin.includes = META-INF/,\ + eclipse_*.so,\ + launcher.gtk.linux.arm.properties,\ + about.html + +generateSourceBundle=false +binaryTag=v20150602-1017 diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties new file mode 100644 index 000000000..6015fb4da --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/launcher.gtk.linux.arm.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2015 Red Hat Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Red Hat Inc. - initial API and implementation +############################################################################### +pluginName = Equinox Launcher Linux ARM Fragment +providerName = Eclipse.org - Equinox diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml new file mode 100644 index 000000000..b6b34cf35 --- /dev/null +++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/pom.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2015 Red Hat Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Red Hat Inc. - initial implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>launcher-binary-parent</artifactId> + <groupId>org.eclipse.equinox.framework</groupId> + <version>4.6.0-SNAPSHOT</version> + <relativePath>../../launcher-binary-parent</relativePath> + </parent> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.equinox.launcher.gtk.linux.arm</artifactId> + <version>1.1.300-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + + <properties> + <os>linux</os> + <ws>gtk</ws> + <arch>arm</arch> + </properties> +</project> diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh index b36f21d0c..4eaa0da3b 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -125,6 +125,16 @@ case $defaultOS in 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}>" ;; diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index 3a25e8c9e..9d37a9bd3 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -225,6 +225,90 @@ </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> + <execution> + <id>clean-executable-natives</id> + <phase>clean</phase> + <configuration> + <target> + <ant antfile="build.xml" dir="library/gtk/" target="clean"/> + </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> + <execution> + <id>clean-executable-natives</id> + <phase>clean</phase> + <configuration> + <target> + <ant antfile="build.xml" dir="library/gtk/" target="clean"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>build-native-launchers-win32.win32.x86_64</id> <activation> <property> @@ -379,6 +463,8 @@ <include name="gtk/aix/ppc/**/*"/> <include name="gtk/aix/ppc64/**/*"/> <include name="gtk/hpux/ia64/**/*"/> + <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/**/*"/> diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties index 9fd9a327d..8207846b8 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.properties +++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties @@ -31,6 +31,12 @@ root.linux.gtk.ppc64.permissions.755=launcher root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root root.linux.gtk.ppc64le.permissions.755=launcher +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.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName} diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml index e64594ada..6a86b63f2 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.xml +++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml @@ -160,6 +160,22 @@ </copy> <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64le/${collectingFolder}" includes="launcher" /> </target> + <target name="rootFileslinux_gtk_arm"> + <mkdir dir="${feature.base}/linux.gtk.arm/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.arm/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/bin/gtk/linux/arm" includes="**" /> + <fileset dir="${basedir}/gtk_root" includes="**" /> + </copy> + <chmod perm="755" dir="${feature.base}/linux.gtk.arm/${collectingFolder}" includes="launcher" /> + </target> + <target name="rootFileslinux_gtk_aarch64"> + <mkdir dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/bin/gtk/linux/aarch64" includes="**" /> + <fileset dir="${basedir}/gtk_root" includes="**" /> + </copy> + <chmod perm="755" dir="${feature.base}/linux.gtk.aarch64/${collectingFolder}" includes="launcher" /> + </target> <target name="rootFilesaix_gtk_ppc64"> <mkdir dir="${feature.base}/aix.gtk.ppc64/${collectingFolder}"/> <copy todir="${feature.base}/aix.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true"> @@ -247,6 +263,8 @@ <antcall target="rootFileslinux_gtk_ppc"/> <antcall target="rootFileslinux_gtk_ppc64"/> <antcall target="rootFileslinux_gtk_ppc64le"/> + <antcall target="rootFileslinux_gtk_arm"/> + <antcall target="rootFileslinux_gtk_aarch64"/> <antcall target="rootFileslinux_gtk_x86_64"/> <antcall target="rootFileslinux_gtk_ia64"/> <antcall target="rootFileslinux_gtk_s390x"/> @@ -279,4 +297,4 @@ <target name="gather.logs" depends="init"> </target> -</project>
\ No newline at end of file +</project> @@ -49,6 +49,30 @@ </repository> </repositories> </profile> + <profile> + <id>build-native-launchers-gtk.linux.arm</id> + <activation> + <property> + <name>native</name> + <value>gtk.linux.arm</value> + </property> + </activation> + <modules> + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module> + </modules> + </profile> + <profile> + <id>build-native-launchers-gtk.linux.aarch64</id> + <activation> + <property> + <name>native</name> + <value>gtk.linux.aarch64</value> + </property> + </activation> + <modules> + <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module> + </modules> + </profile> </profiles> <modules> |