diff options
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature')
7 files changed, 80 insertions, 5 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties index 025ea6942..fbe1bc960 100644 --- a/features/org.eclipse.equinox.executable.feature/build.properties +++ b/features/org.eclipse.equinox.executable.feature/build.properties @@ -48,6 +48,9 @@ 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 b92369a4b..a911ac9fb 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.x86_64" 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 7ab22c555..7d81a3576 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -176,8 +176,13 @@ case $defaultOS in fi case ${PROC} in "i386" | "x86") - defaultOSArch="x86" - [ -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" + if [ "`isainfo -k`" = "amd64" ]; then + defaultOSArch="x86_64" + [ -d /bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71" + else + defaultOSArch="x86" + [ -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" + fi CC=cc ;; "sparc") @@ -236,6 +241,9 @@ elif [ "$defaultOSArch" = "ia64" ]; then elif [ "$defaultOSArch" = "x86" ]; then M_ARCH=-m32 export M_ARCH +elif [ "$defaultOS" = "solaris" -a "$defaultOSArch" = "x86_64" ]; then + M_ARCH=-m64 + export M_ARCH fi LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak index 945becf9e..4d41b5f65 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_solaris.mak @@ -47,8 +47,9 @@ GTK_LIBS = \ -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \ -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.4\"" -LFLAGS = -G -CFLAGS = $(OPTFLAG) \ +LFLAGS = ${M_ARCH} -G +CFLAGS = ${M_ARCH} \ + $(OPTFLAG) \ -DSOLARIS \ $(PICFLAG) \ -DMOZILLA_FIX \ @@ -97,7 +98,7 @@ eclipseNix.o: ../eclipseNix.c $(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) - $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) + $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index dcb5c15ec..09fc6c310 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -224,6 +224,48 @@ </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> + <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.arm</id> <activation> <property> @@ -471,6 +513,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 8207846b8..1f9d3d5d3 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.properties +++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties @@ -50,6 +50,8 @@ 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 10008a662..958f9230f 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.xml +++ b/features/org.eclipse.equinox.executable.feature/resources/build.xml @@ -226,6 +226,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"> @@ -259,6 +266,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"/> |