# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # eclipse # eclipse/pkg-descr # eclipse/distinfo # eclipse/Makefile # eclipse/files # eclipse/files/eclipse.in # eclipse/files/patch-freebsd_natives # eclipse/files/patch-aggregator # eclipse/files/patch-submodules # eclipse/scripts # eclipse/scripts/pre-patch # echo c - eclipse mkdir -p eclipse > /dev/null 2>&1 echo x - eclipse/pkg-descr sed 's/^X//' >eclipse/pkg-descr << '40b0fd993d37a877b52d7b61a5e369cb' XThe Eclipse Platform is an open extensible IDE for anything and yet Xnothing in particular. The Eclipse Platform provides building blocks Xand a foundation for constructing and running integrated software- Xdevelopment tools. The Eclipse Platform allows tool builders to Xindependently develop tools that integrate with other people's tools Xso seamlessly you can't tell where one tool ends and another starts. X XWWW: http://www.eclipse.org/ 40b0fd993d37a877b52d7b61a5e369cb echo x - eclipse/distinfo sed 's/^X//' >eclipse/distinfo << '8bf465d09aa7240ee722f5f3bcf95369' XSHA256 (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 2453b2f8e12c7cd90f15dc34519e785befb69ef014e07cd2b180f8a4d7b557cd XSIZE (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 196545676 XSHA256 (eclipse/eclipse-maven-repo-4.3.2.xz) = f5288a26d9bdb22f5a455bba52f73589918c9bcff65bb667ae6d246467a61ca8 XSIZE (eclipse/eclipse-maven-repo-4.3.2.xz) = 185972692 8bf465d09aa7240ee722f5f3bcf95369 echo x - eclipse/Makefile sed 's/^X//' >eclipse/Makefile << '87c1c5ef8f7a45fd7f38a618119458a1' X# Created by: Jimmy Kelley X XPORTNAME= eclipse XPORTVERSION= 4.3.2 XCATEGORIES= java devel XMASTER_SITES= https://googledrive.com/host/0Bz0xwjGweffeMkp3R1V3WVJBV1E/ XDISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \ X ${PORTNAME}-maven-repo-${PORTVERSION}.xz XDIST_SUBDIR= eclipse X XMAINTAINER= ljboiler@gmail.com XCOMMENT= Eclipse Kepler SR-2 X XLICENSE= EPL X XBUILD_DEPENDS= ${LOCALBASE}/share/java/maven31/bin/mvn:${PORTSDIR}/devel/maven31 \ X gmake:${PORTSDIR}/devel/gmake XLIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ X webkitgtk:${PORTSDIR}/www/webkit-gtk2 X XONLY_FOR_ARCHS= i386 amd64 XCONFLICTS_INSTALL= eclipse X XUSES= pkgconfig tar:xz XUSE_GL= glu XUSE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui XUSE_JAVA= yes XJAVA_OS= native XJAVA_VERSION= 1.7 XJAVA_VENDOR= openjdk XJAVA_BUILD= yes XJAVA_RUN= yes X XOPTIONS_SINGLE= INSTALLPKG XOPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM XFULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs) XPLATFORM_SDK_DESC= Platform with source, API Docs (no Java tools) XPLATFORM_DESC= Platform only (no Java tools, no source or docs) X XOPTIONS_DEFAULT= FULL_SDK X X.include X X.if ${OSREL:R} < 10 XPATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch XPATCH= gpatch X.endif XPATCH_STRIP= -p1 X XWRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION} X XMVN_LOCAL_REPO= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION}/repository XMVN_TEST_FLAG= -Dmaven.test.skip=true XMVN_OPTS+= # a placeholder for MAVEN_OPTS env variable \ X in the following format: MAVEN_OPTS='-Xmx1792m' XMVN_SETTINGS+= --offline XECLIPSE_WS= gtk XECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/} XE_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//} XECLIPSE_BUILDID=M20140224-0627 XSCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ X E_SHORTARCH=${E_SHORTARCH} XPORTDESTDIR= ${PREFIX}/lib/eclipse X X# Someday it would be nice to see about moving the product selection into the patch phase (and only build the X# product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho X# builder is a "all-or-nothing" thing right now. X.if ${PORT_OPTIONS:MFULL_SDK} XPRODUCT_TARFILE= \ X ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz X.endif X.if ${PORT_OPTIONS:MPLATFORM_SDK} XPRODUCT_TARFILE= \ X ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/target/products/org.eclipse.platform.sdk-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz X.endif X.if ${PORT_OPTIONS:MPLATFORM} XPRODUCT_TARFILE= \ X ${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz X.endif X Xpost-patch: X @(for f in `${GREP} -hE '(\-\-\-|%%ECLIPSE_ARCH%%)' ${FILESDIR}/patch-* | ${GREP} -B1 'ECLIPSE_ARCH' | ${GREP} '^\-\-\-' | ${SED} -e 's/^\-\-\- .\///'` ; \ X do \ X ${ECHO_MSG} "Updating ECLIPSE_ARCH in file $$f"; \ X ${REINPLACE_CMD} -e "s|%%ECLIPSE_ARCH%%|${ECLIPSE_ARCH}|g" ${WRKSRC}/$$f; \ X done) X Xdo-build: X @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \ X mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \ X -DbuildId=${ECLIPSE_BUILDID} -Pupdate-branding-plugins) X Xdo-install: X @${RM} -rf ${STAGEDIR}${PORTDESTDIR} X @( cd ${STAGEDIR}${PREFIX}/lib; ${TAR} xfz ${PRODUCT_TARFILE} ) X @${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name \*.orig -delete X @${SED} \ X -e "s+%%BROWSER%%+${GECKO:S/19//}+g" \ X -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ X -e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \ X -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \ X -e "s+%%JAVA_VERSION%%+${JAVA_VERSION}+g" \ X -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ X ${FILESDIR}/eclipse.in > ${BUILD_WRKSRC}/eclipse.tmp X.if defined(JAVA_VENDOR) X @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \ X ${BUILD_WRKSRC}/eclipse.tmp X.else X @${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \ X ${BUILD_WRKSRC}/eclipse.tmp X.endif X ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/eclipse.tmp ${STAGEDIR}${PREFIX}/bin/eclipse X ${STAGEDIR}${PREFIX}/lib/eclipse/eclipse -initialize -consolelog X @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s lib/eclipse -not -type d) >> ${TMPPLIST} X @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s bin/eclipse -not -type d) >> ${TMPPLIST} X @(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST} X @${ECHO_CMD} "@exec ${MKDIR} %D/lib/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST} X @${ECHO_CMD} "@exec ${MKDIR} %D/share/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST} X @${ECHO_CMD} "@dirrm share/eclipse/dropins" >> ${TMPPLIST} X @${ECHO_CMD} "@dirrm share/eclipse" >> ${TMPPLIST} X @${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST} X @${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST} X Xpost-install: X @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins X Xdistclean: X ${RM} -rf ${DISTDIR}/eclipse X Xdistm2clean: X ${RM} -rf ${DISTDIR}/eclipse/.m2 X X.include 87c1c5ef8f7a45fd7f38a618119458a1 echo c - eclipse/files mkdir -p eclipse/files > /dev/null 2>&1 echo x - eclipse/files/eclipse.in sed 's/^X//' >eclipse/files/eclipse.in << '8d947be03979e7588fd8d62e3dd66d2e' X#!/bin/sh X# X# FreeBSD-specific startup script for Eclipse Platform X# X# See: http://www.eclipse.org X# X# $FreeBSD: head/java/eclipse/files/eclipse.in 300896 2012-07-14 13:54:48Z beat $ X# XDEFAULT_JAVA_HOME=%%JAVA_HOME%% XECLIPSE_HOME=%%ECLIPSE_HOME%% XDEFAULT_JAVA_CMD=java Xexport GRE_HOME=%%LOCALBASE%%/lib/%%BROWSER%% X X#----------------------------------------------------------------------------- X# Determine configuration settings X#----------------------------------------------------------------------------- X X# Determine the JDK home directory Xif [ -z "${JAVA_HOME}" ]; then X JAVA_HOME=${DEFAULT_JAVA_HOME} Xfi X X# Determine 'java' executable Xif [ -z "${JAVACMD}" ]; then X if [ -n "${JAVA_HOME}" ]; then X JAVACMD="${JAVA_HOME}/bin/java" X else X JAVACMD=${DEFAULT_JAVACMD} X fi Xfi X X# Check if 'java' executable can be found Xif [ ! -x "$JAVACMD" ]; then X echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}" X echo " Unable to find ${JAVACMD}" X exit 1 Xfi X X# Check if 'eclipse' executable can be found Xif [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then X echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}" X echo " Unable to find eclipse launcher binary" X exit 1 Xfi X XJAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@ 8d947be03979e7588fd8d62e3dd66d2e echo x - eclipse/files/patch-freebsd_natives sed 's/^X//' >eclipse/files/patch-freebsd_natives << '75a4eadbbfb21a710c07262d27bf0712' X--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2014-03-30 18:38:29.000000000 -0500 X+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2014-03-30 19:41:07.000000000 -0500 X@@ -17,7 +17,7 @@ X LIB_NAME_FULL = libunixfile_1_0_0.so X X #Set this to be your OS type X-OS_TYPE = linux X+OS_TYPE = freebsd X X #Set this to be the location of your JRE X ifeq (${JAVA_HOME},) X@@ -25,15 +25,11 @@ X endif X X JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} X-OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 X+OPT_FLAGS=-O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 X X core: X- gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) X- gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc X+ $(CC) $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) X+ $(CC) $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc X X clean: X rm -f $(CORE.O) $(LIB_NAME_FULL) X- X-install: core X- rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so X- mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/ X--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500 X+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:32:26.000000000 -0500 X@@ -1,9 +1,9 @@ X Manifest-Version: 1.0 X Bundle-ManifestVersion: 2 X Bundle-Name: %fragmentName X-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true X+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true X Bundle-Version: 1.4.100.qualifier X Bundle-Vendor: %providerName X Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" X Bundle-Localization: fragment X-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) X+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) X--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500 X+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-03-30 19:37:41.000000000 -0500 X@@ -18,7 +18,7 @@ X ../../ X X org.eclipse.core X- org.eclipse.core.filesystem.linux.x86 X+ org.eclipse.core.filesystem.freebsd.x86 X 1.4.100-SNAPSHOT X eclipse-plugin X X@@ -33,7 +33,7 @@ X p2 X X X- linux X+ freebsd X gtk X x86 X X@@ -50,7 +50,7 @@ X X X native X- gtk.linux.x86 X+ gtk.freebsd.x86 X X X X@@ -64,12 +64,13 @@ X process-resources X X X- X- X- X- X- X- X+ X+ X+ X+ X+ X+ X+ X X X X--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500 X+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:33:50.000000000 -0500 X@@ -1,9 +1,9 @@ X Manifest-Version: 1.0 X Bundle-ManifestVersion: 2 X Bundle-Name: %fragmentName X-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true X+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true X Bundle-Version: 1.2.100.qualifier X Bundle-Vendor: %providerName X Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" X Bundle-Localization: fragment X-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) X+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) X--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500 X+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-03-30 19:36:09.000000000 -0500 X@@ -18,7 +18,7 @@ X ../../ X X org.eclipse.core X- org.eclipse.core.filesystem.linux.x86_64 X+ org.eclipse.core.filesystem.freebsd.x86_64 X 1.2.100-SNAPSHOT X eclipse-plugin X X@@ -33,7 +33,7 @@ X p2 X X X- linux X+ freebsd X gtk X x86_64 X X@@ -50,7 +50,7 @@ X X X native X- gtk.linux.x86_64 X+ gtk.freebsd.x86_64 X X X X@@ -64,13 +64,13 @@ X process-resources X X X- X- X- X- X- X- X- X+ X+ X+ X+ X+ X+ X+ X X X X--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:08.000000000 -0500 X+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:50:51.000000000 -0500 X@@ -2,7 +2,7 @@ X Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" X Bundle-Name: %fragmentName X Bundle-Vendor: %providerName X-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true X+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true X Bundle-Version: 3.102.1.qualifier X Bundle-ManifestVersion: 2 X Bundle-Localization: fragment X@@ -30,6 +30,6 @@ X org.eclipse.swt.internal.gtk; x-internal:=true, X org.eclipse.swt.internal.mozilla; x-internal:=true, X org.eclipse.swt.internal.opengl.glx; x-internal:=true X-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) X+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) X Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, X J2SE-1.3 X--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500 X+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-03-30 19:49:19.000000000 -0500 X@@ -20,12 +20,12 @@ X ../binaries-parent/ X X org.eclipse.swt X- org.eclipse.swt.gtk.linux.x86 X+ org.eclipse.swt.gtk.freebsd.x86 X 3.102.1-SNAPSHOT X eclipse-plugin X X X- linux X+ freebsd X gtk X x86 X ${buildId} X@@ -112,7 +112,7 @@ X X X native X- gtk.linux.x86 X+ gtk.freebsd.x86 X X X X--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-03-30 18:51:08.000000000 -0500 X+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-03-30 19:49:45.000000000 -0500 X@@ -1,10 +1,10 @@ X X- X+ X X X- X+ X X- X+ X X X X--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:08.000000000 -0500 X+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:52:06.000000000 -0500 X@@ -2,7 +2,7 @@ X Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" X Bundle-Name: %fragmentName X Bundle-Vendor: %providerName X-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true X+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true X Bundle-Version: 3.102.1.qualifier X Bundle-ManifestVersion: 2 X Bundle-Localization: fragment X@@ -30,6 +30,6 @@ X org.eclipse.swt.internal.gtk; x-internal:=true, X org.eclipse.swt.internal.mozilla; x-internal:=true, X org.eclipse.swt.internal.opengl.glx; x-internal:=true X-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) X+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) X Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, X J2SE-1.3 X--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-03-30 18:51:08.000000000 -0500 X+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-03-30 19:51:51.000000000 -0500 X@@ -1,10 +1,10 @@ X X- X+ X X X- X+ X X- X+ X X X X--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500 X+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:51:36.000000000 -0500 X@@ -20,12 +20,12 @@ X ../binaries-parent/ X X org.eclipse.swt X- org.eclipse.swt.gtk.linux.x86_64 X+ org.eclipse.swt.gtk.freebsd.x86_64 X 3.102.1-SNAPSHOT X eclipse-plugin X X X- linux X+ freebsd X gtk X x86_64 X ${buildId} X@@ -112,7 +112,7 @@ X X X native X- gtk.linux.x86_64 X+ gtk.freebsd.x86_64 X X X X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:45:38.000000000 -0500 X@@ -3,8 +3,8 @@ X Bundle-Name: %fragmentName X Bundle-Vendor: %providerName X Bundle-Localization: fragment X-Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true X+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true X Bundle-Version: 1.1.300.qualifier X Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" X-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) X+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) X Bundle-RequiredExecutionEnvironment: J2SE-1.4 X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml 2014-03-30 19:45:12.000000000 -0500 X@@ -18,7 +18,7 @@ X ../../../../ X X org.eclipse.core X- org.eclipse.core.net.linux.x86 X+ org.eclipse.core.net.freebsd.x86 X 1.1.300-SNAPSHOT X eclipse-plugin X X@@ -30,7 +30,7 @@ X X X X- linux X+ freebsd X gtk X x86 X X@@ -47,7 +47,7 @@ X X X native X- gtk.linux.x86 X+ gtk.freebsd.x86 X X X X@@ -61,12 +61,12 @@ X process-resources X X X- X- X- X- X- X- X+ X+ X+ X+ X+ X+ X X X X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-03-30 19:45:23.000000000 -0500 X@@ -8,5 +8,5 @@ X # Contributors: X # IBM Corporation - initial API and implementation X ############################################################################### X-fragmentName = Proxy for Linux X+fragmentName = Proxy for FreeBSD X providerName = Eclipse.org X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:47:19.000000000 -0500 X@@ -3,8 +3,8 @@ X Bundle-Name: %fragmentName X Bundle-Vendor: %providerName X Bundle-Localization: fragment X-Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true X+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=true X Bundle-Version: 1.1.100.qualifier X Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" X-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) X+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) X Bundle-RequiredExecutionEnvironment: J2SE-1.4 X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml 2014-03-30 19:47:00.000000000 -0500 X@@ -18,7 +18,7 @@ X ../../../../ X X org.eclipse.core X- org.eclipse.core.net.linux.x86_64 X+ org.eclipse.core.net.freebsd.x86_64 X 1.1.100-SNAPSHOT X eclipse-plugin X X@@ -31,7 +31,7 @@ X X X X- linux X+ freebsd X gtk X x86_64 X X@@ -48,7 +48,7 @@ X X X native X- gtk.linux.x86_64 X+ gtk.freebsd.x86_64 X X X X@@ -62,12 +62,12 @@ X process-resources X X X- X- X- X- X- X- X+ X+ X+ X+ X+ X+ X X X X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-03-30 19:47:09.000000000 -0500 X@@ -8,5 +8,5 @@ X # Contributors: X # IBM Corporation - initial API and implementation X ############################################################################### X-fragmentName = Proxy for Linux x86_64 X+fragmentName = Proxy for FreeBSD x86_64 X providerName = Eclipse.org X--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig 2014-03-30 18:51:46.000000000 -0500 X+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 2014-03-30 19:42:55.000000000 -0500 X@@ -18,7 +18,7 @@ X LIB_NAME = gnomeproxy.so X LIB_NAME_FULL = libgnomeproxy-1.0.0.so X X-OS_TYPE = linux X+OS_TYPE = freebsd X JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE} X INCLUDE = `pkg-config --cflags gconf-2.0` X COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT} X@@ -30,15 +30,15 @@ X X compile: X @echo "Building file: $(GNOMEPROXY.O)" X- @echo "Invoking: GCC C Compiler" X- gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) X+ @echo "Invoking: C Compiler" X+ $(CC) $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) X @echo "Finished building: $(GNOMEPROXY.O)" X @echo " " X X link: compile X @echo "Building target: $(LIB_NAME_FULL)" X- @echo "Invoking: GCC C Linker" X- gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc X+ @echo "Invoking: C Linker" X+ $(CC) $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc X @echo "Finished building target: $(LIB_NAME_FULL)" X @echo " " X X--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:56:10.000000000 -0500 X+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:54:41.000000000 -0500 X@@ -2,9 +2,9 @@ X Bundle-ManifestVersion: 2 X Bundle-Name: %pluginName X Bundle-Vendor: %providerName X-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true X+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true X Bundle-Version: 1.1.200.qualifier X Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)" X-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) X-Bundle-Localization: launcher.gtk.linux.x86 X+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) X+Bundle-Localization: launcher.gtk.freebsd.x86 X Eclipse-BundleShape: dir X--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:56:10.000000000 -0500 X+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-03-30 19:54:29.000000000 -0500 X@@ -18,13 +18,13 @@ X ../../launcher-binary-parent X X org.eclipse.equinox X- org.eclipse.equinox.launcher.gtk.linux.x86 X+ org.eclipse.equinox.launcher.gtk.freebsd.x86 X 1.1.200-SNAPSHOT X eclipse-plugin X X X 1500 X- linux X+ freebsd X gtk X x86 X X--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-03-30 18:56:10.000000000 -0500 X+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-03-30 19:54:51.000000000 -0500 X@@ -8,5 +8,5 @@ X # Contributors: X # IBM Corporation - initial API and implementation X ############################################################################### X-pluginName = Equinox Launcher Linux X86 Fragment X+pluginName = Equinox Launcher FreeBSD X86 Fragment X providerName = Eclipse.org - Equinox X--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:56:10.000000000 -0500 X+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:55:31.000000000 -0500 X@@ -2,9 +2,9 @@ X Bundle-ManifestVersion: 2 X Bundle-Name: %pluginName X Bundle-Vendor: %providerName X-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true X+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true X Bundle-Version: 1.1.200.qualifier X Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)" X-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) X-Bundle-Localization: launcher.gtk.linux.x86_64 X+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) X+Bundle-Localization: launcher.gtk.freebsd.x86_64 X Eclipse-BundleShape: dir X--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-03-30 18:56:10.000000000 -0500 X+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:55:25.000000000 -0500 X@@ -18,13 +18,13 @@ X ../../launcher-binary-parent X X org.eclipse.equinox X- org.eclipse.equinox.launcher.gtk.linux.x86_64 X+ org.eclipse.equinox.launcher.gtk.freebsd.x86_64 X 1.1.200-SNAPSHOT X eclipse-plugin X X X 1500 X- linux X+ freebsd X gtk X x86_64 X X--- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig 2014-03-30 18:56:11.000000000 -0500 X+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak 2014-03-30 22:05:58.000000000 -0500 X@@ -42,15 +42,15 @@ X EXEC = $(PROGRAM_OUTPUT) X DLL = $(PROGRAM_LIBRARY) X #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11 X-LIBS = -lpthread -ldl X+LIBS = -pthread X GTK_LIBS = \ X -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \ X -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \ X -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\"" X LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic X-CFLAGS = ${M_ARCH} -g -s -Wall\ X+CFLAGS = ${M_ARCH} -g -s -Wall -pthread\ X -fpic \ X- -DLINUX \ X+ -DFREEBSD \ X -DMOZILLA_FIX \ X -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ X -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ X@@ -59,7 +59,7 @@ X $(GTK_LIBS) \ X -I. \ X -I.. \ X- -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \ X+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(DEFAULT_OS) \ X `pkg-config --cflags gtk+-2.0` X X all: $(EXEC) $(DLL) X--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-03-30 18:56:10.000000000 -0500 X+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-03-31 07:49:37.000000000 -0500 X@@ -8,5 +8,5 @@ X # Contributors: X # IBM Corporation - initial API and implementation X ############################################################################### X-pluginName = Equinox Launcher Linux X86_64 Fragment X+pluginName = Equinox Launcher FreeBSD X86_64 Fragment X providerName = Eclipse.org - Equinox 75a4eadbbfb21a710c07262d27bf0712 echo x - eclipse/files/patch-aggregator sed 's/^X//' >eclipse/files/patch-aggregator << '5b5aa27c0395a4e100ca9b9cb9a4fd60' Xdiff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml Xindex ce98be7..fa2d1e1 100644 X--- a/eclipse-platform-parent/pom.xml X+++ b/eclipse-platform-parent/pom.xml X@@ -155,6 +155,12 @@ X X X X+ freebsd X+ gtk X+ x86_64 X+ X+ X X X X@@ -308,11 +315,11 @@ X tycho-packaging-plugin X ${tycho.version} X X- X+ X X org.eclipse.tycho.extras X tycho-sourceref-jgit X@@ -322,14 +329,14 @@ X X false X 'v'yyyyMMdd-HHmm X- jgit X+ X X pom.xml X X ${jgit.dirtyWorkingTree} X- X+ X X false X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml Xindex 81a82e1..dc2fdd9 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml X@@ -121,6 +121,12 @@ X p2 X X X+ freebsd X+ gtk X+ %%ECLIPSE_ARCH%% X+ X+ X X X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml Xindex 60e4299..4c9106e 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml X@@ -112,6 +112,7 @@ X X X zip X+ tar.gz X tar.gz X tar.gz X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml Xindex 14b8336..0b97442 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml X@@ -15,6 +15,8 @@ X X X X+ X+ X X X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml Xindex 129d0a6..a8f76b6 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml X@@ -278,6 +278,16 @@ X fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> X X+ X+ X@@ -346,6 +356,16 @@ X fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> X X+ X+ Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties Xindex 80a32e4..fcb7ed5 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties X+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties X@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse X root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 X root.solaris.gtk.x86.permissions.755=eclipse X X+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 X+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse X+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 X+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse X+ X root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 X root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse X root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc X@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse X root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse X X bin.includes = feature.properties X- X- X- X- X- X- X- Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml Xindex 2c342a3..5e27062 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml X@@ -20,6 +20,25 @@ X 2.6 X X X+ copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%% X+ validate X+ X+ copy-resources X+ X+ X+ ${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%% X+ X+ X+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% X+ X+ about_files/* X+ about.html X+ X+ X+ X+ X+ X+ X copy-resources-gtk.linux.x86 X validate X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml Xindex bc261f9..88e8522 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml X@@ -91,6 +91,7 @@ X X X zip X+ tar.gz X tar.gz X tar.gz X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf Xindex c2f679b..742fe0b 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf X+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf X@@ -55,6 +55,23 @@ units.3.touchpoint.version=1.0.0 X units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); X units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); X X+requires.4.namespace=org.eclipse.equinox.p2.iu X+requires.4.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% X+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) X+requires.4.range=[1.0.0,1.0.0] X+requires.4.greedy=true X+ X+units.4.id=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% X+units.4.version=1.0.0 X+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu X+units.4.provides.1.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% X+units.4.provides.1.version=1.0.0 X+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) X+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi X+units.4.touchpoint.version=1.0.0 X+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); X+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); X+ X # Restrict range so we are not an automatic update for 3.x. X update.id = org.eclipse.platform.ide X update.range = [4.0,$version$) Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml Xindex d8468e6..b6c77d5 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml X@@ -92,6 +92,7 @@ X X X zip X+ tar.gz X tar.gz X tar.gz X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties Xindex 80a32e4..fcb7ed5 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties X+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties X@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse X root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 X root.solaris.gtk.x86.permissions.755=eclipse X X+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 X+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse X+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 X+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse X+ X root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86 X root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse X root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc X@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse X root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse X X bin.includes = feature.properties X- X- X- X- X- X- X- Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml Xindex bb03da8..75632a0 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml X@@ -20,6 +20,25 @@ X 2.6 X X X+ copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%% X+ validate X+ X+ copy-resources X+ X+ X+ ${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%% X+ X+ X+ ../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% X+ X+ about_files/* X+ about.html X+ X+ X+ X+ X+ X+ X copy-resources-gtk.linux.x86 X validate X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml Xindex 0ea4fd3..5bd93db 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml X@@ -91,6 +91,7 @@ X X X zip X+ tar.gz X tar.gz X tar.gz X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml Xindex ce76451..3b40705 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml X@@ -91,6 +91,7 @@ X X X zip X+ tar.gz X tar.gz X tar.gz X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml Xindex bf2f66a..5a37141 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml X+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml X@@ -91,6 +91,7 @@ X X X zip X+ tar.gz X tar.gz X tar.gz X Xdiff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf Xindex 6b59ed2..64975ba 100644 X--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf X+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf X@@ -89,6 +89,23 @@ units.5.touchpoint.version=1.0.0 X units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); X units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); X X+requires.6.namespace=org.eclipse.equinox.p2.iu X+requires.6.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% X+requires.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) X+requires.6.range=[1.0.0,1.0.0] X+requires.6.greedy=true X+ X+units.6.id=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% X+units.6.version=1.0.0 X+units.6.provides.1.namespace=org.eclipse.equinox.p2.iu X+units.6.provides.1.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%% X+units.6.provides.1.version=1.0.0 X+units.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk)) X+units.6.touchpoint.id=org.eclipse.equinox.p2.osgi X+units.6.touchpoint.version=1.0.0 X+units.6.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); X+units.6.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); X+ X # Restrict range so we are not an automatic update for 3.x. X update.id= org.eclipse.sdk.ide X update.range = [4.0,$version$) 5b5aa27c0395a4e100ca9b9cb9a4fd60 echo x - eclipse/files/patch-submodules sed 's/^X//' >eclipse/files/patch-submodules << '14811d4f6172722e5392df63e8e3ac6d' Xdiff --git a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml Xindex 5f21fad..7ef6f2e 100644 X--- a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml X+++ b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml X@@ -56,6 +56,8 @@ X X X X+ X+ X X X Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml b/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml Xindex 1c2033f..e80dcd8 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml X+++ b/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml X@@ -70,6 +70,20 @@ X X X X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X X X Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java Xindex 442bd6c..119ce58 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java X+++ b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java X@@ -694,7 +694,7 @@ public final class Utils implements IPDEBuildConstants, IBuildPropertiesConstant X arguments.add("-sf"); //$NON-NLS-1$ X arguments.add(links[i]); X arguments.add(links[i + 1]); X- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ X+ script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ X arguments.clear(); X } X } Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java Xindex 08540fa..582bc74 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java X+++ b/eclipse.pde.build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java X@@ -933,7 +933,7 @@ public class ModelBuildScriptGenerator extends AbstractBuildScriptGenerator { X for (int i = 0; i < links.length; i += 2) { X arguments.add(links[i]); X arguments.add(links[i + 1]); X- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ X+ script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ X arguments.clear(); X } X } Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java b/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java Xindex 5399a48..e395cb5 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java X+++ b/eclipse.pde.build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java X@@ -314,6 +314,8 @@ public class JNLPGenerator extends DefaultHandler { X return "HP-UX"; //$NON-NLS-1$ X if ("aix".equalsIgnoreCase(os)) //$NON-NLS-1$ X return "AIX"; //$NON-NLS-1$ X+ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ X+ return "FreeBSD"; //$NON-NLS-1$ X return os; X } X Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/templates/headless-build/build.properties b/eclipse.pde.build/org.eclipse.pde.build/templates/headless-build/build.properties Xindex 432b6e0..2d69832 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/templates/headless-build/build.properties X+++ b/eclipse.pde.build/org.eclipse.pde.build/templates/headless-build/build.properties X@@ -48,6 +48,8 @@ configs = *, *, * X #configs=win32, win32, x86 & \ X # win32,win32,x86_64 & \ X # win32,win32,wpf & \ X+# freebsd, gtk, x86 & \ X+# freebsd, gtk, x86_64 & \ X # linux, gtk, ppc & \ X # linux, gtk, x86 & \ X # linux, gtk, x86_64 & \ X@@ -72,10 +74,12 @@ configs = *, *, * X #The format of the archive. By default a zip is created using antZip. X #The list can only contain the configuration for which the desired format is different than zip. X #archivesFormat=win32, win32, x86 - antZip& \ X+# freebsd, gtk, x86 - antZip& \ X+# freebsd, gtk, x86_64 - antZip& \ X # linux, gtk, ppc - antZip &\ X-# linux, gtk, x86 - antZip& \ X+# linux, gtk, x86 - antZip& \ X # linux, gtk, x86_64 - antZip& \ X-# linux, motif, x86 - antZip& \ X+# linux, motif, x86 - antZip& \ X # solaris, motif, sparc - antZip& \ X # solaris, gtk, sparc - antZip& \ X # aix, motif, ppc - antZip& \ Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml Xindex eac9576..9081501 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml X+++ b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml X@@ -18,6 +18,18 @@ X X X X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X X X Xdiff --git a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties Xindex be53c51..7e89865 100644 X--- a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties X+++ b/eclipse.pde.build/org.eclipse.pde.build/templates/packager/packaging.properties X@@ -18,6 +18,8 @@ root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse X X root.win32.win32.x86=eclipse.exe, eclipsec.exe X root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm X+root.freebsd.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm X+root.freebsd.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm X root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm X root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm X root.linux.gtk.ppc=eclipse Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java Xindex 436c5b0..dd4b3fc 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java X@@ -336,6 +336,8 @@ public class ProductExportOperation extends FeatureExportOperation { X images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); X } else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$ X images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); X+ } else if (configs[i][0].equals("freebsd")) { //$NON-NLS-1$ X+ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); X } X if (images != null) { X if (icons.length() > 0) Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java Xindex c007fe1..47d93ec 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java X@@ -13,22 +13,25 @@ package org.eclipse.pde.internal.core.iproduct; X public interface IArgumentsInfo extends IProductObject { X X public static final String P_PROG_ARGS = "programArgs"; //$NON-NLS-1$ X+ public static final String P_PROG_ARGS_FRE = "programArgsFre"; //$NON-NLS-1$ X public static final String P_PROG_ARGS_LIN = "programArgsLin"; //$NON-NLS-1$ X public static final String P_PROG_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ X public static final String P_PROG_ARGS_SOL = "programArgsSol"; //$NON-NLS-1$ X public static final String P_PROG_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ X X public static final String P_VM_ARGS = "vmArgs"; //$NON-NLS-1$ X+ public static final String P_VM_ARGS_FRE = "vmArgsFre"; //$NON-NLS-1$ X public static final String P_VM_ARGS_LIN = "vmArgsLin"; //$NON-NLS-1$ X public static final String P_VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ X public static final String P_VM_ARGS_SOL = "vmArgsSol"; //$NON-NLS-1$ X public static final String P_VM_ARGS_WIN = "vmArgsWin"; //$NON-NLS-1$ X X public static final int L_ARGS_ALL = 0; X- public static final int L_ARGS_LINUX = 1; X- public static final int L_ARGS_MACOS = 2; X- public static final int L_ARGS_SOLAR = 3; X- public static final int L_ARGS_WIN32 = 4; X+ public static final int L_ARGS_FRBSD = 1; X+ public static final int L_ARGS_LINUX = 2; X+ public static final int L_ARGS_MACOS = 3; X+ public static final int L_ARGS_SOLAR = 4; X+ public static final int L_ARGS_WIN32 = 5; X X void setProgramArguments(String args, int platform); X Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java Xindex e88ee99..40628dc 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java X@@ -12,6 +12,8 @@ package org.eclipse.pde.internal.core.iproduct; X X public interface ILauncherInfo extends IProductObject { X X+ public static final String FREEBSD_ICON = "freebsdIcon"; //$NON-NLS-1$ X+ X public static final String LINUX_ICON = "linuxIcon"; //$NON-NLS-1$ X X public static final String MACOSX_ICON = "macosxIcon"; //$NON-NLS-1$ Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java Xindex 66dedcb..0f82bad 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java X@@ -20,12 +20,14 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X X private static final long serialVersionUID = 1L; X private String fProgramArgs = ""; //$NON-NLS-1$ X+ private String fProgramArgsFre = ""; //$NON-NLS-1$ X private String fProgramArgsLin = ""; //$NON-NLS-1$ X private String fProgramArgsMac = ""; //$NON-NLS-1$ X private String fProgramArgsSol = ""; //$NON-NLS-1$ X private String fProgramArgsWin = ""; //$NON-NLS-1$ X X private String fVMArgs = ""; //$NON-NLS-1$ X+ private String fVMArgsFre = ""; //$NON-NLS-1$ X private String fVMArgsLin = ""; //$NON-NLS-1$ X private String fVMArgsMac = ""; //$NON-NLS-1$ X private String fVMArgsSol = ""; //$NON-NLS-1$ X@@ -46,6 +48,12 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X if (isEditable()) X firePropertyChanged(P_PROG_ARGS, old, fProgramArgs); X break; X+ case L_ARGS_FRBSD : X+ old = fProgramArgsFre; X+ fProgramArgsFre = args; X+ if (isEditable()) X+ firePropertyChanged(P_PROG_ARGS_FRE, old, fProgramArgsFre); X+ break; X case L_ARGS_LINUX : X old = fProgramArgsLin; X fProgramArgsLin = args; X@@ -77,6 +85,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X switch (platform) { X case L_ARGS_ALL : X return fProgramArgs; X+ case L_ARGS_FRBSD : X+ return fProgramArgsFre; X case L_ARGS_LINUX : X return fProgramArgsLin; X case L_ARGS_MACOS : X@@ -98,6 +108,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X return getCompleteArgs(getProgramArguments(L_ARGS_MACOS), fProgramArgs); X } else if (Platform.OS_SOLARIS.equals(os)) { X return getCompleteArgs(getProgramArguments(L_ARGS_SOLAR), fProgramArgs); X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ return getCompleteArgs(getProgramArguments(L_ARGS_FRBSD), fProgramArgs); X } else { X return getProgramArguments(L_ARGS_ALL); X } X@@ -114,6 +126,12 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X if (isEditable()) X firePropertyChanged(P_VM_ARGS, old, fVMArgs); X break; X+ case L_ARGS_FRBSD : X+ old = fVMArgsFre; X+ fVMArgsFre = args; X+ if (isEditable()) X+ firePropertyChanged(P_VM_ARGS_FRE, old, fVMArgsFre); X+ break; X case L_ARGS_LINUX : X old = fVMArgsLin; X fVMArgsLin = args; X@@ -145,6 +163,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X switch (platform) { X case L_ARGS_ALL : X return fVMArgs; X+ case L_ARGS_FRBSD : X+ return fVMArgsFre; X case L_ARGS_LINUX : X return fVMArgsLin; X case L_ARGS_MACOS : X@@ -166,6 +186,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X return getCompleteArgs(getVMArguments(L_ARGS_MACOS), fVMArgs); X } else if (Platform.OS_SOLARIS.equals(os)) { X return getCompleteArgs(getVMArguments(L_ARGS_SOLAR), fVMArgs); X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ return getCompleteArgs(getVMArguments(L_ARGS_FRBSD), fVMArgs); X } else { X return getVMArguments(L_ARGS_ALL); X } X@@ -193,6 +215,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X fProgramArgsSol = getText(child); X } else if (child.getNodeName().equals(P_PROG_ARGS_WIN)) { X fProgramArgsWin = getText(child); X+ } else if (child.getNodeName().equals(P_PROG_ARGS_FRE)) { X+ fProgramArgsFre = getText(child); X } else if (child.getNodeName().equals(P_VM_ARGS)) { X fVMArgs = getText(child); X } else if (child.getNodeName().equals(P_VM_ARGS_LIN)) { X@@ -203,6 +227,8 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X fVMArgsSol = getText(child); X } else if (child.getNodeName().equals(P_VM_ARGS_WIN)) { X fVMArgsWin = getText(child); X+ } else if (child.getNodeName().equals(P_VM_ARGS_FRE)) { X+ fVMArgsFre = getText(child); X } X } X } X@@ -234,6 +260,9 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X if (fProgramArgsWin.length() > 0) { X writer.println(indent + " " + "<" + P_PROG_ARGS_WIN + ">" + getWritableString(fProgramArgsWin) + ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ X } X+ if (fProgramArgsFre.length() > 0) { X+ writer.println(indent + " " + "<" + P_PROG_ARGS_FRE + ">" + getWritableString(fProgramArgsFre) + ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ X+ } X if (fVMArgs.length() > 0) { X writer.println(indent + " " + "<" + P_VM_ARGS + ">" + getWritableString(fVMArgs) + ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ X } X@@ -249,6 +278,9 @@ public class ArgumentsInfo extends ProductObject implements IArgumentsInfo { X if (fVMArgsWin.length() > 0) { X writer.println(indent + " " + "<" + P_VM_ARGS_WIN + ">" + getWritableString(fVMArgsWin) + ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ X } X+ if (fVMArgsFre.length() > 0) { X+ writer.println(indent + " " + "<" + P_VM_ARGS_FRE + ">" + getWritableString(fVMArgsFre) + ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ X+ } X writer.println(indent + ""); //$NON-NLS-1$ X } X Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java Xindex c3c286b..ab12da0 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java X@@ -24,11 +24,13 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X private String fUse; X private String fPath; X X+ private static final String FRE = Constants.OS_FREEBSD; X private static final String LIN = Constants.OS_LINUX; X private static final String MAC = Constants.OS_MACOSX; X private static final String SOL = Constants.OS_SOLARIS; X private static final String WIN = Constants.OS_WIN32; X X+ private String fFrePath, fFreUse; X private String fLinPath, fLinUse; X private String fMacPath, fMacUse; X private String fSolPath, fSolUse; X@@ -79,6 +81,9 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X } else if (child.getNodeName().equals(WIN)) { X fWinPath = getText(child); X fWinUse = fWinPath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ X+ } else if (child.getNodeName().equals(FRE)) { X+ fFrePath = getText(child); X+ fFreUse = fFrePath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ X } X } X } X@@ -101,6 +106,10 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X fWinPath = fWinPath == null ? fPath : null; X fWinUse = "custom"; //$NON-NLS-1$ X } X+ if (fFreUse == null) { X+ fFrePath = fFrePath == null ? fPath : null; X+ fFreUse = "custom"; //$NON-NLS-1$ X+ } X // null out things X fPath = null; X fUse = "default"; //$NON-NLS-1$ X@@ -159,6 +168,12 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X writer.print(getWritableString(fWinPath.trim())); X writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ X } X+ if (fFrePath != null) { X+ writer.print(indent); X+ writer.print(" <" + FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ X+ writer.print(getWritableString(fFrePath.trim())); X+ writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ X+ } X X writer.print(indent + ""); //$NON-NLS-1$ X writer.println(); X@@ -192,6 +207,11 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X fSolUse = use; X if (isEditable()) X firePropertyChanged(SOL, old, fSolUse); X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ String old = fFreUse; X+ fFreUse = use; X+ if (isEditable()) X+ firePropertyChanged(FRE, old, fFreUse); X } X } X X@@ -207,6 +227,8 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X return fMacUse; X } else if (Platform.OS_SOLARIS.equals(os)) { X return fSolUse; X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ return fFreUse; X } X return null; X } X@@ -239,6 +261,11 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X fSolPath = path; X if (isEditable()) X firePropertyChanged(SOL, old, fSolPath); X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ String old = fFrePath; X+ fFrePath = path; X+ if (isEditable()) X+ firePropertyChanged(FRE, old, fFrePath); X } X } X X@@ -254,6 +281,8 @@ public class ConfigurationFileInfo extends ProductObject implements IConfigurati X return fMacPath; X } else if (Platform.OS_SOLARIS.equals(os)) { X return fSolPath; X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ return fFrePath; X } X return null; X } Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java Xindex e0d0333..d8b9100 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java X@@ -22,17 +22,20 @@ import org.w3c.dom.NodeList; X X public class JREInfo extends ProductObject implements IJREInfo { X X+ private static final String JRE_FRE = "freebsd"; //$NON-NLS-1$ X private static final String JRE_LIN = "linux"; //$NON-NLS-1$ X private static final String JRE_MAC = "macos"; //$NON-NLS-1$ X private static final String JRE_SOL = "solaris"; //$NON-NLS-1$ X private static final String JRE_WIN = "windows"; //$NON-NLS-1$ X X private static final long serialVersionUID = 1L; X+ private IPath fJVMFre; X private IPath fJVMLin; X private IPath fJVMMac; X private IPath fJVMSol; X private IPath fJVMWin; X X+ private boolean bIncludeFre; X private boolean bIncludeLin; X private boolean bIncludeMac; X private boolean bIncludeSol; X@@ -54,6 +57,8 @@ public class JREInfo extends ProductObject implements IJREInfo { X return fJVMMac; X } else if (Platform.OS_SOLARIS.equals(os)) { X return fJVMSol; X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ return fJVMFre; X } X return null; X } X@@ -82,6 +87,11 @@ public class JREInfo extends ProductObject implements IJREInfo { X fJVMSol = jreContainerPath; X if (isEditable()) X firePropertyChanged(JRE_SOL, old, fJVMSol); X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ IPath old = fJVMFre; X+ fJVMFre = jreContainerPath; X+ if (isEditable()) X+ firePropertyChanged(JRE_FRE, old, fJVMFre); X } X } X X@@ -118,6 +128,9 @@ public class JREInfo extends ProductObject implements IJREInfo { X } else if (child.getNodeName().equals(JRE_SOL)) { X fJVMSol = getPath(child); X bIncludeSol = include; X+ } else if (child.getNodeName().equals(JRE_FRE)) { X+ fJVMFre = getPath(child); X+ bIncludeFre = include; X } else if (child.getNodeName().equals(JRE_WIN)) { X fJVMWin = getPath(child); X bIncludeWin = include; X@@ -166,6 +179,12 @@ public class JREInfo extends ProductObject implements IJREInfo { X writer.print(fJVMSol.toPortableString()); X writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ X } X+ if (fJVMFre != null) { X+ writer.print(indent); X+ writer.print(" <" + JRE_FRE + " include=\"" + String.valueOf(bIncludeFre) + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ X+ writer.print(fJVMFre.toPortableString()); X+ writer.println(""); //$NON-NLS-1$ //$NON-NLS-2$ X+ } X if (fJVMWin != null) { X writer.print(indent); X writer.print(" <" + JRE_WIN + " include=\"" + String.valueOf(bIncludeWin) + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ X@@ -184,6 +203,8 @@ public class JREInfo extends ProductObject implements IJREInfo { X return bIncludeMac; X } else if (Platform.OS_SOLARIS.equals(os)) { X return bIncludeSol; X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ return bIncludeFre; X } X return false; X } X@@ -209,6 +230,11 @@ public class JREInfo extends ProductObject implements IJREInfo { X bIncludeSol = includeJRE; X if (isEditable()) X firePropertyChanged(JRE_SOL, old, Boolean.valueOf(bIncludeSol)); X+ } else if (Platform.OS_FREEBSD.equals(os)) { X+ Boolean old = Boolean.valueOf(bIncludeFre); X+ bIncludeFre = includeJRE; X+ if (isEditable()) X+ firePropertyChanged(JRE_FRE, old, Boolean.valueOf(bIncludeFre)); X } X } X Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java Xindex 9387921..5e461cc 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java X@@ -71,7 +71,9 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo { X Node child = children.item(i); X if (child.getNodeType() == Node.ELEMENT_NODE) { X String name = child.getNodeName(); X- if (name.equals("linux")) { //$NON-NLS-1$ X+ if (name.equals("freebsd")) { //$NON-NLS-1$ X+ parseFreeBSD((Element) child); X+ } else if (name.equals("linux")) { //$NON-NLS-1$ X parseLinux((Element) child); X } else if (name.equals("macosx")) { //$NON-NLS-1$ X parseMac((Element) child); X@@ -122,12 +124,17 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo { X fIcons.put(LINUX_ICON, element.getAttribute("icon")); //$NON-NLS-1$ X } X X+ private void parseFreeBSD(Element element) { X+ fIcons.put(FREEBSD_ICON, element.getAttribute("icon")); //$NON-NLS-1$ X+ } X+ X public void write(String indent, PrintWriter writer) { X writer.print(indent + " 0) X writer.print(" name=\"" + fLauncherName + "\""); //$NON-NLS-1$ //$NON-NLS-2$ X writer.println(">"); //$NON-NLS-1$ X X+ writeFreeBSD(indent + " ", writer); //$NON-NLS-1$ X writeLinux(indent + " ", writer); //$NON-NLS-1$ X writeMac(indent + " ", writer); //$NON-NLS-1$ X writeSolaris(indent + " ", writer); //$NON-NLS-1$ X@@ -182,4 +189,10 @@ public class LauncherInfo extends ProductObject implements ILauncherInfo { X writer.println(indent + ""); //$NON-NLS-1$ //$NON-NLS-2$ X } X X+ private void writeFreeBSD(String indent, PrintWriter writer) { X+ String icon = fIcons.get(FREEBSD_ICON); X+ if (icon != null && icon.length() > 0) X+ writer.println(indent + ""); //$NON-NLS-1$ //$NON-NLS-2$ X+ } X+ X } Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java Xindex 8ee34a0..d6aaf40 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java X@@ -160,7 +160,7 @@ public class IntroTemplate extends PDETemplateSection { X presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$ X IPluginElement implementationElement = factory.createElement(presentationElement); X implementationElement.setName("implementation"); //$NON-NLS-1$ X- implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ X+ implementationElement.setAttribute("os", "win32,linux,macosx,freebsd"); //$NON-NLS-1$ //$NON-NLS-2$ X if (getTargetVersion() == 3.0) X implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$ X Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java Xindex 32e395e..994e51d 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java X@@ -1004,6 +1004,7 @@ public class PDEUIMessages extends NLS { X public static String LauncherSection_48High; X public static String LauncherSection_256High; X public static String LauncherSection_linuxLabel; X+ public static String LauncherSection_freebsdLabel; X public static String LauncherSection_large; X public static String LauncherSection_medium; X public static String LauncherSection_small; Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java Xindex 06ee395..ee92f5c 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java X@@ -34,6 +34,7 @@ public class ArgumentsSection extends PDESection { X private static final String[] TAB_LABELS = new String[5]; X static { X TAB_LABELS[IArgumentsInfo.L_ARGS_ALL] = PDEUIMessages.ArgumentsSection_allPlatforms; X+ TAB_LABELS[IArgumentsInfo.L_ARGS_FRBSD] = "freebsd"; //$NON-NLS-1$ X TAB_LABELS[IArgumentsInfo.L_ARGS_LINUX] = "linux"; //$NON-NLS-1$ X TAB_LABELS[IArgumentsInfo.L_ARGS_MACOS] = "macosx"; //$NON-NLS-1$ X TAB_LABELS[IArgumentsInfo.L_ARGS_SOLAR] = "solaris"; //$NON-NLS-1$ Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java Xindex e6bde32..6334e65 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java X@@ -50,8 +50,8 @@ public class ConfigurationSection extends PDESection { X private FormEntry fCustomEntry; X private boolean fBlockChanges; X X- private static final String[] TAB_LABELS = {"linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ X- private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; X+ private static final String[] TAB_LABELS = {"freebsd", "linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ X+ private static final String[] TAB_OS = {Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; X X private CTabFolder fTabFolder; X private int fLastTab; Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java Xindex e51b309..d44ec23 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java X@@ -63,8 +63,8 @@ public class JRESection extends PDESection { X private ComboViewerPart fEEsCombo; X private boolean fBlockChanges; X X- private static final String[] TAB_LABELS = {"linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ X- private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; X+ private static final String[] TAB_LABELS = {"freebsd", "linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ X+ private static final String[] TAB_OS = {Platform.OS_FREEBSD, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; X X private CTabFolder fTabFolder; X private int fLastTab; Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java Xindex 7be4406..92d3bcd 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java X@@ -60,6 +60,7 @@ public class LauncherSection extends PDESection { X private CTabFolder fTabFolder; X private Composite fNotebook; X private StackLayout fNotebookLayout; X+ private Composite fFreeBSDSection; X private Composite fLinuxSection; X private Composite fMacSection; X private Composite fSolarisSection; X@@ -156,6 +157,7 @@ public class LauncherSection extends PDESection { X fNotebookLayout = new StackLayout(); X fNotebook.setLayout(fNotebookLayout); X X+ fFreeBSDSection = addFreeBSDSection(fNotebook, toolkit); X fLinuxSection = addLinuxSection(fNotebook, toolkit); X fMacSection = addMacSection(fNotebook, toolkit); X fSolarisSection = addSolarisSection(fNotebook, toolkit); X@@ -181,6 +183,7 @@ public class LauncherSection extends PDESection { X } X X private void createTabs() { X+ addTab("freebsd"); //$NON-NLS-1$ X addTab("linux"); //$NON-NLS-1$ X addTab("macosx"); //$NON-NLS-1$ X addTab("solaris"); //$NON-NLS-1$ X@@ -188,16 +191,19 @@ public class LauncherSection extends PDESection { X X String currentTarget = TargetPlatform.getOS(); X if ("win32".equals(currentTarget)) { //$NON-NLS-1$ X- fTabFolder.setSelection(3); X+ fTabFolder.setSelection(4); X fNotebookLayout.topControl = fWin32Section; X } else if ("macosx".equals(currentTarget)) { //$NON-NLS-1$ X- fTabFolder.setSelection(1); X+ fTabFolder.setSelection(2); X fNotebookLayout.topControl = fMacSection; X } else if ("solaris".equals(currentTarget)) { //$NON-NLS-1$ X- fTabFolder.setSelection(2); X+ fTabFolder.setSelection(3); X fNotebookLayout.topControl = fSolarisSection; X- } else { X+ } else if ("freebsd".equals(currentTarget)) { //$NON-NLS-1$ X fTabFolder.setSelection(0); X+ fNotebookLayout.topControl = fFreeBSDSection; X+ } else { X+ fTabFolder.setSelection(1); X fNotebookLayout.topControl = fLinuxSection; X } X } X@@ -290,6 +296,14 @@ public class LauncherSection extends PDESection { X } X } X X+ private Composite addFreeBSDSection(Composite parent, FormToolkit toolkit) { X+ Composite comp = createComposite(parent, toolkit); X+ createLabel(comp, toolkit, PDEUIMessages.LauncherSection_freebsdLabel, 3); X+ fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_icon, ILauncherInfo.FREEBSD_ICON)); X+ toolkit.paintBordersFor(comp); X+ return comp; X+ } X+ X private Composite addLinuxSection(Composite parent, FormToolkit toolkit) { X Composite comp = createComposite(parent, toolkit); X createLabel(comp, toolkit, PDEUIMessages.LauncherSection_linuxLabel, 3); X@@ -446,7 +460,7 @@ public class LauncherSection extends PDESection { X } X X private String getExtension(String iconId) { X- if (iconId.equals(ILauncherInfo.LINUX_ICON)) X+ if (iconId.equals(ILauncherInfo.LINUX_ICON) || iconId.equals(ILauncherInfo.FREEBSD_ICON)) X return "xpm"; //$NON-NLS-1$ X if (iconId.equals(ILauncherInfo.MACOSX_ICON)) X return "icns"; //$NON-NLS-1$ X@@ -473,15 +487,18 @@ public class LauncherSection extends PDESection { X Control oldPage = fNotebookLayout.topControl; X switch (index) { X case 0 : X- fNotebookLayout.topControl = fLinuxSection; X+ fNotebookLayout.topControl = fFreeBSDSection; X break; X case 1 : X- fNotebookLayout.topControl = fMacSection; X+ fNotebookLayout.topControl = fLinuxSection; X break; X case 2 : X- fNotebookLayout.topControl = fSolarisSection; X+ fNotebookLayout.topControl = fMacSection; X break; X case 3 : X+ fNotebookLayout.topControl = fSolarisSection; X+ break; X+ case 4 : X fNotebookLayout.topControl = fWin32Section; X break; X } Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties Xindex fecf4aa..de25e4f 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties X@@ -596,6 +596,7 @@ LauncherSection_48Low=48x48 (8-bit): X LauncherSection_48High=48x48 (32-bit): X LauncherSection_256High=256x256 (32-bit): X LauncherSection_linuxLabel=A single XPM icon is required: X+LauncherSection_freebsdLabel=A single XPM icon is required: X LauncherSection_large=Large: X LauncherSection_medium=Medium: X LauncherSection_small=Small: Xdiff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java Xindex 3c8c426..fa46f72 100644 X--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java X+++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java X@@ -128,7 +128,7 @@ public class ProductIntroOperation extends BaseManifestOperation implements IVar X implementation.setName("implementation"); //$NON-NLS-1$ X implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$ X implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$ X- implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ X+ implementation.setAttribute("os", "win32,linux,macosx,freebsd"); //$NON-NLS-1$ //$NON-NLS-2$ X X presentation.add(implementation); X Xdiff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml Xindex 4be88a5..27e2cd3 100644 X--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml X+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml X@@ -59,6 +59,7 @@ X X X X+ X X X X@@ -73,9 +75,13 @@ X X X X+ X+ X X X X+ X+ X X X Xdiff --git a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml Xindex c949520..11ee54a 100644 X--- a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml X+++ b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml X@@ -36,6 +36,7 @@ X X X X+ X X X Xdiff --git a/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java b/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java Xindex a335001..003e20a 100644 X--- a/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java X+++ b/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java X@@ -98,7 +98,7 @@ public class LocalFileSystem extends FileSystem { X String arch = System.getProperty("osgi.arch", ""); //$NON-NLS-1$ //$NON-NLS-2$ X if (os.equals(Constants.OS_WIN32)) X attributes |= EFS.ATTRIBUTE_ARCHIVE | EFS.ATTRIBUTE_HIDDEN; X- else if (os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) X+ else if (os.equals(Constants.OS_FREEBSD) || os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) X attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET; X else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX)) X attributes |= EFS.ATTRIBUTE_EXECUTABLE; Xdiff --git a/eclipse.platform.resources/pom.xml b/eclipse.platform.resources/pom.xml Xindex 4b33285..6b6fcc7 100644 X--- a/eclipse.platform.resources/pom.xml X+++ b/eclipse.platform.resources/pom.xml X@@ -43,6 +43,7 @@ X X X bundles/org.eclipse.core.filesystem X+ bundles/org.eclipse.core.filesystem.freebsd.%%ECLIPSE_ARCH%% X bundles/org.eclipse.core.filesystem.hpux.ia64 X bundles/org.eclipse.core.filesystem.hpux.PA_RISC X bundles/org.eclipse.core.filesystem.linux.ppc Xdiff --git a/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java b/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java Xindex 7c8ad8c..b15bbf6 100644 X--- a/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java X+++ b/eclipse.platform.resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java X@@ -49,8 +49,8 @@ public class SymlinkTest extends FileSystemTest { X public static boolean isTestablePlatform() { X // A Platform is testable if it supports the "ln -s" command. X String os = Platform.getOS(); X- //currently we only support linux, solaris and mac os X- if (os.equals(Platform.OS_LINUX) || os.equals(Platform.OS_SOLARIS) || os.equals(Platform.OS_MACOSX) || os.equals(Platform.OS_AIX) X+ //currently we only support freebsd, linux, solaris and mac os X+ if (os.equals(Platform.OS_FREEBSD) || os.equals(Platform.OS_LINUX) || os.equals(Platform.OS_SOLARIS) || os.equals(Platform.OS_MACOSX) || os.equals(Platform.OS_AIX) X // ||os.equals(Platform.OS_HPUX) X // || isWindowsVistaOrHigher() X ) { X@@ -339,7 +339,7 @@ public class SymlinkTest extends FileSystemTest { X public void testSymlinkEnabled() { X String os = Platform.getOS(); X String arch = Platform.getOSArch(); X- if (Platform.OS_LINUX.equals(os) || (Platform.OS_SOLARIS.equals(os) && Platform.ARCH_SPARC.equals(arch)) || Platform.OS_MACOSX.equals(os) || Platform.OS_AIX.equals(os) || isWindowsVistaOrHigher()) { X+ if (Platform.OS_FREEBSD.equals(os) || Platform.OS_LINUX.equals(os) || (Platform.OS_SOLARIS.equals(os) && Platform.ARCH_SPARC.equals(arch)) || Platform.OS_MACOSX.equals(os) || Platform.OS_AIX.equals(os) || isWindowsVistaOrHigher()) { X assertTrue(haveSymlinks()); X } else { X assertFalse(haveSymlinks()); Xdiff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java Xindex 652119f..30482b0 100644 X--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java X+++ b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java X@@ -94,6 +94,16 @@ public final class BootLoader { X public static final String OS_HPUX = "hpux";//$NON-NLS-1$ X X /** X+ * Constant string (value "freebsd") indicating the platform is running on an X+ * FreeBSD-based operating system. X+ * Note: This constant is not officially supported by the eclipse project X+ * and is only available on eclipse versions built from the FreeBSD ports X+ * tree. X+ * @deprecated Replaced by {@link Platform#OS_FREEBSD. X+ */ X+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ X+ X+ /** X * Constant string (value "qnx") indicating the platform is running on a X * QNX-based operating system. X * @deprecated Replaced by {@link Platform#OS_QNX}. Xdiff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java Xindex 8ace8e8..21ba40f 100644 X--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java X+++ b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java X@@ -62,7 +62,7 @@ public final class InternalPlatform { X //XXX This is not synchronized X private static Map logs = new HashMap(5); X X- private static final String[] OS_LIST = {Platform.OS_AIX, Platform.OS_HPUX, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_QNX, Platform.OS_SOLARIS, Platform.OS_WIN32}; X+ private static final String[] OS_LIST = {Platform.OS_AIX, Platform.OS_FREEBSD, Platform.OS_HPUX, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_QNX, Platform.OS_SOLARIS, Platform.OS_WIN32}; X private static String password = ""; //$NON-NLS-1$ X private static final String PASSWORD = "-password"; //$NON-NLS-1$ X Xdiff --git a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java Xindex 18b64e4..344be72 100644 X--- a/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java X+++ b/eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java X@@ -261,6 +261,17 @@ public final class Platform { X public static final String OS_MACOSX = "macosx";//$NON-NLS-1$ X X /** X+ * Constant string (value "freebsd") indicating the platform is running on a X+ * FreeBSD operating system. X+ *

