Date: Sat, 21 Mar 2015 10:40:51 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381788 - in head/java/eclipse: . files scripts Message-ID: <201503211040.t2LAepRt035365@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Mar 21 10:40:50 2015 New Revision: 381788 URL: https://svnweb.freebsd.org/changeset/ports/381788 QAT: https://qat.redports.org/buildarchive/r381788/ Log: java/eclipse: Upgrade version 4.3.2 => 4.4.2 Note that Eclipse now requires openJDK8 to build. PR: 195985 Submitted by: Jimmy Kelley (maintainer) Modified: head/java/eclipse/Makefile head/java/eclipse/Makefile.plugins head/java/eclipse/distinfo 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 Sat Mar 21 09:54:46 2015 (r381787) +++ head/java/eclipse/Makefile Sat Mar 21 10:40:50 2015 (r381788) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= eclipse -PORTVERSION= 4.3.2 -PORTREVISION= 3 +PORTVERSION= 4.4.2 CATEGORIES= java devel MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/ DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \ @@ -11,7 +10,7 @@ DISTFILES= eclipse.platform.releng.aggre DIST_SUBDIR= eclipse MAINTAINER= ljboiler@gmail.com -COMMENT= Eclipse Kepler SR-2 +COMMENT= Eclipse Luna SR-2 LICENSE= EPL @@ -27,11 +26,13 @@ USE_GL= glu USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui USE_JAVA= yes JAVA_OS= native -JAVA_VERSION= 1.7 +JAVA_VERSION= 1.8 JAVA_VENDOR= openjdk JAVA_BUILD= yes JAVA_RUN= yes +OPTIONS_DEFINE= SWT_GTK3_SUPPORT +SWT_GTK3_SUPPORT_DESC= Enable GTK3 support in SWT (GUI) OPTIONS_SINGLE= INSTALLPKG OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs) @@ -48,6 +49,12 @@ PATCH= gpatch .endif PATCH_STRIP= -p1 +.if ${PORT_OPTIONS:MSWT_GTK3_SUPPORT} +USE_GNOME+= gtk30 +LIB_DEPENDS+= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 +MVN_SETTINGS+= -Dmachine_gtk3=1 +.endif + WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION} GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator @@ -57,7 +64,7 @@ MVN_SETTINGS+= --offline ECLIPSE_WS= gtk ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/} E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//} -ECLIPSE_BUILDID=M20140224-0627 +ECLIPSE_BUILDID=M20150204-1700 SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \ E_SHORTARCH=${E_SHORTARCH} PORTDESTDIR= ${PREFIX}/lib/eclipse @@ -88,7 +95,7 @@ post-patch: do-build: @(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \ mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \ - -DbuildId=${ECLIPSE_BUILDID} -Pupdate-branding-plugins) + -DbuildId=${ECLIPSE_BUILDID}) do-install: @${RM} -rf ${STAGEDIR}${PORTDESTDIR} Modified: head/java/eclipse/Makefile.plugins ============================================================================== --- head/java/eclipse/Makefile.plugins Sat Mar 21 09:54:46 2015 (r381787) +++ head/java/eclipse/Makefile.plugins Sat Mar 21 10:40:50 2015 (r381788) @@ -1,7 +1,7 @@ # $FreeBSD$ NO_BUILD= yes USE_JAVA= yes -JAVA_VERSION= 1.7 +JAVA_VERSION= 1.7+ JAVA_OS= native REPO_DIRS?= features plugins Modified: head/java/eclipse/distinfo ============================================================================== --- head/java/eclipse/distinfo Sat Mar 21 09:54:46 2015 (r381787) +++ head/java/eclipse/distinfo Sat Mar 21 10:40:50 2015 (r381788) @@ -1,4 +1,4 @@ -SHA256 (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 2453b2f8e12c7cd90f15dc34519e785befb69ef014e07cd2b180f8a4d7b557cd -SIZE (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 196545676 -SHA256 (eclipse/eclipse-maven-repo-4.3.2.xz) = f5288a26d9bdb22f5a455bba52f73589918c9bcff65bb667ae6d246467a61ca8 -SIZE (eclipse/eclipse-maven-repo-4.3.2.xz) = 185972692 +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 Modified: head/java/eclipse/files/patch-aggregator ============================================================================== --- head/java/eclipse/files/patch-aggregator Sat Mar 21 09:54:46 2015 (r381787) +++ head/java/eclipse/files/patch-aggregator Sat Mar 21 10:40:50 2015 (r381788) @@ -2,20 +2,29 @@ diff --git a/eclipse-platform-parent/pom index ce98be7..fa2d1e1 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml -@@ -155,6 +155,12 @@ +@@ -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> </target> <environments> - <environment> ++ <environment> + <os>freebsd</os> + <ws>gtk</ws> + <arch>%%ECLIPSE_ARCH%%</arch> + </environment> +<!-- -+ <environment> + <environment> <os>linux</os> <ws>gtk</ws> - <arch>x86</arch> -@@ -229,6 +235,7 @@ +@@ -281,6 +287,7 @@ <ws>gtk</ws> <arch>ppc64</arch> </environment> @@ -23,7 +32,7 @@ index ce98be7..fa2d1e1 100644 </environments> </configuration> </plugin> -@@ -308,11 +315,11 @@ +@@ -360,11 +367,11 @@ <artifactId>tycho-packaging-plugin</artifactId> <version>${tycho.version}</version> <dependencies> @@ -37,14 +46,14 @@ index ce98be7..fa2d1e1 100644 <dependency> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-sourceref-jgit</artifactId> -@@ -322,14 +329,14 @@ +@@ -374,14 +381,14 @@ <configuration> <strictBinIncludes>false</strictBinIncludes> <format>'v'yyyyMMdd-HHmm</format> - <timestampProvider>jgit</timestampProvider> + <!--timestampProvider>jgit</timestampProvider--> <jgit.ignore> - pom.xml + pom.xml </jgit.ignore> <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree> - <sourceReferences> @@ -53,13 +62,13 @@ index ce98be7..fa2d1e1 100644 - </sourceReferences> + </sourceReferences--> <archive> - <addMavenDescriptor>false</addMavenDescriptor> + <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 81a82e1..dc2fdd9 100644 +index 7e6fd26..f1773e0 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml -@@ -121,6 +121,12 @@ +@@ -139,6 +139,12 @@ <resolver>p2</resolver> <environments> <environment> @@ -72,7 +81,7 @@ index 81a82e1..dc2fdd9 100644 <os>linux</os> <ws>gtk</ws> <arch>x86</arch> -@@ -145,6 +156,7 @@ +@@ -163,6 +169,7 @@ <ws>cocoa</ws> <arch>x86_64</arch> </environment> @@ -81,137 +90,101 @@ index 81a82e1..dc2fdd9 100644 </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 60e4299..4c9106e 100644 +index c7f7ca9..1387a12 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml -@@ -112,6 +112,7 @@ - <configuration> - <formats> - <win32>zip</win32> -+ <freebsd>tar.gz</freebsd> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> +@@ -44,6 +44,12 @@ + <resolver>p2</resolver> + <environments> + <environment> ++ <os>freebsd</os> ++ <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> + <win32>zip</win32> ++ <freebsd>tar.gz</freebsd> + <linux>tar.gz</linux> + <macosx>tar.gz</macosx> + </formats> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml -index 14b8336..0b97442 100644 +index 2bc2ddf..96b6c41 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml @@ -15,6 +15,8 @@ - <property name="archiveRoot" value="launchers" /> - <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" /> - <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> -+ <buildRepos os="freebsd" ws="gtk" arch="x86" archiveName="${archiveRoot}-freebsd.gtk.x86.${buildId}.tar.gz" /> -+ <buildRepos os="freebsd" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-freebsd.gtk.x86_64.${buildId}.tar.gz" /> - <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" /> - <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" /> - <buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" /> + <property name="archiveRoot" value="launchers" /> + <buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" /> + <buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" /> ++ <buildRepos os="freebsd" ws="gtk" arch="x86" archiveName="${archiveRoot}-freebsd.gtk.x86.${buildId}.tar.gz" /> ++ <buildRepos os="freebsd" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-freebsd.gtk.x86_64.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" /> + <buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" /> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml index 129d0a6..a8f76b6 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml @@ -278,6 +278,16 @@ - fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> - <platform - format="equinox" -+ id="SFG2" -+ name="FreeBSD (x86/GTK 2)" -+ fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" /> -+ <platform -+ format="equinox" -+ id="SFG264" -+ name="FreeBSD (x86_64/GTK 2)" -+ fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" /> -+ <platform -+ format="equinox" - id="SLG2" - name="Linux (x86/GTK 2)" - fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" /> + fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> + <platform + format="equinox" ++ id="SFG2" ++ name="FreeBSD (x86/GTK+)" ++ fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" /> ++ <platform ++ format="equinox" ++ id="SFG264" ++ name="FreeBSD (x86_64/GTK+)" ++ fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" /> ++ <platform ++ format="equinox" + id="SLG2" + name="Linux (x86/GTK+)" + fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" /> @@ -346,6 +356,16 @@ - fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> - <platform - format="equinox" -+ id="ESFG2" -+ name="FreeBSD (x86/GTK 2)" -+ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" /> -+ <platform -+ format="equinox" -+ id="ESFG264" -+ name="FreeBSD (x86_64/GTK 2)" -+ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" /> -+ <platform -+ format="equinox" - id="ESLG2" - name="Linux (x86/GTK 2)" - fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" /> -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties -index 80a32e4..fcb7ed5 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties -+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties -@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse - root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 - root.solaris.gtk.x86.permissions.755=eclipse - -+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 -+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse -+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 -+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,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.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc -@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse - root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse - - bin.includes = feature.properties -- -- -- -- -- -- -- -diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml -index 2c342a3..5e27062 100644 ---- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml -+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml -@@ -20,6 +20,25 @@ - <version>2.6</version> - <executions> - <execution> -+ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id> -+ <phase>validate</phase> -+ <goals> -+ <goal>copy-resources</goal> -+ </goals> -+ <configuration> -+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory> -+ <resources> -+ <resource> -+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</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> + fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> + <platform + format="equinox" ++ id="ESFG2" ++ name="FreeBSD (x86/GTK+)" ++ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" /> ++ <platform ++ format="equinox" ++ id="ESFG264" ++ name="FreeBSD (x86_64/GTK+)" ++ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" /> ++ <platform ++ format="equinox" + 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 bc261f9..88e8522 100644 +index 0025a72..df900e7 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml -@@ -91,6 +91,7 @@ - <configuration> - <formats> - <win32>zip</win32> -+ <freebsd>tar.gz</freebsd> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> +@@ -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 @@ -241,110 +214,168 @@ index c2f679b..742fe0b 100644 update.id = org.eclipse.platform.ide update.range = [4.0,$version$) diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml -index d8468e6..b6c77d5 100644 +index 502b599..5b885e5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml -@@ -92,6 +92,7 @@ - <configuration> - <formats> - <win32>zip</win32> -+ <freebsd>tar.gz</freebsd> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> +@@ -76,6 +76,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.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -index 80a32e4..fcb7ed5 100644 +index 01c7934..c34148c 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties -@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse - root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 - root.solaris.gtk.x86.permissions.755=eclipse +@@ -10,58 +10,9 @@ + ############################################################################### -+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 -+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse -+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 -+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,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.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc -@@ -69,10 +74,3 @@ 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.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.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 +- +-# from org.eclipse.equinox.core.feature +-#root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe +-#root.win32.win32.x86_64=file:executables/win32.win32.x86_64/eclipsec.exe +- +-root.aix.gtk.ppc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc +-root.aix.gtk.ppc.permissions.755=eclipse +-root.aix.gtk.ppc64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/aix/ppc64 +-root.aix.gtk.ppc64.permissions.755=eclipse +- +-root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le +-root.linux.gtk.ppc64le.permissions.755=eclipse +- +-root.hpux.gtk.ia64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/hpux/ia64 +-root.hpux.gtk.ia64.permissions.755=eclipse +- +-root.solaris.gtk.sparc=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/sparc +-root.solaris.gtk.sparc.permissions.755=eclipse +-root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86 +-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.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.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 bb03da8..75632a0 100644 +index ead6cd7..550bf70 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml -@@ -20,6 +20,25 @@ - <version>2.6</version> - <executions> - <execution> -+ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id> -+ <phase>validate</phase> -+ <goals> -+ <goal>copy-resources</goal> -+ </goals> -+ <configuration> -+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory> -+ <resources> -+ <resource> -+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</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> +@@ -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 0ea4fd3..5bd93db 100644 +index a849a55..ea72ce5 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml -@@ -91,6 +91,7 @@ - <configuration> - <formats> - <win32>zip</win32> -+ <freebsd>tar.gz</freebsd> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> +@@ -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 ce76451..3b40705 100644 +index 10b9b9f..b5a238b 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml -@@ -91,6 +91,7 @@ - <configuration> - <formats> - <win32>zip</win32> -+ <freebsd>tar.gz</freebsd> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> +@@ -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 bf2f66a..5a37141 100644 +index 29be78c..207a934 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml -@@ -91,6 +91,7 @@ - <configuration> - <formats> - <win32>zip</win32> -+ <freebsd>tar.gz</freebsd> - <linux>tar.gz</linux> - <macosx>tar.gz</macosx> - </formats> +@@ -72,6 +72,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/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 @@ -373,13 +404,14 @@ index 6b59ed2..64975ba 100644 # Restrict range so we are not an automatic update for 3.x. update.id= org.eclipse.sdk.ide update.range = [4.0,$version$) ---- a/pom.xml.orig 2014-06-05 16:00:15.000000000 -0500 -+++ a/pom.xml 2014-06-19 18:03:47.000000000 -0500 -@@ -50,6 +50,6 @@ - - <module>eclipse.platform.releng</module> - <module>eclipse.platform.releng.tychoeclipsebuilder</module> +diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml +--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml ++++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml +@@ -35,6 +35,6 @@ + <module>platform.sdk</module> + <module>sdk</module> + <module>eclipse-junit-tests</module> - <module>eclipse.platform.repository</module> -+<!-- <module>eclipse.platform.repository</module> --> ++ <!-- module>eclipse.platform.repository</module --> </modules> </project> Modified: head/java/eclipse/files/patch-freebsd_natives ============================================================================== --- head/java/eclipse/files/patch-freebsd_natives Sat Mar 21 09:54:46 2015 (r381787) +++ head/java/eclipse/files/patch-freebsd_natives Sat Mar 21 10:40:50 2015 (r381788) @@ -1,5 +1,5 @@ ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2014-03-30 18:38:29.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2014-03-30 19:41:07.000000000 -0500 +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2014-04-16 07:41:08.000000000 -0500 @@ -17,7 +17,7 @@ LIB_NAME_FULL = libunixfile_1_0_0.so @@ -13,8 +13,8 @@ endif JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} --OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -+OPT_FLAGS=-O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-OPT_FLAGS=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ++OPT_FLAGS=-O2 -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 core: - gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) @@ -28,29 +28,33 @@ -install: core - rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so - mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/ ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:32:26.000000000 -0500 +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:17:42.000000000 -0500 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true - Bundle-Version: 1.4.100.qualifier + Bundle-Version: 1.4.200.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-03-30 19:37:41.000000000 -0500 -@@ -18,7 +18,7 @@ - <relativePath>../../</relativePath> +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-04-16 07:17:22.000000000 -0500 +@@ -15,10 +15,10 @@ + <artifactId>eclipse.platform.resources</artifactId> + <groupId>eclipse.platform.resources</groupId> + <version>4.4.0-SNAPSHOT</version> +- <relativePath>../../</relativePath> ++ <relativePath>../../../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> - <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId> + <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId> - <version>1.4.100-SNAPSHOT</version> + <version>1.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> @@ -33,7 +33,7 @@ @@ -76,44 +80,67 @@ <configuration> <target> - <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/> -- <copy todir="os/linux/x86" > +- <copy todir="os/linux/x86"> - <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/"> - <include name="libunixfile_*.so"/> - </fileset> - </copy> -+ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/> ++ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/> + <mkdir dir="os/freebsd/x86"/> -+ <copy todir="os/freebsd/x86" > -+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> ++ <copy todir="os/freebsd/x86"> ++ <fileset dir="../../natives/unix/freebsd/"> + <include name="libunixfile_*.so"/> + </fileset> + </copy> </target> </configuration> <goals> ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:33:50.000000000 -0500 +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/fragment.properties 2014-04-16 07:17:34.000000000 -0500 +@@ -8,5 +8,5 @@ + # Contributors: + # IBM Corporation - initial API and implementation + ############################################################################### +-fragmentName = Core File System for Linux ++fragmentName = Core File System for FreeBSD + providerName = Eclipse.org +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86/.project 2014-04-16 07:16:45.000000000 -0500 +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> +- <name>org.eclipse.core.filesystem.linux.x86</name> ++ <name>org.eclipse.core.filesystem.freebsd.x86</name> + <comment></comment> + <projects> + </projects> +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:20:17.000000000 -0500 @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %fragmentName -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true - Bundle-Version: 1.2.100.qualifier + Bundle-Version: 1.2.200.qualifier Bundle-Vendor: %providerName Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" Bundle-Localization: fragment -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) ---- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500 -+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-03-30 19:36:09.000000000 -0500 -@@ -18,7 +18,7 @@ - <relativePath>../../</relativePath> +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-04-16 07:19:54.000000000 -0500 +@@ -15,10 +15,10 @@ + <artifactId>eclipse.platform.resources</artifactId> + <groupId>eclipse.platform.resources</groupId> + <version>4.4.0-SNAPSHOT</version> +- <relativePath>../../</relativePath> ++ <relativePath>../../../../</relativePath> </parent> <groupId>org.eclipse.core</groupId> - <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId> + <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId> - <version>1.2.100-SNAPSHOT</version> + <version>1.2.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> @@ -33,7 +33,7 @@ @@ -140,49 +167,70 @@ <target> - <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/> - <mkdir dir="os/linux/x86_64/"/> -- <copy todir="os/linux/x86_64/" > +- <copy todir="os/linux/x86_64/"> - <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/"> - <include name="libunixfile_*.so"/> - </fileset> - </copy> -+ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/> ++ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/> + <mkdir dir="os/freebsd/x86_64/"/> -+ <copy todir="os/freebsd/x86_64/" > -+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> ++ <copy todir="os/freebsd/x86_64/"> ++ <fileset dir="../../natives/unix/freebsd/"> + <include name="libunixfile_*.so"/> + </fileset> + </copy> </target> </configuration> <goals> ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:08.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:50:51.000000000 -0500 +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/fragment.properties 2014-04-16 07:20:05.000000000 -0500 +@@ -8,5 +8,5 @@ + # Contributors: + # IBM Corporation - initial API and implementation + ############################################################################### +-fragmentName = Core File System for Linux ++fragmentName = Core File System for FreeBSD + providerName = Eclipse.org +--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project.orig 2014-04-15 21:04:15.000000000 -0500 ++++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments/org.eclipse.core.filesystem.freebsd.x86_64/.project 2014-04-16 07:19:20.000000000 -0500 +@@ -1,6 +1,6 @@ + <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> +- <name>org.eclipse.core.filesystem.linux.x86_64</name> ++ <name>org.eclipse.core.filesystem.freebsd.x86_64</name> + <comment></comment> + <projects> + </projects> +--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500 ++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:31:38.000000000 -0500 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName 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.102.1.qualifier + Bundle-Version: 3.103.2.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment -@@ -30,6 +30,6 @@ +@@ -30,7 +30,7 @@ org.eclipse.swt.internal.gtk; x-internal:=true, org.eclipse.swt.internal.mozilla; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) - Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, - J2SE-1.3 ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-03-30 19:49:19.000000000 -0500 + SWT-WS: gtk +-SWT-OS: linux ++SWT-OS: freebsd + SWT-Arch: x86 +--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-04-15 21:26:16.000000000 -0500 ++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-04-16 07:31:27.000000000 -0500 @@ -20,12 +20,12 @@ <relativePath>../binaries-parent/</relativePath> </parent> <groupId>org.eclipse.swt</groupId> - <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId> - <version>3.102.1-SNAPSHOT</version> + <version>3.103.2-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> @@ -191,7 +239,7 @@ <ws>gtk</ws> <arch>x86</arch> <buildid>${buildId}</buildid> -@@ -112,7 +112,7 @@ +@@ -61,7 +61,7 @@ <property> <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> <name>native</name> @@ -200,8 +248,17 @@ </property> </activation> <build> ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-03-30 18:51:08.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-03-30 19:49:45.000000000 -0500 +@@ -74,7 +74,7 @@ + <phase>process-resources</phase> + <configuration> + <target> +- <property name="machine_gtk3" value="1" /> ++ <!-- property name="machine_gtk3" value="1" / --> + <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 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir="."> @@ -211,32 +268,44 @@ - <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_xpcominit install"/> +- <property name="targets" value="make_mozilla make_xulrunner make_xulrunner24 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.102.1" /> ---- ./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 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:52:06.000000000 -0500 + <property name="version.suffix" value="3.103.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 @@ + <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> +- <name>org.eclipse.swt.gtk.linux.x86</name> ++ <name>org.eclipse.swt.gtk.freebsd.x86</name> + <comment></comment> + <projects> + </projects> +--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:26:16.000000000 -0500 ++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:36:19.000000000 -0500 @@ -2,7 +2,7 @@ Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Bundle-Name: %fragmentName 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.102.1.qualifier + Bundle-Version: 3.103.2.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: fragment -@@ -30,6 +30,6 @@ +@@ -30,7 +30,7 @@ org.eclipse.swt.internal.gtk; x-internal:=true, org.eclipse.swt.internal.mozilla; x-internal:=true, org.eclipse.swt.internal.opengl.glx; x-internal:=true -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) - Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, - J2SE-1.3 ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-03-30 18:51:08.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-03-30 19:51:51.000000000 -0500 + SWT-WS: gtk +-SWT-OS: linux ++SWT-OS: freebsd + SWT-Arch: x86_64 +--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-04-15 21:26:16.000000000 -0500 ++++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-04-16 07:35:58.000000000 -0500 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir="."> @@ -246,20 +315,20 @@ - <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_xpcominit install"/> +- <property name="targets" value="make_mozilla make_xulrunner make_xulrunner24 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.102.1" /> ---- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500 -+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:51:36.000000000 -0500 + <property name="version.suffix" value="3.103.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 @@ <relativePath>../binaries-parent/</relativePath> </parent> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503211040.t2LAepRt035365>