svn commit: r402850 - in head/java/eclipse: . files scripts
Kurt Jaeger
pi at FreeBSD.org
Wed Dec 2 19:57:31 UTC 2015
Author: pi
Date: Wed Dec 2 19:57:29 2015
New Revision: 402850
URL: https://svnweb.freebsd.org/changeset/ports/402850
Log:
java/eclipse: 4.4.2 -> 4.5.1
- Bump to Eclipse 4.5.1
- Switch to using Maven 3.3
- add fix for running Eclipse build for Gtk2 only on a system where
Gtk3 might also be installed.
- Details:
https://projects.eclipse.org/releases/mars/details
- Bugs fixed:
https://bugs.eclipse.org/bugs/buglist.cgi?classification=Eclipse&classification=RT&product=Equinox&product=JDT&product=PDE&product=Platform&query_format=advanced&resolution=FIXED&target_milestone=4.5.1
PR: 203689
Submitted by: Jimmy Kelley <ljboiler at gmail.com> (maintainer)
Modified:
head/java/eclipse/Makefile
head/java/eclipse/distinfo
head/java/eclipse/files/eclipse.in
head/java/eclipse/files/patch-aggregator
head/java/eclipse/files/patch-freebsd_natives
head/java/eclipse/files/patch-submodules
head/java/eclipse/scripts/pre-patch
Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/Makefile Wed Dec 2 19:57:29 2015 (r402850)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= eclipse
-PORTVERSION= 4.4.2
+PORTVERSION= 4.5.1
CATEGORIES= java devel
MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
@@ -10,16 +10,14 @@ DISTFILES= eclipse.platform.releng.aggre
DIST_SUBDIR= eclipse
MAINTAINER= ljboiler at gmail.com
-COMMENT= Eclipse Luna SR-2
+COMMENT= Eclipse Mars.1
LICENSE= EPL
-BUILD_DEPENDS= ${LOCALBASE}/share/java/maven31/bin/mvn:${PORTSDIR}/devel/maven31
+BUILD_DEPENDS= ${LOCALBASE}/share/java/maven33/bin/mvn:${PORTSDIR}/devel/maven33
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
-BROKEN_FreeBSD_9_i386= does not build
-
ONLY_FOR_ARCHS= i386 amd64
CONFLICTS_INSTALL= eclipse
@@ -55,18 +53,22 @@ PATCH_STRIP= -p1
USE_GNOME+= gtk30
LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
MVN_SETTINGS+= -Dmachine_gtk3=1
+SWTGTK3OPT=
+.else
+SWTGTK3OPT= SWT_GTK3=0
.endif
WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION}
GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator
MVN_LOCAL_REPO= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION}/repository
-MVN_TEST_FLAG= -Dmaven.test.skip=true
-MVN_SETTINGS+= --offline
+MVN_TEST_FLAG= -Dmaven.test.skip=true -DskipTests=true
+#MVN_SETTINGS+= --offline
+MVN_OPTS?= MAVEN_OPTS='-Xms1024m -Xmx1792m'
ECLIPSE_WS= gtk
ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}
E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//}
-ECLIPSE_BUILDID=M20150204-1700
+ECLIPSE_BUILDID=I20150603-2000
SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \
E_SHORTARCH=${E_SHORTARCH}
PORTDESTDIR= ${PREFIX}/lib/eclipse
@@ -95,7 +97,7 @@ post-patch:
done)
do-build:
- @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \
+ @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven33 ${MVN_OPTS} \
mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \
-DbuildId=${ECLIPSE_BUILDID})
@@ -110,6 +112,7 @@ do-install:
-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
-e "s+%%JAVA_VERSION%%+${JAVA_VERSION}+g" \
-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
+ -e "s+%%SWTGTK3OPT%%+${SWTGTK3OPT}+g" \
${FILESDIR}/eclipse.in > ${BUILD_WRKSRC}/eclipse.tmp
.if defined(JAVA_VENDOR)
@${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \
@@ -124,7 +127,7 @@ do-install:
@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d -empty) | ${SED} -ne "s,^, at dir ,p" >> ${TMPPLIST}
@${ECHO_CMD} "@exec echo '-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%D/share/eclipse/dropins' >> %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec ${SED} -i '' '/^-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/d' %D/lib/eclipse/eclipse.ini" >> ${TMPPLIST}
- ${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins
@${ECHO_CMD} "@dir share/eclipse/dropins" >> ${TMPPLIST}
distclean:
Modified: head/java/eclipse/distinfo
==============================================================================
--- head/java/eclipse/distinfo Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/distinfo Wed Dec 2 19:57:29 2015 (r402850)
@@ -1,4 +1,4 @@
-SHA256 (eclipse/eclipse.platform.releng.aggregator-4.4.2.xz) = 93d9f028b840f18420b3e5193f8166ee431536f1b09a8a900144b7a4de62f791
-SIZE (eclipse/eclipse.platform.releng.aggregator-4.4.2.xz) = 214688453
-SHA256 (eclipse/eclipse-maven-repo-4.4.2.xz) = ee666bb69dd498553e50403514a1cdf332094dad6b66f03a8c38407048a92ddf
-SIZE (eclipse/eclipse-maven-repo-4.4.2.xz) = 118457481
+SHA256 (eclipse/eclipse.platform.releng.aggregator-4.5.1.xz) = 294fedd5742a2755f4f46e0b0f825565b762def15760772351ac484bd08ae2a2
+SIZE (eclipse/eclipse.platform.releng.aggregator-4.5.1.xz) = 187196744
+SHA256 (eclipse/eclipse-maven-repo-4.5.1.xz) = b28e70618b92d63eaae5d5919c6f6dd5d28ce14caa9e9ee9fd7a56630a90aa6b
+SIZE (eclipse/eclipse-maven-repo-4.5.1.xz) = 131884596
Modified: head/java/eclipse/files/eclipse.in
==============================================================================
--- head/java/eclipse/files/eclipse.in Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/files/eclipse.in Wed Dec 2 19:57:29 2015 (r402850)
@@ -43,4 +43,4 @@ if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; t
exit 1
fi
-JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@
+JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" $@
Modified: head/java/eclipse/files/patch-aggregator
==============================================================================
--- head/java/eclipse/files/patch-aggregator Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/files/patch-aggregator Wed Dec 2 19:57:29 2015 (r402850)
@@ -1,74 +1,40 @@
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
-index ce98be7..fa2d1e1 100644
+index 71a6610..cc260cd 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
-@@ -62,7 +62,7 @@
- The tycho-eclipserun-plugin will create its instance of Eclipse from this
- 'eclipiserun-repo' repository, such as for computing .api-descriptions.
- -->
-- <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4-M-builds/M-4.4.2RC2-201501281000/</eclipserun-repo>
-+ <eclipserun-repo>http://download.eclipse.org/eclipse/updates/4.4/R-4.4.2-201502041700/</eclipserun-repo>
-
- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.4-M-builds</comparator.repo>
-
-@@ -201,6 +201,12 @@
- </artifact>
+@@ -253,6 +253,11 @@
</target>
<environments>
-+ <environment>
+ <environment>
+ <os>freebsd</os>
+ <ws>gtk</ws>
+ <arch>%%ECLIPSE_ARCH%%</arch>
+ </environment>
-+<!--
- <environment>
++ <environment>
<os>linux</os>
<ws>gtk</ws>
-@@ -281,6 +287,7 @@
- <ws>gtk</ws>
- <arch>ppc64</arch>
- </environment>
-+-->
- </environments>
- </configuration>
- </plugin>
-@@ -360,11 +367,11 @@
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho.version}</version>
- <dependencies>
-- <dependency>
-+ <!--dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
- <version>${tycho-extras.version}</version>
-- </dependency>
-+ </dependency-->
- <dependency>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-sourceref-jgit</artifactId>
-@@ -374,14 +381,14 @@
+ <arch>x86</arch>
+@@ -480,13 +485,13 @@
<configuration>
<strictBinIncludes>false</strictBinIncludes>
<format>'v'yyyyMMdd-HHmm</format>
- <timestampProvider>jgit</timestampProvider>
-+ <!--timestampProvider>jgit</timestampProvider-->
++ <!-- timestampProvider>jgit</timestampProvider -->
<jgit.ignore>
pom.xml
</jgit.ignore>
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
-- <sourceReferences>
-+ <!--sourceReferences>
- <generate>true</generate>
-- </sourceReferences>
-+ </sourceReferences-->
+ <sourceReferences>
+- <generate>true</generate>
++ <generate>false</generate>
+ </sourceReferences>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
- </archive>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index 7e6fd26..f1773e0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
-@@ -139,6 +139,12 @@
+@@ -139,6 +139,11 @@
<resolver>p2</resolver>
<environments>
<environment>
@@ -76,24 +42,15 @@ index 7e6fd26..f1773e0 100644
+ <ws>gtk</ws>
+ <arch>%%ECLIPSE_ARCH%%</arch>
+ </environment>
-+<!--
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
-@@ -163,6 +169,7 @@
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
-+-->
- </environments>
- </configuration>
- </plugin>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index c7f7ca9..1387a12 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
-@@ -44,6 +44,12 @@
+@@ -44,6 +44,11 @@
<resolver>p2</resolver>
<environments>
<environment>
@@ -101,19 +58,10 @@ index c7f7ca9..1387a12 100644
+ <ws>gtk</ws>
+ <arch>%%ECLIPSE_ARCH%%</arch>
+ </environment>
-+<!--
+ <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
-@@ -68,6 +74,7 @@
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
-+-->
- </environments>
- </configuration>
- </plugin>
@@ -99,6 +106,7 @@
<configuration>
<formats>
@@ -173,18 +121,6 @@ index 129d0a6..a8f76b6 100644
id="ESLG2"
name="Linux (x86/GTK+)"
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" />
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
-index 0025a72..df900e7 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
-@@ -68,6 +68,7 @@
- <configuration>
- <formats>
- <win32>zip</win32>
-+ <freebsd>tar.gz</freebsd>
- <linux>tar.gz</linux>
- <macosx>tar.gz</macosx>
- </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index c2f679b..742fe0b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -225,31 +161,113 @@ index 502b599..5b885e5 100644
<linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
+@@ -87,6 +88,19 @@
+ </executions>
+ </plugin>
+
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>target-platform-configuration</artifactId>
++ <configuration>
++ <environments>
++ <environment>
++ <os>freebsd</os>
++ <ws>gtk</ws>
++ <arch>%%ECLIPSE_ARCH%%</arch>
++ </environment>
++ </environments>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+index a8a32d0..2ab8a62 100644
+--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
++++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+@@ -39,6 +39,60 @@
+ <format>'${buildId}'</format>
+ </configuration>
+ </plugin>
++
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>tycho-p2-director-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>materialize-products</id>
++ <goals>
++ <goal>materialize-products</goal>
++ </goals>
++ <configuration>
++ <profile>SDKProfile</profile>
++ <products>
++ <product>
++ <id>org.eclipse.platform.sdk</id>
++ <rootFolder>eclipse</rootFolder>
++ <rootFolders>
++ <macosx>Eclipse.app</macosx>
++ </rootFolders>
++ </product>
++ </products>
++ </configuration>
++ </execution>
++ <execution>
++ <id>archive-products</id>
++ <phase>pre-integration-test</phase>
++ <goals>
++ <goal>archive-products</goal>
++ </goals>
++ <configuration>
++ <formats>
++ <win32>zip</win32>
++ <freebsd>tar.gz</freebsd>
++ <linux>tar.gz</linux>
++ <macosx>tar.gz</macosx>
++ </formats>
++ </configuration>
++ </execution>
++ </executions>
++ </plugin>
++
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>target-platform-configuration</artifactId>
++ <configuration>
++ <environments>
++ <environment>
++ <os>freebsd</os>
++ <ws>gtk</ws>
++ <arch>%%ECLIPSE_ARCH%%</arch>
++ </environment>
++ </environments>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+ </project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-index 01c7934..c34148c 100644
+index 29dfebb..2783e4e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -10,58 +10,9 @@
+@@ -9,55 +9,8 @@
+ # IBM Corporation - initial API and implementation
###############################################################################
- #root.permissions.755=eclipse
+-#root.permissions.755=eclipse
-root.win32.win32.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86
-root.win32.win32.x86.permissions.755=eclipse.exe
-root.win32.win32.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64
-root.win32.win32.x86_64.permissions.755=eclipse.exe
--
+-
-# Care is need there, for "macosx", as several forms will appear to work, but end up
-# having wrong value in the CFBundleIdentifier field, in the Info.plist, resulting
-# in "application requires Java 6" (see bug 445026, and bug 457071)
-# These are not required at all, for our "product build", but are to get
-# configuration_roots complete (see bug 457071).
--root.macosx.cocoa.x86_64=rootfiles/macosx.cocoa.x86_64
+-root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64
-root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
--root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
--
--root.macosx.cocoa.x86=rootfiles/macosx.cocoa.x86
--root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
--root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
+-#root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
-
-# from org.eclipse.equinox.core.feature
-#root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
@@ -272,98 +290,24 @@ index 01c7934..c34148c 100644
-root.solaris.gtk.x86.permissions.755=eclipse
-
-root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
--root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
+-root.linux.gtk.x86.permissions.755=eclipse
-root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
-root.linux.gtk.ppc.permissions.755=eclipse
-root.linux.gtk.ppc64=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
-root.linux.gtk.ppc64.permissions.755=eclipse
-root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
--root.linux.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse
+-root.linux.gtk.x86_64.permissions.755=eclipse
-
-root.linux.gtk.s390x=rootfiles/linux.gtk.s390x,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
-root.linux.gtk.s390x.permissions.755=eclipse
-root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
-root.linux.gtk.s390.permissions.755=eclipse
-
+-
+root.freebsd.gtk.%%ECLIPSE_ARCH%%=rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/%%ECLIPSE_ARCH%%
+root.freebsd.gtk.%%ECLIPSE_ARCH%%.permissions.755=libcairo-swt.so,eclipse
bin.includes = feature.properties
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
-index ead6cd7..550bf70 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
-@@ -34,6 +34,45 @@
- <version>2.6</version>
- <executions>
- <execution>
-+ <id>copy-resources-gtk.freebsd.x86</id>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>copy-resources</goal>
-+ </goals>
-+ <configuration>
-+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.x86</outputDirectory>
-+ <resources>
-+ <resource>
-+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86</directory>
-+ <includes>
-+ <include>about_files/*</include>
-+ <include>about.html</include>
-+ </includes>
-+ </resource>
-+ </resources>
-+ </configuration>
-+ </execution>
-+ <execution>
-+ <id>copy-resources-gtk.freebsd.x86_64</id>
-+ <phase>validate</phase>
-+ <goals>
-+ <goal>copy-resources</goal>
-+ </goals>
-+ <configuration>
-+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.x86_64</outputDirectory>
-+ <resources>
-+ <resource>
-+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64
-+ </directory>
-+ <includes>
-+ <include>about_files/*</include>
-+ <include>about.html</include>
-+ </includes>
-+ </resource>
-+ </resources>
-+ </configuration>
-+ </execution>
-+ <execution>
- <id>copy-resources-gtk.linux.x86</id>
- <phase>validate</phase>
- <goals>
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
-index a849a55..ea72ce5 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
-@@ -61,6 +61,7 @@
- <configuration>
- <formats>
- <win32>zip</win32>
-+ <freebsd>tar.gz</freebsd>
- <linux>tar.gz</linux>
- <macosx>tar.gz</macosx>
- </formats>
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
-index 10b9b9f..b5a238b 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
-@@ -61,6 +61,7 @@
- <configuration>
- <formats>
- <win32>zip</win32>
-+ <freebsd>tar.gz</freebsd>
- <linux>tar.gz</linux>
- <macosx>tar.gz</macosx>
- </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
index 29be78c..207a934 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -376,6 +320,27 @@ index 29be78c..207a934 100644
<linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
+@@ -85,6 +86,20 @@
+ </execution>
+ </executions>
+ </plugin>
++
++ <plugin>
++ <groupId>org.eclipse.tycho</groupId>
++ <artifactId>target-platform-configuration</artifactId>
++ <configuration>
++ <environments>
++ <environment>
++ <os>freebsd</os>
++ <ws>gtk</ws>
++ <arch>%%ECLIPSE_ARCH%%</arch>
++ </environment>
++ </environments>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 6b59ed2..64975ba 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
Modified: head/java/eclipse/files/patch-freebsd_natives
==============================================================================
--- head/java/eclipse/files/patch-freebsd_natives Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/files/patch-freebsd_natives Wed Dec 2 19:57:29 2015 (r402850)
@@ -47,7 +47,7 @@
@@ -15,10 +15,10 @@
<artifactId>eclipse.platform.resources</artifactId>
<groupId>eclipse.platform.resources</groupId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../../../</relativePath>
</parent>
@@ -133,7 +133,7 @@
@@ -15,10 +15,10 @@
<artifactId>eclipse.platform.resources</artifactId>
<groupId>eclipse.platform.resources</groupId>
- <version>4.4.0-SNAPSHOT</version>
+ <version>4.5.1-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../../../</relativePath>
</parent>
@@ -209,7 +209,7 @@
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
- Bundle-Version: 3.103.2.qualifier
+ Bundle-Version: 3.104.1.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -30,7 +30,7 @@
@@ -230,7 +230,7 @@
<groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+ <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId>
- <version>3.103.2-SNAPSHOT</version>
+ <version>3.104.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
@@ -252,11 +252,11 @@
<phase>process-resources</phase>
<configuration>
<target>
-- <property name="machine_gtk3" value="1" />
-+ <!-- property name="machine_gtk3" value="1" / -->
+- <property name="machine_gtk3" value="1"/>
++ <!-- property name="machine_gtk3" value="1"/ -->
+ <property name="targets" value="install" />
<ant antfile="build.xml" target="build_libraries"/>
</target>
- </configuration>
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-04-15 21:26:16.000000000 -0500
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-04-16 07:31:05.000000000 -0500
@@ -1,10 +1,10 @@
@@ -268,11 +268,11 @@
- <property name="swt.os" value="linux" />
+ <property name="swt.os" value="freebsd" />
<property name="swt.arch" value="x86" />
-- <property name="targets" value="make_mozilla make_xulrunner make_xulrunner24 make_xpcominit install"/>
+- <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
+ <property name="targets" value="install"/>
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.103.0" />
+ <property name="version.suffix" value="3.104.0" />
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project.orig 2014-04-15 21:26:16.000000000 -0500
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/.project 2014-04-16 07:31:14.000000000 -0500
@@ -1,6 +1,6 @@
@@ -291,7 +291,7 @@
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
- Bundle-Version: 3.103.2.qualifier
+ Bundle-Version: 3.104.1.qualifier
Bundle-ManifestVersion: 2
Bundle-Localization: fragment
@@ -30,7 +30,7 @@
@@ -315,11 +315,11 @@
- <property name="swt.os" value="linux" />
+ <property name="swt.os" value="freebsd" />
<property name="swt.arch" value="x86_64" />
-- <property name="targets" value="make_mozilla make_xulrunner make_xulrunner24 make_xpcominit install"/>
+- <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
+ <property name="targets" value="install"/>
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
- <property name="version.suffix" value="3.103.0" />
+ <property name="version.suffix" value="3.104.0" />
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-04-16 07:36:13.000000000 -0500
@@ -20,12 +20,12 @@
@@ -328,7 +328,7 @@
<groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+ <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId>
- <version>3.103.2-SNAPSHOT</version>
+ <version>3.104.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
@@ -350,11 +350,11 @@
<phase>process-resources</phase>
<configuration>
<target>
-- <property name="machine_gtk3" value="1" />
-+ <!-- property name="machine_gtk3" value="1" / -->
+- <property name="machine_gtk3" value="1"/>
++ <!-- property name="machine_gtk3" value="1"/ -->
+ <property name="targets" value="install" />
<ant antfile="build.xml" target="build_libraries"/>
</target>
- </configuration>
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:26:16.000000000 -0500
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/.project 2014-04-16 07:36:05.000000000 -0500
@@ -1,6 +1,6 @@
@@ -564,7 +564,7 @@
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true
- Bundle-Version: 1.1.200.qualifier
+ Bundle-Version: 1.1.300.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
-Bundle-Localization: launcher.gtk.linux.x86
@@ -579,7 +579,7 @@
<groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
@@ -626,7 +626,7 @@
Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
- Bundle-Version: 1.1.200.qualifier
+ Bundle-Version: 1.1.300.qualifier
Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
-Bundle-Localization: launcher.gtk.linux.x86_64
@@ -641,7 +641,7 @@
<groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
+ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</artifactId>
- <version>1.1.200-SNAPSHOT</version>
+ <version>1.1.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
Modified: head/java/eclipse/files/patch-submodules
==============================================================================
--- head/java/eclipse/files/patch-submodules Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/files/patch-submodules Wed Dec 2 19:57:29 2015 (r402850)
@@ -1,16 +1,3 @@
-diff --git a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml
-index 5f21fad..7ef6f2e 100644
---- a/eclipse.jdt/org.eclipse.jdt-feature/pom.xml
-+++ b/eclipse.jdt/org.eclipse.jdt-feature/pom.xml
-@@ -56,6 +56,8 @@
- <excludes>
- <plugin id="org.eclipse.jdt"/>
- <plugin id="org.eclipse.jdt.doc.user"/>
-+ <plugin id="org.eclipse.jdt.launching.macosx"/>
-+ <plugin id="org.eclipse.jdt.launching.ui.macosx"/>
- </excludes>
- </configuration>
- </execution>
diff --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
index 1c2033f..e80dcd8 100644
--- a/eclipse.pde.build/org.eclipse.pde.build/scripts/productBuild/allElements.xml
@@ -75,34 +62,6 @@ index 5399a48..e395cb5 100644
return os;
}
-diff --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
-index 432b6e0..2d69832 100644
---- 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
-@@ -48,6 +48,8 @@ configs = *, *, *
- #configs=win32, win32, x86 & \
- # win32,win32,x86_64 & \
- # win32,win32,wpf & \
-+# freebsd, gtk, x86 & \
-+# freebsd, gtk, x86_64 & \
- # linux, gtk, ppc & \
- # linux, gtk, x86 & \
- # linux, gtk, x86_64 & \
-@@ -72,10 +74,12 @@ configs = *, *, *
- #The format of the archive. By default a zip is created using antZip.
- #The list can only contain the configuration for which the desired format is different than zip.
- #archivesFormat=win32, win32, x86 - antZip& \
-+# freebsd, gtk, x86 - antZip& \
-+# freebsd, gtk, x86_64 - antZip& \
- # linux, gtk, ppc - antZip &\
--# linux, gtk, x86 - antZip& \
-+# linux, gtk, x86 - antZip& \
- # linux, gtk, x86_64 - antZip& \
--# linux, motif, x86 - antZip& \
-+# linux, motif, x86 - antZip& \
- # solaris, motif, sparc - antZip& \
- # solaris, gtk, sparc - antZip& \
- # aix, motif, ppc - antZip& \
diff --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
index eac9576..9081501 100644
--- a/eclipse.pde.build/org.eclipse.pde.build/templates/packager/customTargets.xml
@@ -759,6 +718,19 @@ index 3c8c426..fa46f72 100644
presentation.add(implementation);
+diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
+index bcedc5e..a313d19 100644
+--- a/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
++++ b/eclipse.pde.ui/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/PropertiesSection.java
+@@ -106,7 +106,7 @@ public class PropertiesSection extends TableSection {
+ private IConfigurationProperty fEdit;
+ private Set<String> fExistingNames;
+
+- private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32};
++ private String[] COMBO_OSLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32, Platform.OS_FREEBSD};
+ private String[] COMBO_ARCHLABELS = new String[] {PDEUIMessages.PropertiesSection_All, Platform.ARCH_X86, Platform.ARCH_X86_64, Platform.ARCH_PPC, Platform.ARCH_IA64, Platform.ARCH_IA64_32, Platform.ARCH_PA_RISC, Platform.ARCH_SPARC};
+
+ public PropertyDialog(Shell shell, IConfigurationProperty property, Set<String> existingNames) {
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
index 7e7e8ac..72c8597 100644
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
@@ -771,23 +743,14 @@ index 7e7e8ac..72c8597 100644
<plugin id="org.eclipse.core.filesystem.linux.x86"/>
<plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
<plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
-@@ -70,11 +72,16 @@
- <plugin id="org.eclipse.core.filesystem.linux.ppc64"/>
+@@ -70,6 +71,7 @@
+ <plugin id="org.eclipse.core.filesystem.linux.ppc64le"/>
<plugin id="org.eclipse.core.resources.win32.x86"/>
<plugin id="org.eclipse.core.resources.win32.x86_64"/>
+ <plugin id="org.eclipse.core.net.freebsd.%%ECLIPSE_ARCH%%"/>
<plugin id="org.eclipse.core.net.linux.x86"/>
<plugin id="org.eclipse.core.net.linux.x86_64"/>
<plugin id="org.eclipse.core.net.win32.x86"/>
- <plugin id="org.eclipse.core.net.win32.x86_64"/>
- <plugin id="org.eclipse.equinox.security.macosx"/>
-+ <plugin id="org.eclipse.equinox.security.win32.x86"/>
-+ <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
-+ <plugin id="org.eclipse.compare.win32"/>
-+ <plugin id="org.eclipse.ui.win32"/>
- </excludes>
- </configuration>
- </execution>
diff --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
index d8c8edf..886e7d8 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml
@@ -834,17 +797,6 @@ diff --git a/eclipse.platform.resources/
index 7c8ad8c..b15bbf6 100644
--- 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
-@@ -49,8 +49,8 @@ public class SymlinkTest extends FileSystemTest {
- public static boolean isTestablePlatform() {
- // A Platform is testable if it supports the "ln -s" command.
- String os = Platform.getOS();
-- //currently we only support linux, solaris and mac os
-- if (os.equals(Platform.OS_LINUX) || os.equals(Platform.OS_SOLARIS) || os.equals(Platform.OS_MACOSX) || os.equals(Platform.OS_AIX)
-+ //currently we only support freebsd, linux, solaris and mac os
-+ 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)
- // ||os.equals(Platform.OS_HPUX)
- // || isWindowsVistaOrHigher()
- ) {
@@ -339,7 +339,7 @@ public class SymlinkTest extends FileSystemTest {
public void testSymlinkEnabled() {
String os = Platform.getOS();
@@ -1308,6 +1260,32 @@ index cc81dd1..fa992cd 100644
byte[] buffer = new byte[4];
long /*int*/ ptr = OS.malloc(4);
+diff --git a/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf b/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
+index 39c103e..d1b97c0 100644
+--- a/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
++++ b/eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf
+@@ -73,3 +73,8 @@ requires.17.namespace = org.eclipse.equinox.p2.iu
+ requires.17.name = org.eclipse.swt.gtk.hpux.ia64
+ requires.17.range = 0.0.0
+ requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64))
++
++requires.18.namespace = org.eclipse.equinox.p2.iu
++requires.18.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
++requires.18.range = 0.0.0
++requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%))
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+index 681fc0b..957a23f 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf
+@@ -85,3 +85,8 @@ requires.17.namespace = org.eclipse.equinox.p2.iu
+ requires.17.name = org.eclipse.swt.gtk.hpux.ia64
+ requires.17.range = [$version$,$version$]
+ requires.17.filter = (&(osgi.os=hpux)(osgi.ws=gtk)(osgi.arch=ia64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.18.namespace = org.eclipse.equinox.p2.iu
++requires.18.name = org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%
++requires.18.range = [$version$,$version$]
++requires.18.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=%%ECLIPSE_ARCH%%)(!(org.eclipse.swt.buildtime=true)))
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
index cc8d6f7..46c8f5a 100644
--- a/eclipse.platform.swt.binaries/pom.xml
@@ -1429,33 +1407,14 @@ diff --git a/eclipse.platform.ui/feature
index 918a8ff..ceb1b3e 100644
--- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
+++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml
-@@ -38,7 +38,26 @@
- <excludes>
- <plugin id="javax.xml"/>
- <plugin id="org.eclipse.swt"/>
-+ <plugin id="org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%"/>
-+ <plugin id="org.eclipse.swt.gtk.solaris.sparc"/>
-+ <plugin id="org.eclipse.swt.gtk.solaris.x86"/>
-+ <plugin id="org.eclipse.swt.cocoa.macosx"/>
-+ <plugin id="org.eclipse.swt.cocoa.macosx.x86_64"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.ppc"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.ppc64"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.ppc64le"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.x86"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.s390x"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.s390"/>
-+ <plugin id="org.eclipse.swt.gtk.linux.x86_64"/>
-+ <plugin id="org.eclipse.swt.gtk.aix.ppc"/>
-+ <plugin id="org.eclipse.swt.gtk.aix.ppc64"/>
-+ <plugin id="org.eclipse.swt.gtk.hpux.ia64"/>
-+ <plugin id="org.eclipse.swt.win32.win32.x86"/>
-+ <plugin id="org.eclipse.swt.win32.win32.x86_64"/>
-+ <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa"/>
- <plugin id="org.eclipse.equinox.launcher"/>
+@@ -48,6 +48,7 @@
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.freebsd.%%ECLIPSE_ARCH%%"/>
- <plugin id="org.eclipse.equinox.launcher.gtk.solaris.sparc"/>
- <plugin id="org.eclipse.equinox.launcher.gtk.solaris.x86"/>
- <plugin id="org.eclipse.equinox.launcher.cocoa.macosx"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.aix.ppc"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.aix.ppc64"/>
+ <plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml
index 32968af..6610342 100644
--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml
@@ -1744,15 +1703,51 @@ diff --git a/rt.equinox.framework/featur
index 156de22..7353724 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-@@ -343,6 +343,8 @@
- <include name="gtk/linux/ppc64/**/*" />
- <include name="gtk/linux/x86/**/*" />
- <include name="gtk/linux/x86_64/**/*" />
-+ <include name="gtk/freebsd/x86/**/*" />
-+ <include name="gtk/freebsd/x86_64/**/*" />
- <include name="gtk/solaris/sparc/**/*" />
- <include name="gtk/solaris/x86/**/*" />
- <include name="win32/win32/x86/**/*" />
+@@ -130,6 +130,36 @@
+
+ <profiles>
+ <profile>
++ <id>build-native-launchers-gtk.freebsd.%%ECLIPSE_ARCH%%</id>
++ <activation>
++ <property>
++ <name>native</name>
++ <value>gtk.freebsd.%%ECLIPSE_ARCH%%</value>
++ </property>
++ </activation>
++ <build>
++ <plugins>
++ <plugin>
++ <artifactId>maven-antrun-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>compile-executable-natives</id>
++ <phase>generate-resources</phase>
++ <configuration>
++ <target>
++ <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
++ </target>
++ </configuration>
++ <goals>
++ <goal>run</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
++ </plugins>
++ </build>
++ </profile>
++ <profile>
+ <id>build-native-launchers-gtk.linux.x86_64</id>
+ <activation>
+ <property>
+@@ -343,6 +373,7 @@
+ <include name="gtk/linux/ppc64le/**/*"/>
+ <include name="gtk/linux/x86/**/*"/>
+ <include name="gtk/linux/x86_64/**/*"/>
++ <include name="gtk/freebsd/%%ECLIPSE_ARCH%%/**/*"/>
+ <include name="gtk/solaris/sparc/**/*"/>
+ <include name="gtk/solaris/x86/**/*"/>
+ <include name="win32/win32/x86/**/*"/>
diff --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
index 0f30a87..36382de 100644
--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/resources/build.properties
Modified: head/java/eclipse/scripts/pre-patch
==============================================================================
--- head/java/eclipse/scripts/pre-patch Wed Dec 2 19:41:44 2015 (r402849)
+++ head/java/eclipse/scripts/pre-patch Wed Dec 2 19:57:29 2015 (r402850)
@@ -18,8 +18,7 @@ for d in \
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \
${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x* \
${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x* \
- ${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x* \
- ${WRKSRC}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bin/gtk/linux/x*
+ ${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x*
do
mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
[ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
More information about the svn-ports-head
mailing list