X+ * Note this constant is not officially supported by the eclipse project X+ * and is only available on eclipse versions built from the FreeBSD ports X+ * tree. X+ *

X+ */ X+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ X+ X+ /** X * Constant string (value "unknown") indicating the platform is running on a X * machine running an unknown operating system. X *

Xdiff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp Xindex 7c713c7..f166708 100644 X--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp X+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp X@@ -180,7 +180,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1NS_1NewLocalFile) X jint rc = 0; X XPCOM_NATIVE_ENTER(env, that, _1NS_1NewLocalFile_FUNC); X if (arg2) if ((lparg2 = env->GetIntLongArrayElements(arg2, NULL)) == NULL) goto fail; X- rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsILocalFile**)lparg2); X+ rc = (jint)NS_NewLocalFile(*(nsAString *)arg0, arg1, (nsIFile**)lparg2); X fail: X if (arg2 && lparg2) env->ReleaseIntLongArrayElements(arg2, lparg2, 0); X XPCOM_NATIVE_EXIT(env, that, _1NS_1NewLocalFile_FUNC); Xdiff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h Xindex afc18ec..3b6da84 100644 X--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h X+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.h X@@ -32,6 +32,8 @@ X X #define XPCOM_LOAD_FUNCTION LOAD_FUNCTION X X+#define nsStaticModuleInfo void X+ X #ifdef _WIN32 X #if !(defined(__i386__) || defined(_M_IX86) || defined(_X86_)) X #define nsStaticModuleInfo void /* define on 64-bit win32 due to use of XULRunner 10 SDK */ Xdiff --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 Xindex 689616e..86afdfe 100644 X--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh X+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh X@@ -12,12 +12,12 @@ X # Tom Tromey (Red Hat, Inc.) X #******************************************************************************* X X+COMPONENTS_DIR=`pwd`/../../components X cd `dirname $0` X X MAKE_TYPE=make X X # Check if we have to compile external.xpt from external.idl X-COMPONENTS_DIR=`pwd`/../../components X if test ! -f ${COMPONENTS_DIR}/external.xpt; then X if test ! -f ${COMPONENTS_DIR}/external.idl; then X echo "Can't find ${COMPONENTS_DIR}/external.idl" X@@ -64,6 +64,8 @@ case $OS in X "FreeBSD") X SWT_OS=freebsd X MAKEFILE=make_freebsd.mak X+ MAKE_TYPE=gmake X+ MODEL=`uname -m` X ;; X *) X SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` X@@ -407,6 +409,34 @@ case $SWT_OS.$SWT_ARCH in X export PKG_CONFIG_PATH="/opt/gtk_64bit/lib/hpux64/pkgconfig" X fi X ;; X+ "freebsd.x86"|"freebsd.x86_64") X+# PATH="/export/home/SUNWspro/bin:/usr/ccs/bin:/usr/bin:$PATH" X+ if [ "${CC}" = "" ]; then X+ CC="cc" X+ fi X+ if [ "${CXX}" = "" ]; then X+ CXX="c++" X+ fi X+ if [ "${CDE_HOME}" = "" ]; then X+ CDE_HOME="/usr/dt" X+ fi X+ if [ "${JAVA_HOME}" = "" ]; then X+ JAVA_HOME="/usr/local/openjdk7" X+ fi X+ if [ "${PKG_CONFIG_PATH}" = "" ]; then X+ PKG_CONFIG_PATH="/usr/local/libdata/pkgconfig/" X+ fi X+# if [ "${MOZILLA_SDK}" = "" ]; then X+# MOZILLA_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk" X+# fi X+# if [ "${MOZILLA_INCLUDES}" = "" ]; then X+# MOZILLA_INCLUDES="-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include" X+# fi X+# if [ "${MOZILLA_LIBS}" = "" ]; then X+# MOZILLA_LIBS="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4" X+# fi X+ export PATH CC CXX CDE_HOME JAVA_HOME PKG_CONFIG_PATH MOZILLA_SDK MOZILLA_INCLUDES MOZILLA_LIBS; X+ ;; X esac X X X@@ -478,24 +508,35 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ] X export MOZILLA_INCLUDES X export MOZILLA_LIBS X MAKE_MOZILLA=make_mozilla X+ echo "Mozilla/XPCOM found, compiling Mozilla embedded browser support" X elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then X MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` X MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` X export MOZILLA_INCLUDES X export MOZILLA_LIBS X MAKE_MOZILLA=make_mozilla X- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then X- XULRUNNER_INCLUDES=`pkg-config --cflags libxul` X- XULRUNNER_LIBS=`pkg-config --libs libxul` X+ echo "Firefox/XPCOM found, compiling Mozilla embedded browser support" X+ elif [ x`pkg-config --exists libxul libxul-embedding && echo YES` = "xNO" ]; then # don't bother, it doesn't work X+ XULRUNNER_INCLUDES="-include /usr/local/include/libxul/mozilla-config.h `pkg-config --cflags libxul libxul-embedding`" X+ XULRUNNER_LIBS=`pkg-config --libs libxul-embedding` X export XULRUNNER_INCLUDES X export XULRUNNER_LIBS X MAKE_MOZILLA=make_xulrunner X+ echo "XULRunner/XPCOM found, compiling Mozilla embedded browser support" X else X echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" X echo " *** Mozilla embedding support will not be compiled." X fi X fi X X+if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then X+ echo "WebKit found, compiling webkit embedded browser support." X+ MAKE_WEBKIT=make_webkit X+else X+ echo "WebKit not found:" X+ echo " *** WebKit embedding support will not be compiled." X+fi X+ X # Find AWT if available X if [ -z "${AWT_LIB_PATH}" ]; then X if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then X@@ -524,5 +565,5 @@ fi X if [ "x${1}" = "xclean" ]; then X ${MAKE_TYPE} -f $MAKEFILE clean X else X- ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} X+ ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} X fi Xdiff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Xindex 0bf9416..e955aa9 100644 X--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak X+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak X@@ -9,7 +9,7 @@ X # IBM Corporation - initial API and implementation X #******************************************************************************* X X-# Makefile for creating SWT libraries for Linux GTK X+# Makefile for creating SWT libraries for FreeBSD GTK X X include make_common.mak X X@@ -27,6 +27,7 @@ GNOME_PREFIX = swt-gnome X MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION) X XULRUNNER_PREFIX = swt-xulrunner X XPCOMINIT_PREFIX = swt-xpcominit X+WEBKIT_PREFIX = swt-webkit X GLX_PREFIX = swt-glx X X SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X@@ -39,6 +40,7 @@ GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X+WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so X X CAIROCFLAGS = `pkg-config --cflags cairo` X@@ -46,7 +48,7 @@ CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo X X # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) X GTKCFLAGS = `pkg-config --cflags gtk+-2.0` X-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst X+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/local/lib $(XLIB64) -lXtst X X CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc X X@@ -59,7 +61,8 @@ ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 X GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` X GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 X X-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm X+GLXCFLAGS = -I/usr/local/include X+GLXLIBS = -L/usr/local/lib -lGL -lGLU -lm X X # Uncomment for Native Stats tool X #NATIVE_STATS = -DNATIVE_STATS X@@ -76,9 +79,22 @@ MOZILLACFLAGS = -O \ X -I. \ X -I$(JAVA_HOME)/include \ X -I$(JAVA_HOME)/include/freebsd \ X+ -std=c++11 \ X ${SWT_PTR_CFLAGS} X MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic X+XULRUNNER_EXCLUDES =-DNO__1XPCOMGlueShutdown X+ X+WEBKITCFLAGS = `pkg-config --cflags glib-2.0` X+ X+SWT_OBJECTS = swt.o c.o c_stats.o callback.o X+CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o X+AWT_OBJECTS = swt_awt.o X+SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o X+CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o X+ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o X X+WEBKITCFLAGS = `pkg-config --cflags glib-2.0` X+ X SWT_OBJECTS = swt.o c.o c_stats.o callback.o X CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o X AWT_OBJECTS = swt_awt.o X@@ -87,8 +103,9 @@ CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o X ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o X GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o X MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o X-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o X+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o X XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o X+WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o X GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o X X CFLAGS = -O -Wall \ X@@ -101,13 +118,16 @@ CFLAGS = -O -Wall \ X ${SWT_PTR_CFLAGS} X LFLAGS = -shared -fPIC X X+CFLAGS := $(CFLAGS) -I/usr/local/include X+LDFLAGS := $(LDFLAGS) -L/usr/local/lib X+ X ifndef NO_STRIP X AWT_LFLAGS := $(AWT_LFLAGS) -s X MOZILLALFLAGS := $(MOZILLALFLAGS) -s X LFLAGS := $(LFLAGS) -s X endif X X-all: make_swt make_atk make_gnome make_glx X+all: make_swt make_atk make_glx X X # X # SWT libs X@@ -164,7 +184,7 @@ $(CDE_LIB): $(CDE_OBJECTS) X make_awt:$(AWT_LIB) X X $(AWT_LIB): $(AWT_OBJECTS) X- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) X+ $(CC) $(CFLAGS) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) X X # X # Atk lib X@@ -203,22 +223,22 @@ gnome_stats.o: gnome_stats.c gnome_stats.h X # X # Mozilla lib X # X-make_mozilla:$(MOZILLA_LIB) X+##make_mozilla:$(MOZILLA_LIB) X X-$(MOZILLA_LIB): $(MOZILLA_OBJECTS) X- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} X+##$(MOZILLA_LIB): $(MOZILLA_OBJECTS) X+## $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} X X-xpcom.o: xpcom.cpp X- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp X+##xpcom.o: xpcom.cpp X+## $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp X X-xpcom_structs.o: xpcom_structs.cpp X- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp X+##xpcom_structs.o: xpcom_structs.cpp X+## $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp X X-xpcom_custom.o: xpcom_custom.cpp X- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp X+##xpcom_custom.o: xpcom_custom.cpp X+## $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp X X-xpcom_stats.o: xpcom_stats.cpp X- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp X+##xpcom_stats.o: xpcom_stats.cpp X+## $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp X X # X # XULRunner lib X@@ -229,22 +249,22 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) X $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} X X xpcomxul.o: xpcom.cpp X- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp X+ $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_EXCLUDES} ${XULRUNNER_INCLUDES} -c xpcom.cpp X X xpcomxul_structs.o: xpcom_structs.cpp X- $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp X+ $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_EXCLUDES} ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp X X xpcomxul_custom.o: xpcom_custom.cpp X- $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp X+ $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_EXCLUDES} ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp X X xpcomxul_stats.o: xpcom_stats.cpp X- $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp X+ $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_EXCLUDES} ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp X X xpcomxulglue.o: xpcomglue.cpp X- $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp X+ $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_EXCLUDES} ${XULRUNNER_INCLUDES} -c xpcomglue.cpp X X xpcomxulglue_stats.o: xpcomglue_stats.cpp X- $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp X+ $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_EXCLUDES} ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp X X # X # XPCOMInit lib X@@ -264,6 +284,23 @@ xpcominit_stats.o: xpcominit_stats.cpp X $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp X X # X+# WebKit lib X+# X+make_webkit: $(WEBKIT_LIB) X+ X+$(WEBKIT_LIB): $(WEBKIT_OBJECTS) X+ $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) X+ X+webkit.o: webkitgtk.c X+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o X+ X+webkit_structs.o: webkitgtk_structs.c X+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o X+ X+webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h X+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o X+ X+# X # GLX lib X # X make_glx: $(GLX_LIB) Xdiff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c Xindex 8392189..f02a5ef 100644 X--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c X+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c X@@ -4162,11 +4162,17 @@ JNIEXPORT void JNICALL OS_NATIVE(_1g_1thread_1init) X JNIEXPORT jboolean JNICALL OS_NATIVE(_1g_1thread_1supported) X (JNIEnv *env, jclass that) X { X+ return 1; X+ /* X+ g_thread_supported is non-existent in glib-2.36+, X+ but is still referenced. X+ X jboolean rc = 0; X OS_NATIVE_ENTER(env, that, _1g_1thread_1supported_FUNC); X rc = (jboolean)g_thread_supported(); X OS_NATIVE_EXIT(env, that, _1g_1thread_1supported_FUNC); X return rc; X+ */ X } X #endif X Xdiff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java Xindex 7e282a9..59f36c5 100644 X--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java X+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java X@@ -33,18 +33,19 @@ public class OS extends C { X } X X /** OS Constants */ X- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, BIG_ENDIAN; X+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD, BIG_ENDIAN; X static { X X /* Initialize the OS flags and locale constants */ X String osName = System.getProperty ("os.name"); X- boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false; X+ boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false, isFreeBSD = false; X if (osName.equals ("Linux")) isLinux = true; X if (osName.equals ("AIX")) isAIX = true; X if (osName.equals ("Solaris")) isSunOS = true; X if (osName.equals ("SunOS")) isSunOS = true; X if (osName.equals ("HP-UX")) isHPUX = true; X- IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; X+ if (osName.equals ("FreeBSD")) isFreeBSD = true; X+ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsFreeBSD = isFreeBSD; X X byte[] buffer = new byte[4]; X long /*int*/ ptr = OS.malloc(4); Xdiff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml Xindex 7dd0536..fc0d72c 100644 X--- a/eclipse.platform.swt.binaries/pom.xml X+++ b/eclipse.platform.swt.binaries/pom.xml X@@ -55,6 +55,7 @@ X bundles/org.eclipse.swt.gtk.linux.s390x X bundles/org.eclipse.swt.gtk.linux.x86 X bundles/org.eclipse.swt.gtk.linux.x86_64 X+ bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%% X bundles/org.eclipse.swt.gtk.solaris.sparc X bundles/org.eclipse.swt.gtk.solaris.x86 X bundles/org.eclipse.swt.win32.win32.x86 Xdiff --git a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c b/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c Xindex 2417b4e..c665afe 100644 X--- a/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c X+++ b/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c X@@ -17,7 +17,7 @@ X #include X #include X X-#ifdef __linux__ X+#ifdef __STDC__ X #include X #else X #include Xdiff --git a/eclipse.platform.team/pom.xml b/eclipse.platform.team/pom.xml Xindex 8637ed3..7623ba6 100644 X--- a/eclipse.platform.team/pom.xml X+++ b/eclipse.platform.team/pom.xml X@@ -63,6 +63,7 @@ X features/org.eclipse.cvs-feature X X X+ bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.%%ECLIPSE_ARCH%% X bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 X bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64 X bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 Xdiff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java Xindex 7482d60..c3150b7 100644 X--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java X+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java X@@ -39,6 +39,9 @@ public class HelpBasePreferenceInitializer extends X } else if (os.indexOf("linux") != -1) { //$NON-NLS-1$ X prefs.put("custom_browser_path", //$NON-NLS-1$ X "konqueror %1"); //$NON-NLS-1$ X+ } else if (os.indexOf("freebsd") != -1) { //$NON-NLS-1$ X+ prefs.put("custom_browser_path", //$NON-NLS-1$ X+ "firefox %1"); //$NON-NLS-1$ X } else { X prefs.put("custom_browser_path", "mozilla %1"); //$NON-NLS-1$ //$NON-NLS-2$ X } Xdiff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java Xindex 3fc1fd7..47ab00d 100644 X--- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java X+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java X@@ -99,6 +99,7 @@ public class BrowserManager { X if (Constants.WS_WIN32.equalsIgnoreCase(os)) { X setDefaultBrowserID(BROWSER_ID_SYSTEM); X } else if (Constants.OS_AIX.equalsIgnoreCase(os) X+ || (Constants.OS_FREEBSD.equalsIgnoreCase(os)) X || (Constants.OS_HPUX.equalsIgnoreCase(os)) X || (Constants.OS_LINUX.equalsIgnoreCase(os)) X || (Constants.OS_SOLARIS.equalsIgnoreCase(os))) { Xdiff --git a/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java b/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java Xindex dec7f54..859167c 100644 X--- a/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java X+++ b/eclipse.platform.ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java X@@ -64,7 +64,8 @@ public class EmbeddedBrowserFactory implements IBrowserFactory { X */ X private boolean test() { X if (!Constants.OS_WIN32.equalsIgnoreCase(Platform.getOS()) X- && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS())) { X+ && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS()) X+ && !Constants.OS_FREEBSD.equalsIgnoreCase(Platform.getOS())) { X return false; X } X if (!tested) { Xdiff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml Xindex 242e712..a6ade82 100644 X--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml X+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml X@@ -459,6 +469,16 @@ X fragment="true"/> X X X+ X+ X X X+ X+ X X X+ X X X X@@ -57,6 +59,8 @@ X X X X+ X+ X X X X@@ -64,10 +68,13 @@ X X X X- X+ X X X X+ X+ X+ X X X Xdiff --git a/rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature/pom.xml b/rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature/pom.xml Xindex 661fd6c..2363b60 100644 X--- a/rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature/pom.xml X+++ b/rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature/pom.xml X@@ -31,6 +31,12 @@ X p2 X X X+ freebsd X+ gtk X+ %%ECLIPSE_ARCH%% X+ X+ X X X Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml Xindex 659d332..e06e120 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml X+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml X@@ -21,4 +21,411 @@ X org.eclipse.equinox.launcher X 1.3.0-SNAPSHOT X eclipse-plugin X+ X+ X+ X+ build-native-launchers-gtk.freebsd.%%ECLIPSE_ARCH%% X+ X+ X+ native X+ gtk.freebsd.%%ECLIPSE_ARCH%% X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ compile-executable-natives X+ generate-resources X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X+ build-native-launchers-gtk.linux.x86_64 X+ X+ X+ native X+ gtk.linux.x86_64 X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ compile-executable-natives X+ generate-resources X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X+ build-native-launchers-gtk.linux.x86 X+ X+ X+ native X+ gtk.linux.x86 X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ compile-executable-natives X+ generate-resources X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X+ build-native-launchers-win32.win32.x86_64 X+ X+ X+ native X+ win32.win32.x86_64 X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ compile-executable-natives X+ generate-resources X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X+ build-native-launchers-win32.win32.x86 X+ X+ X+ native X+ win32.win32.x86 X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ compile-executable-natives X+ generate-resources X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X+ build-native-launchers-cocoa.macosx.x86_64 X+ X+ X+ native X+ cocoa.macosx.x86_64 X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ compile-executable-natives X+ generate-resources X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X+ assemble-launchers X+ X+ X+ X+ !longnotexistingproperty X+ X+ X+ X+ X+ X+ maven-antrun-plugin X+ 1.7 X+ X+ X+ copy-executable-natives X+ process-resources X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ run X+ X+ X+ X+ X+ X+ bsf X+ bsf X+ 2.4.0 X+ X+ X+ rhino X+ js X+ 1.7R2 X+ X+ X+ org.apache.ant X+ ant-apache-bsf X+ 1.8.3 X+ X+ X+ org.apache.ant X+ ant-nodeps X+ 1.8.1 X+ X+ X+ X+ X+ X+ X+ X Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java Xindex 6e83b71..db56cd5 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java X+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java X@@ -26,6 +26,7 @@ public class Constants { X public static final String INTERNAL_OS_OS400 = "OS/400"; //$NON-NLS-1$ X public static final String INTERNAL_OS_OS390 = "OS/390"; //$NON-NLS-1$ X public static final String INTERNAL_OS_ZOS = "z/OS"; //$NON-NLS-1$ X+ public static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ X X public static final String ARCH_X86 = "x86";//$NON-NLS-1$ X public static final String ARCH_X86_64 = "x86_64";//$NON-NLS-1$ X@@ -91,6 +92,17 @@ public class Constants { X public static final String OS_ZOS = "z/os"; //$NON-NLS-1$ X X /** X+ * Constant string (value "freebsd") indicating the platform is running on a X+ * FreeBSD operating system. X+ *

