Attachment 246125 Details for Bug 429335 – patch for rt.equinox.framework to allow for building a native launcher on Solaris x86_64 (master branch)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch for rt.equinox.framework to allow for building a native launcher on Solaris x86_64 (master branch)

master-rt.equinox.framework.patch1 (text/plain), 9.74 KB, created by Thorsten Heit

on 2014-08-19 05:39:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thorsten Heit

Created: 2014-08-19 05:39:20 EDT

Size: 9.74 KB

patch

obsolete

>diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties
>index 08cd969..57636fb 100644
>--- a/features/org.eclipse.equinox.executable.feature/build.properties
>+++ b/features/org.eclipse.equinox.executable.feature/build.properties
>@@ -48,6 +48,10 @@ root.hpux.gtk.ia64.permissions.755=launcher
> 
> root.solaris.gtk.x86=bin/gtk/solaris/x86
> root.solaris.gtk.x86.permissions.755=launcher
>+
>+root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64
>+root.solaris.gtk.x86_64.permissions.755=launcher
>+
> root.solaris.gtk.sparc=bin/gtk/solaris/sparc
> root.solaris.gtk.sparc.permissions.755=launcher
> 
>diff --git a/features/org.eclipse.equinox.executable.feature/feature.xml b/features/org.eclipse.equinox.executable.feature/feature.xml
>index 6ff5b9a..96a1469 100644
>--- a/features/org.eclipse.equinox.executable.feature/feature.xml
>+++ b/features/org.eclipse.equinox.executable.feature/feature.xml
>@@ -42,6 +42,16 @@
>          fragment="true"/>
> 
>    <plugin
>+         id="org.eclipse.equinox.launcher.gtk.solaris.x86_64"
>+         os="solaris"
>+         ws="gtk"
>+         arch="x86_64"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"/>
>+
>+   <plugin
>          id="org.eclipse.equinox.launcher.cocoa.macosx"
>          os="macosx"
>          ws="cocoa"
>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 29d3871..10d95df 100644
>--- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
>+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
>@@ -160,9 +160,14 @@ case $defaultOS in
> 		fi
> 		case ${PROC} in
> 			"i386" | "x86")
>-				defaultOSArch="x86"
>+				if [ "`isainfo -k`" = "amd64" ]; then
>+					defaultOSArch="x86_64"
>+					CC="cc -m64"
>+				else
>+					defaultOSArch="x86"
>+					CC=cc
>+				fi
> 				[ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x86/jdk1.6.0_14"
>-				CC=cc
> 				;;
> 			"sparc")
> 				defaultOSArch="sparc"
>diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml
>index 156de22..b056242 100644
>--- a/features/org.eclipse.equinox.executable.feature/pom.xml
>+++ b/features/org.eclipse.equinox.executable.feature/pom.xml
>@@ -220,6 +220,112 @@
>       </build>
>     </profile>
>     <profile>
>+      <id>build-native-launchers-gtk.solaris.x86_64</id>
>+      <activation>
>+        <property>
>+          <name>native</name>
>+          <value>gtk.solaris.x86_64</value>
>+        </property>
>+      </activation>
>+      <build>
>+        <plugins>
>+          <plugin>
>+            <artifactId>maven-antrun-plugin</artifactId>
>+            <version> 1.7 </version>
>+            <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>
>+            <dependencies>
>+              <dependency>
>+                <groupId>bsf</groupId>
>+                <artifactId>bsf</artifactId>
>+                <version>2.4.0</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>rhino</groupId>
>+                <artifactId>js</artifactId>
>+                <version>1.7R2</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-apache-bsf</artifactId>
>+                <version>1.8.3</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-nodeps</artifactId>
>+                <version>1.8.1</version>
>+              </dependency>
>+            </dependencies>
>+          </plugin>
>+        </plugins>
>+      </build>
>+    </profile>
>+    <profile>
>+      <id>build-native-launchers-gtk.solaris.x86</id>
>+      <activation>
>+        <property>
>+          <name>native</name>
>+          <value>gtk.solaris.x86</value>
>+        </property>
>+      </activation>
>+      <build>
>+        <plugins>
>+          <plugin>
>+            <artifactId>maven-antrun-plugin</artifactId>
>+            <version> 1.7 </version>
>+            <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>
>+            <dependencies>
>+              <dependency>
>+                <groupId>bsf</groupId>
>+                <artifactId>bsf</artifactId>
>+                <version>2.4.0</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>rhino</groupId>
>+                <artifactId>js</artifactId>
>+                <version>1.7R2</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-apache-bsf</artifactId>
>+                <version>1.8.3</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-nodeps</artifactId>
>+                <version>1.8.1</version>
>+              </dependency>
>+            </dependencies>
>+          </plugin>
>+        </plugins>
>+      </build>
>+    </profile>
>+    <profile>
>       <id>build-native-launchers-win32.win32.x86_64</id>
>       <activation>
>         <property>
>@@ -345,6 +451,7 @@
>                         <include name="gtk/linux/x86_64/**/*"/>
>                         <include name="gtk/solaris/sparc/**/*"/>
>                         <include name="gtk/solaris/x86/**/*"/>
>+                        <include name="gtk/solaris/x86_64/**/*"/>
>                         <include name="win32/win32/x86/**/*"/>
>                         <include name="win32/win32/x86_64/**/*"/>
>                       </fileset>
>diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties
>index a224ffa..9bf1609 100644
>--- a/features/org.eclipse.equinox.executable.feature/resources/build.properties
>+++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties
>@@ -44,6 +44,10 @@ root.hpux.gtk.ia64.permissions.755=launcher
> 
> root.solaris.gtk.x86=bin/gtk/solaris/x86
> root.solaris.gtk.x86.permissions.755=launcher
>+
>+root.solaris.gtk.x86_64=bin/gtk/solaris/x86_64
>+root.solaris.gtk.x86_64.permissions.755=launcher
>+
> root.solaris.gtk.sparc=bin/gtk/solaris/sparc
> root.solaris.gtk.sparc.permissions.755=launcher
> 
>diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.xml b/features/org.eclipse.equinox.executable.feature/resources/build.xml
>index 29ed943..0d3fa7f 100644
>--- a/features/org.eclipse.equinox.executable.feature/resources/build.xml
>+++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml
>@@ -212,6 +212,13 @@
> 		</copy>
> 		<chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="launcher" /> 
> 	</target>
>+	<target name="rootFilessolaris_gtk_x86_64">
>+		<mkdir dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}"/>
>+		<copy todir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true">
>+			<fileset dir="${basedir}/bin/gtk/solaris/x86_64" includes="**"			/>
>+		</copy>
>+		<chmod perm="755" dir="${feature.base}/solaris.gtk.x86_64/${collectingFolder}" includes="launcher" /> 
>+	</target>
> 	<target name="rootFileshpux_gtk_ia64_32">
> 		<mkdir dir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}"/>
> 		<copy todir="${feature.base}/hpux.gtk.ia64_32/${collectingFolder}" failonerror="true" overwrite="true">
>@@ -243,6 +250,7 @@
> 		<antcall target="rootFileslinux_gtk_s390x"/>
> 		<antcall target="rootFilessolaris_gtk_sparc"/>
> 		<antcall target="rootFilessolaris_gtk_x86"/>
>+		<antcall target="rootFilessolaris_gtk_x86_64"/>
> 		<antcall target="rootFilesaix_gtk_ppc64"/>
> 		<antcall target="rootFilesaix_gtk_ppc"/>
> 		<antcall target="rootFileshpux_gtk_ia64_32"/>
>@@ -270,4 +278,4 @@
> 	<target name="gather.logs" depends="init">
> 	</target>
> 
>-</project>
>\ No newline at end of file
>+</project>
>diff --git a/pom.xml b/pom.xml
>index 354a9e1..eddb3d2 100644
>--- a/pom.xml
>+++ b/pom.xml
>@@ -25,7 +25,7 @@
>   <packaging>pom</packaging>
> 
>   <properties>
>-    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git</tycho.scmUrl>
>+    <tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git</tycho.scmUrl>
>   </properties>
> 
>   <repositories>
>@@ -63,6 +63,7 @@
>     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
>     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module>
>     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module>
>+    <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64</module>
>     <module>bundles/org.eclipse.equinox.launcher.win32.win32.ia64</module>
>     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>
>     <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>

Actions: View | Diff

Attachments on bug 429335: 240406 | 240407 | 240408 | 240452 | 240453 | 246085 | 246086 | 246088 | 246125