X+ * Note this constant is not officially supported by the eclipse project X+ * and is only available on eclipse versions built from the FreeBSD ports X+ * tree. X+ *

X+ */ X+ public static final String OS_FREEBSD = "freebsd"; //$NON-NLS-1$ X+ X+ /** X * Constant string (value "unknown") indicating the platform is running on a X * machine running an unknown operating system. X */ Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java Xindex 85417f6..5448261 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java X+++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java X@@ -336,6 +336,8 @@ public class Main { X return Constants.WS_GTK; X if (osName.equals(Constants.OS_QNX)) X return Constants.WS_PHOTON; X+ if (osName.equals(Constants.OS_FREEBSD)) X+ return Constants.WS_GTK; X return Constants.WS_UNKNOWN; X } X X@@ -382,6 +384,8 @@ public class Main { X // os.name on Mac OS can be either Mac OS or Mac OS X X if (osName.regionMatches(true, 0, Constants.INTERNAL_OS_MACOSX, 0, Constants.INTERNAL_OS_MACOSX.length())) X return Constants.OS_MACOSX; X+ if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_FREEBSD)) X+ return Constants.OS_FREEBSD; X return Constants.OS_UNKNOWN; X } X Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java b/rt.equinox.framework/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java Xindex 6f2b039..7feb9b6 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java X+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java X@@ -77,7 +77,7 @@ public class TextProcessor { X X if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ X String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ X- if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ X+ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("mac") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ X IS_PROCESSING_NEEDED = true; X } X } Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java b/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java Xindex 0d091d7..5acffe0 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java X+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java X@@ -40,6 +40,7 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo { X private static final String INTERNAL_OS_OS400 = "OS/400"; //$NON-NLS-1$ X private static final String INTERNAL_OS_OS390 = "OS/390"; //$NON-NLS-1$ X private static final String INTERNAL_OS_ZOS = "z/OS"; //$NON-NLS-1$ X+ private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ X X // While we recognize the i386 architecture, we change X // this internally to be x86. X@@ -202,6 +203,8 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo { X return Constants.WS_GTK; X if (osName.equals(Constants.OS_QNX)) X return Constants.WS_PHOTON; X+ if (osName.equals(Constants.OS_FREEBSD)) X+ return Constants.WS_GTK; X return Constants.WS_UNKNOWN; X } X X@@ -230,6 +233,8 @@ public class EclipseEnvironmentInfo implements EnvironmentInfo { X // os.name on Mac OS can be either Mac OS or Mac OS X X if (osName.regionMatches(true, 0, INTERNAL_OS_MACOSX, 0, INTERNAL_OS_MACOSX.length())) X return Constants.OS_MACOSX; X+ if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD)) X+ return Constants.OS_FREEBSD; X return Constants.OS_UNKNOWN; X } X Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java b/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java Xindex fe1447f..3160fd5 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java X+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java X@@ -68,7 +68,7 @@ public class PluginConverterImpl implements PluginConverter { X static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ X static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$ X static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$ X- private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; X+ private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_FREEBSD, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; X protected static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$ X protected static final String PI_BOOT = "org.eclipse.core.boot"; //$NON-NLS-1$ X protected static final String PI_RUNTIME_COMPATIBILITY = "org.eclipse.core.runtime.compatibility"; //$NON-NLS-1$ Xdiff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java b/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java Xindex 4b017cd..013d6b1 100644 X--- a/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java X+++ b/rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java X@@ -93,6 +93,15 @@ public interface Constants { X public static final String OS_ZOS = "z/os"; //$NON-NLS-1$ X X /** X+ * Constant string (value "freebsd") indicating the platform is running on a X+ * FreeBSD operating system. X+ * Note this constant is not officially supported by the eclipse project X+ * and is only available on eclipse versions built from the FreeBSD ports X+ * tree. X+ */ X+ public static final String OS_FREEBSD = "freebsd"; //$NON-NLS-1$ X+ X+ /** X * Constant string (value "unknown") indicating the platform is running on a X * machine running an unknown operating system. X */ Xdiff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml Xindex 7b4a01b..fbbbe06 100644 X--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml X+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/feature.xml X@@ -92,6 +92,16 @@ X fragment="true"/> X X X+ X+ " X+ ;; X+ esac X+ ;; X "AIX" | "aix") X makefile="make_aix.mak" X defaultOS="aix" X@@ -220,13 +243,14 @@ export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_J X # If the OS is supported (a makefile exists) X if [ "$makefile" != "" ]; then X if [ "$extraArgs" != "" ]; then X- make -f $makefile $extraArgs X+ echo "Building $OS launcher with args $extraArgs. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" X+ ${MAKE} -f $makefile $extraArgs X else X echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" X- make -f $makefile clean X+ ${MAKE} -f $makefile clean X case x$CC in X- x*gcc*) make -f $makefile all PICFLAG=-fpic ;; X- *) make -f $makefile all ;; X+ x*cc*) ${MAKE} -f $makefile all PICFLAG=-fpic ;; X+ *) ${MAKE} -f $makefile all ;; X esac X fi X else Xdiff --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 Xindex 939c8b5..c2491a5 100644 X--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml X+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml X@@ -101,6 +101,7 @@ X X X X+ X X assemble-launchers X Xdiff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties Xindex 0f30a87..36382de 100644 X--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties X+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties X@@ -19,6 +19,11 @@ root.win32.win32.x86.permissions.755=launcher.exe X root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe X root.win32.win32.x86_64.permissions.755=launcher.exe X X+root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root X+root.freebsd.gtk.x86.permissions.755=launcher,libcairo-swt.so X+root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root X+root.freebsd.gtk.x86_64.permissions.755=launcher,libcairo-swt.so X+ X root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root X root.linux.gtk.x86.permissions.755=launcher,libcairo-swt.so X Xdiff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml Xindex cdded03..a2a0af3 100644 X--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml X+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.xml X@@ -128,6 +128,22 @@ X X X X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X+ X X X X@@ -278,6 +294,8 @@ X X X X+ X+ X X X X@@ -319,4 +337,4 @@ X X X X- X\ No newline at end of file X+ Xdiff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml Xindex b46cdc6..d46c81d 100644 X--- a/rt.equinox.framework/pom.xml X+++ b/rt.equinox.framework/pom.xml X@@ -60,6 +60,7 @@ X bundles/org.eclipse.equinox.launcher.gtk.linux.s390x X bundles/org.eclipse.equinox.launcher.gtk.linux.x86 X bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64 X+ bundles/org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%% X bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc X bundles/org.eclipse.equinox.launcher.gtk.solaris.x86 X bundles/org.eclipse.equinox.launcher.motif.aix.ppc Xdiff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java Xindex 3cf2fe1..53f82b3 100644 X--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java X+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java X@@ -123,6 +123,8 @@ public class BrandingIron { X brandAIX(descriptor); X else if ("hpux".equals(os)) //$NON-NLS-1$ X brandHPUX(descriptor); X+ else if ("freebsd".equals(os)) //$NON-NLS-1$ X+ brandFreeBSD(descriptor); X else X renameLauncher(descriptor); X descriptor.setExecutableName(name, true); X@@ -178,6 +180,14 @@ public class BrandingIron { X } X } X X+ private void brandFreeBSD(ExecutablesDescriptor descriptor) throws Exception { X+ renameLauncher(descriptor); X+ X+ File root = descriptor.getLocation(); X+ if (brandIcons) X+ Utils.copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$ X+ } X+ X private void brandMac(ExecutablesDescriptor descriptor) throws Exception { X //Initially the files are in: /Eclipse.app/ X //and they must appear in /MyAppName.app/ Xdiff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java Xindex 324c94f..f1b0d14 100644 X--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java X+++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java X@@ -58,11 +58,13 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance(); X X private static final String PROGRAM_ARGS = "programArgs"; //$NON-NLS-1$ X+ private static final String PROGRAM_ARGS_FREEBSD = "programArgsFre"; //$NON-NLS-1$ X private static final String PROGRAM_ARGS_LINUX = "programArgsLin"; //$NON-NLS-1$ X private static final String PROGRAM_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ X private static final String PROGRAM_ARGS_SOLARIS = "programArgsSol"; //$NON-NLS-1$ X private static final String PROGRAM_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ X private static final String VM_ARGS = "vmArgs"; //$NON-NLS-1$ X+ private static final String VM_ARGS_FREEBSD = "vmArgsFre"; //$NON-NLS-1$ X private static final String VM_ARGS_LINUX = "vmArgsLin"; //$NON-NLS-1$ X private static final String VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ X private static final String VM_ARGS_SOLARIS = "vmArgsSol"; //$NON-NLS-1$ X@@ -85,6 +87,7 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X private static final String OS_LINUX = "linux";//$NON-NLS-1$ X private static final String OS_SOLARIS = "solaris";//$NON-NLS-1$ X private static final String OS_MACOSX = "macosx";//$NON-NLS-1$ X+ private static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ X X //element names X private static final String EL_FEATURES = "features"; //$NON-NLS-1$ X@@ -110,20 +113,22 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X private static final int STATE_PLUGINS = 4; X private static final int STATE_FEATURES = 5; X private static final int STATE_PROGRAM_ARGS = 6; X- private static final int STATE_PROGRAM_ARGS_LINUX = 7; X- private static final int STATE_PROGRAM_ARGS_MAC = 8; X- private static final int STATE_PROGRAM_ARGS_SOLARIS = 9; X- private static final int STATE_PROGRAM_ARGS_WIN = 10; X- private static final int STATE_VM_ARGS = 11; X- private static final int STATE_VM_ARGS_LINUX = 12; X- private static final int STATE_VM_ARGS_MAC = 13; X- private static final int STATE_VM_ARGS_SOLARIS = 14; X- private static final int STATE_VM_ARGS_WIN = 15; X- private static final int STATE_CONFIG_INI = 16; X- private static final int STATE_CONFIGURATIONS = 17; X- private static final int STATE_LICENSE = 18; X- private static final int STATE_LICENSE_URL = 19; X- private static final int STATE_LICENSE_TEXT = 20; X+ private static final int STATE_PROGRAM_ARGS_FREEBSD = 7; X+ private static final int STATE_PROGRAM_ARGS_LINUX = 8; X+ private static final int STATE_PROGRAM_ARGS_MAC = 9; X+ private static final int STATE_PROGRAM_ARGS_SOLARIS = 10; X+ private static final int STATE_PROGRAM_ARGS_WIN = 11; X+ private static final int STATE_VM_ARGS = 12; X+ private static final int STATE_VM_ARGS_FREEBSD = 13; X+ private static final int STATE_VM_ARGS_LINUX = 14; X+ private static final int STATE_VM_ARGS_MAC = 15; X+ private static final int STATE_VM_ARGS_SOLARIS = 16; X+ private static final int STATE_VM_ARGS_WIN = 17; X+ private static final int STATE_CONFIG_INI = 18; X+ private static final int STATE_CONFIGURATIONS = 19; X+ private static final int STATE_LICENSE = 20; X+ private static final int STATE_LICENSE_URL = 21; X+ private static final int STATE_LICENSE_TEXT = 22; X X private static final String PI_PDEBUILD = "org.eclipse.pde.build"; //$NON-NLS-1$ X private final static int EXCEPTION_PRODUCT_FORMAT = 23; X@@ -437,6 +442,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X key = VM_ARGS_MAC; X } else if (os.equals(OS_SOLARIS)) { X key = VM_ARGS_SOLARIS; X+ } else if (os.equals(OS_FREEBSD)) { X+ key = VM_ARGS_FREEBSD; X } X X String prefix = launcherArgs.getProperty(VM_ARGS); X@@ -466,6 +473,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X key = PROGRAM_ARGS_MAC; X } else if (os.equals(OS_SOLARIS)) { X key = PROGRAM_ARGS_SOLARIS; X+ } else if (os.equals(OS_FREEBSD)) { X+ key = PROGRAM_ARGS_FREEBSD; X } X X String prefix = launcherArgs.getProperty(PROGRAM_ARGS); X@@ -532,6 +541,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X processLinux(attributes); X } else if (OS_MACOSX.equals(localName)) { X processMac(attributes); X+ } else if (OS_FREEBSD.equals(localName)) { X+ processFreeBSD(attributes); X } X if ("ico".equals(localName)) { //$NON-NLS-1$ X processIco(attributes); X@@ -543,6 +554,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X case STATE_LAUNCHER_ARGS : X if (PROGRAM_ARGS.equals(localName)) { X state = STATE_PROGRAM_ARGS; X+ } else if (PROGRAM_ARGS_FREEBSD.equals(localName)) { X+ state = STATE_PROGRAM_ARGS_FREEBSD; X } else if (PROGRAM_ARGS_LINUX.equals(localName)) { X state = STATE_PROGRAM_ARGS_LINUX; X } else if (PROGRAM_ARGS_MAC.equals(localName)) { X@@ -553,6 +566,8 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X state = STATE_PROGRAM_ARGS_WIN; X } else if (VM_ARGS.equals(localName)) { X state = STATE_VM_ARGS; X+ } else if (VM_ARGS_FREEBSD.equals(localName)) { X+ state = STATE_VM_ARGS_FREEBSD; X } else if (VM_ARGS_LINUX.equals(localName)) { X state = STATE_VM_ARGS_LINUX; X } else if (VM_ARGS_MAC.equals(localName)) { X@@ -658,11 +673,13 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X break; X X case STATE_PROGRAM_ARGS : X+ case STATE_PROGRAM_ARGS_FREEBSD : X case STATE_PROGRAM_ARGS_LINUX : X case STATE_PROGRAM_ARGS_MAC : X case STATE_PROGRAM_ARGS_SOLARIS : X case STATE_PROGRAM_ARGS_WIN : X case STATE_VM_ARGS : X+ case STATE_VM_ARGS_FREEBSD : X case STATE_VM_ARGS_LINUX : X case STATE_VM_ARGS_MAC : X case STATE_VM_ARGS_SOLARIS : X@@ -689,6 +706,9 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X case STATE_PROGRAM_ARGS : X addLaunchArgumentToMap(PROGRAM_ARGS, String.valueOf(ch, start, length)); X break; X+ case STATE_PROGRAM_ARGS_FREEBSD : X+ addLaunchArgumentToMap(PROGRAM_ARGS_FREEBSD, String.valueOf(ch, start, length)); X+ break; X case STATE_PROGRAM_ARGS_LINUX : X addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length)); X break; X@@ -704,6 +724,9 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X case STATE_VM_ARGS : X addLaunchArgumentToMap(VM_ARGS, String.valueOf(ch, start, length)); X break; X+ case STATE_VM_ARGS_FREEBSD : X+ addLaunchArgumentToMap(VM_ARGS_FREEBSD, String.valueOf(ch, start, length)); X+ break; X case STATE_VM_ARGS_LINUX : X addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length)); X break; X@@ -867,6 +890,10 @@ public class ProductFile extends DefaultHandler implements IProductDescriptor { X addIcon(OS_WIN32, attributes.getValue(WIN32_256_HIGH)); X } X X+ private void processFreeBSD(Attributes attributes) { X+ addIcon(OS_FREEBSD, attributes.getValue(ATTRIBUTE_ICON)); X+ } X+ X private void processLinux(Attributes attributes) { X addIcon(OS_LINUX, attributes.getValue(ATTRIBUTE_ICON)); X } Xdiff --git a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties Xindex d8e85b5..10e1c66 100644 X--- a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties X+++ b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.cloud.releng/build.properties X@@ -29,7 +29,8 @@ collectingFolder=${archivePrefix} X # configs=win32,win32,x86 & linux,motif,x86 X # By default the value is *,*,* X configs = win32, win32, x86 & \ X- linux, gtk, x86 & X+ linux, gtk, x86 & \ X+ freebsd, gtk, %%ECLIPSE_ARCH%% X #configs=win32, win32, x86 & \ X # linux, gtk, ppc &\ X # linux, gtk, x86 & \ Xdiff --git a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties Xindex 4be192c..10e1c66 100644 X--- a/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties X+++ b/rt.equinox.p2/examples/org.eclipse.equinox.p2.examples.rcp.discovery.releng/build.properties X@@ -29,7 +29,8 @@ collectingFolder=${archivePrefix} X # configs=win32,win32,x86 & linux,motif,x86 X # By default the value is *,*,* X configs = win32, win32, x86 & \ X- linux, gtk, x86 X+ linux, gtk, x86 & \ X+ freebsd, gtk, %%ECLIPSE_ARCH%% X #configs=win32, win32, x86 & \ X # linux, gtk, ppc &\ X # linux, gtk, x86 & \ Xdiff --git a/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml b/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml Xindex 70fdde5..d9807d9 100644 X--- a/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml X+++ b/rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml X@@ -39,6 +39,9 @@ X X X X+ X+ X+ X X X Xdiff --git a/rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml b/rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml Xindex b3ed6f8..7544d34 100644 X--- a/rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml X+++ b/rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent/pom.xml X@@ -54,18 +54,6 @@ X J2SE-1.5 X X X- X- org.eclipse.tycho X- tycho-compiler-plugin X- X- X- BREE X- X- X X X 14811d4f6172722e5392df63e8e3ac6d echo c - eclipse/scripts mkdir -p eclipse/scripts > /dev/null 2>&1 echo x - eclipse/scripts/pre-patch sed 's/^X//' >eclipse/scripts/pre-patch << 'a5e00f0c27884b6ae19121bd3d651a9b' X#!/bin/sh X Xset -x X X# Copy the Linux 'native' code for the FreeBSD versions X# At this point, just make sure the directory and file names are "freebsd" X# These files will be patched in the do-patch step. X Xcheck_freebsd_mak () X{ X local d X d=`dirname "$1"` X [ -e "${d}/make_freebsd.mak" ] && return X cp -p "$1" "${d}/make_freebsd.mak" X} X Xfor d in ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x* \ X ${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x* \ X ${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \ X ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \ X ${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \ X ${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x* \ X ${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x* \ X ${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x* \ X ${WRKSRC}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bin/gtk/linux/x* Xdo X mkdir -p `echo $d | sed -e 's/linux/freebsd/'` X [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - ) Xdone X Xfor d in `find ${WRKSRC} -type d -name \*freebsd\*` Xdo X for f in `find $d -name \*linux\*` X do X mv $f `echo $f | sed -e 's/linux/freebsd/'` X done X find $d -type f \( -name \*.so -o -name eclipse -o -name launcher \) -delete Xdone X Xfind ${WRKSRC} -type f -name make_linux.mak | while read file; do check_freebsd_mak "$file"; done a5e00f0c27884b6ae19121bd3d651a9b exit