kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

java/eclipse: Upgrade version 4.3.2 => 4.4.2

Browse source 
Note that Eclipse now requires openJDK8 to build.

PR:		195985
Submitted by:	Jimmy Kelley (maintainer)
This commit is contained in:
John Marino 2015-03-21 10:40:50 +00:00
parent 0d8b37dcfa
commit bb867d1e1b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=381788
7 changed files with 1061 additions and 1169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
java/eclipse/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= eclipse PORTNAME= eclipse
PORTVERSION= 4.3.2 PORTVERSION= 4.4.2
PORTREVISION= 3
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/ MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \ DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
@ -11,7 +10,7 @@ DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
DIST_SUBDIR= eclipse DIST_SUBDIR= eclipse
MAINTAINER= ljboiler@gmail.com MAINTAINER= ljboiler@gmail.com
COMMENT= Eclipse Kepler SR-2 COMMENT= Eclipse Luna SR-2
LICENSE= EPL LICENSE= EPL
@ -27,11 +26,13 @@ USE_GL= glu
USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui
USE_JAVA= yes USE_JAVA= yes
JAVA_OS= native JAVA_OS= native
JAVA_VERSION= 1.7 JAVA_VERSION= 1.8
JAVA_VENDOR= openjdk JAVA_VENDOR= openjdk
JAVA_BUILD= yes JAVA_BUILD= yes
JAVA_RUN= 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
OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM
FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs) FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs)
@ -48,6 +49,12 @@ PATCH= gpatch
.endif .endif
PATCH_STRIP= -p1 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} WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION}
GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator
@ -57,7 +64,7 @@ MVN_SETTINGS+= --offline
ECLIPSE_WS= gtk ECLIPSE_WS= gtk
ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/} ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}
E_SHORTARCH= ${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} \ SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \
E_SHORTARCH=${E_SHORTARCH} E_SHORTARCH=${E_SHORTARCH}
PORTDESTDIR= ${PREFIX}/lib/eclipse PORTDESTDIR= ${PREFIX}/lib/eclipse
@ -88,7 +95,7 @@ post-patch:
do-build: 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/maven31 ${MVN_OPTS} \
mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \ 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: do-install:
@${RM} -rf ${STAGEDIR}${PORTDESTDIR} @${RM} -rf ${STAGEDIR}${PORTDESTDIR}

2
java/eclipse/Makefile.plugins
View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
NO_BUILD= yes NO_BUILD= yes
USE_JAVA= yes USE_JAVA= yes
JAVA_VERSION= 1.7 JAVA_VERSION= 1.7+
JAVA_OS= native JAVA_OS= native
REPO_DIRS?= features plugins REPO_DIRS?= features plugins

8
java/eclipse/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 2453b2f8e12c7cd90f15dc34519e785befb69ef014e07cd2b180f8a4d7b557cd SHA256 (eclipse/eclipse.platform.releng.aggregator-4.4.2.xz) = 93d9f028b840f18420b3e5193f8166ee431536f1b09a8a900144b7a4de62f791
SIZE (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 196545676 SIZE (eclipse/eclipse.platform.releng.aggregator-4.4.2.xz) = 214688453
SHA256 (eclipse/eclipse-maven-repo-4.3.2.xz) = f5288a26d9bdb22f5a455bba52f73589918c9bcff65bb667ae6d246467a61ca8 SHA256 (eclipse/eclipse-maven-repo-4.4.2.xz) = ee666bb69dd498553e50403514a1cdf332094dad6b66f03a8c38407048a92ddf
SIZE (eclipse/eclipse-maven-repo-4.3.2.xz) = 185972692 SIZE (eclipse/eclipse-maven-repo-4.4.2.xz) = 118457481

470
java/eclipse/files/patch-aggregator
View file

@ -2,20 +2,29 @@ diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index ce98be7..fa2d1e1 100644 index ce98be7..fa2d1e1 100644
--- a/eclipse-platform-parent/pom.xml --- a/eclipse-platform-parent/pom.xml
+++ b/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> </target>
<environments> <environments>
<environment> + <environment>
+ <os>freebsd</os> + <os>freebsd</os>
+ <ws>gtk</ws> + <ws>gtk</ws>
+ <arch>%%ECLIPSE_ARCH%%</arch> + <arch>%%ECLIPSE_ARCH%%</arch>
+ </environment> + </environment>
+<!-- +<!--
+ <environment> <environment>
<os>linux</os> <os>linux</os>
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86</arch> @@ -281,6 +287,7 @@
@@ -229,6 +235,7 @@
<ws>gtk</ws> <ws>gtk</ws>
<arch>ppc64</arch> <arch>ppc64</arch>
</environment> </environment>
@ -23,7 +32,7 @@ index ce98be7..fa2d1e1 100644
</environments> </environments>
</configuration> </configuration>
</plugin> </plugin>
@@ -308,11 +315,11 @@ @@ -360,11 +367,11 @@
<artifactId>tycho-packaging-plugin</artifactId> <artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho.version}</version> <version>${tycho.version}</version>
<dependencies> <dependencies>
@ -37,14 +46,14 @@ index ce98be7..fa2d1e1 100644
<dependency> <dependency>
<groupId>org.eclipse.tycho.extras</groupId> <groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-sourceref-jgit</artifactId> <artifactId>tycho-sourceref-jgit</artifactId>
@@ -322,14 +329,14 @@ @@ -374,14 +381,14 @@
<configuration> <configuration>
<strictBinIncludes>false</strictBinIncludes> <strictBinIncludes>false</strictBinIncludes>
<format>'v'yyyyMMdd-HHmm</format> <format>'v'yyyyMMdd-HHmm</format>
- <timestampProvider>jgit</timestampProvider> - <timestampProvider>jgit</timestampProvider>
+ <!--timestampProvider>jgit</timestampProvider--> + <!--timestampProvider>jgit</timestampProvider-->
<jgit.ignore> <jgit.ignore>
pom.xml pom.xml
</jgit.ignore> </jgit.ignore>
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree> <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
- <sourceReferences> - <sourceReferences>
@ -53,13 +62,13 @@ index ce98be7..fa2d1e1 100644
- </sourceReferences> - </sourceReferences>
+ </sourceReferences--> + </sourceReferences-->
<archive> <archive>
<addMavenDescriptor>false</addMavenDescriptor> <addMavenDescriptor>false</addMavenDescriptor>
</archive> </archive>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/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> <resolver>p2</resolver>
<environments> <environments>
<environment> <environment>
@ -72,7 +81,7 @@ index 81a82e1..dc2fdd9 100644
<os>linux</os> <os>linux</os>
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86</arch> <arch>x86</arch>
@@ -145,6 +156,7 @@ @@ -163,6 +169,7 @@
<ws>cocoa</ws> <ws>cocoa</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</environment> </environment>
@ -81,137 +90,101 @@ index 81a82e1..dc2fdd9 100644
</configuration> </configuration>
</plugin> </plugin>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -112,6 +112,7 @@ @@ -44,6 +44,12 @@
<configuration> <resolver>p2</resolver>
<formats> <environments>
<win32>zip</win32> <environment>
+ <freebsd>tar.gz</freebsd> + <os>freebsd</os>
<linux>tar.gz</linux> + <ws>gtk</ws>
<macosx>tar.gz</macosx> + <arch>%%ECLIPSE_ARCH%%</arch>
</formats> + </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 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
+++ b/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 @@ @@ -15,6 +15,8 @@
<property name="archiveRoot" value="launchers" /> <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" 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="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" 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="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" 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="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" /> <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 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
index 129d0a6..a8f76b6 100644 index 129d0a6..a8f76b6 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml --- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
@@ -278,6 +278,16 @@ @@ -278,6 +278,16 @@
fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" /> fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" />
<platform <platform
format="equinox" format="equinox"
+ id="SFG2" + id="SFG2"
+ name="FreeBSD (x86/GTK 2)" + name="FreeBSD (x86/GTK+)"
+ fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" /> + fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" />
+ <platform + <platform
+ format="equinox" + format="equinox"
+ id="SFG264" + id="SFG264"
+ name="FreeBSD (x86_64/GTK 2)" + name="FreeBSD (x86_64/GTK+)"
+ fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" /> + fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" />
+ <platform + <platform
+ format="equinox" + format="equinox"
id="SLG2" id="SLG2"
name="Linux (x86/GTK 2)" name="Linux (x86/GTK+)"
fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" /> fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" />
@@ -346,6 +356,16 @@ @@ -346,6 +356,16 @@
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" /> fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" />
<platform <platform
format="equinox" format="equinox"
+ id="ESFG2" + id="ESFG2"
+ name="FreeBSD (x86/GTK 2)" + name="FreeBSD (x86/GTK+)"
+ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" /> + fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" />
+ <platform + <platform
+ format="equinox" + format="equinox"
+ id="ESFG264" + id="ESFG264"
+ name="FreeBSD (x86_64/GTK 2)" + name="FreeBSD (x86_64/GTK+)"
+ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" /> + fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" />
+ <platform + <platform
+ format="equinox" + format="equinox"
id="ESLG2" id="ESLG2"
name="Linux (x86/GTK 2)" name="Linux (x86/GTK+)"
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" /> 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>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -91,6 +91,7 @@ @@ -68,6 +68,7 @@
<configuration> <configuration>
<formats> <formats>
<win32>zip</win32> <win32>zip</win32>
+ <freebsd>tar.gz</freebsd> + <freebsd>tar.gz</freebsd>
<linux>tar.gz</linux> <linux>tar.gz</linux>
<macosx>tar.gz</macosx> <macosx>tar.gz</macosx>
</formats> </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index c2f679b..742fe0b 100644 index c2f679b..742fe0b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@ -241,110 +214,168 @@ index c2f679b..742fe0b 100644
update.id = org.eclipse.platform.ide update.id = org.eclipse.platform.ide
update.range = [4.0,$version$) update.range = [4.0,$version$)
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -92,6 +92,7 @@ @@ -76,6 +76,7 @@
<configuration> <configuration>
<formats> <formats>
<win32>zip</win32> <win32>zip</win32>
+ <freebsd>tar.gz</freebsd> + <freebsd>tar.gz</freebsd>
<linux>tar.gz</linux> <linux>tar.gz</linux>
<macosx>tar.gz</macosx> <macosx>tar.gz</macosx>
</formats> </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/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 @@ -10,58 +10,9 @@
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.permissions.755=eclipse
+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse -root.win32.win32.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86
+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 -root.win32.win32.x86.permissions.755=eclipse.exe
+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse -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
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 -# Care is need there, for "macosx", as several forms will appear to work, but end up
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc -# having wrong value in the CFBundleIdentifier field, in the Info.plist, resulting
@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse -# in "application requires Java 6" (see bug 445026, and bug 457071)
root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse -# 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 bin.includes = feature.properties
-
-
-
-
-
-
-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -20,6 +20,25 @@ @@ -34,6 +34,45 @@
<version>2.6</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
+ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id> + <id>copy-resources-gtk.freebsd.x86</id>
+ <phase>validate</phase> + <phase>validate</phase>
+ <goals> + <goals>
+ <goal>copy-resources</goal> + <goal>copy-resources</goal>
+ </goals> + </goals>
+ <configuration> + <configuration>
+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory> + <outputDirectory>${basedir}/rootfiles/freebsd.gtk.x86</outputDirectory>
+ <resources> + <resources>
+ <resource> + <resource>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</directory> + <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86</directory>
+ <includes> + <includes>
+ <include>about_files/*</include> + <include>about_files/*</include>
+ <include>about.html</include> + <include>about.html</include>
+ </includes> + </includes>
+ </resource> + </resource>
+ </resources> + </resources>
+ </configuration> + </configuration>
+ </execution> + </execution>
+ <execution> + <execution>
<id>copy-resources-gtk.linux.x86</id> + <id>copy-resources-gtk.freebsd.x86_64</id>
<phase>validate</phase> + <phase>validate</phase>
<goals> + <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 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
@@ -91,6 +91,7 @@ @@ -61,6 +61,7 @@
<configuration> <configuration>
<formats> <formats>
<win32>zip</win32> <win32>zip</win32>
+ <freebsd>tar.gz</freebsd> + <freebsd>tar.gz</freebsd>
<linux>tar.gz</linux> <linux>tar.gz</linux>
<macosx>tar.gz</macosx> <macosx>tar.gz</macosx>
</formats> </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
@@ -91,6 +91,7 @@ @@ -61,6 +61,7 @@
<configuration> <configuration>
<formats> <formats>
<win32>zip</win32> <win32>zip</win32>
+ <freebsd>tar.gz</freebsd> + <freebsd>tar.gz</freebsd>
<linux>tar.gz</linux> <linux>tar.gz</linux>
<macosx>tar.gz</macosx> <macosx>tar.gz</macosx>
</formats> </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml 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 --- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
@@ -91,6 +91,7 @@ @@ -72,6 +72,7 @@
<configuration> <configuration>
<formats> <formats>
<win32>zip</win32> <win32>zip</win32>
+ <freebsd>tar.gz</freebsd> + <freebsd>tar.gz</freebsd>
<linux>tar.gz</linux> <linux>tar.gz</linux>
<macosx>tar.gz</macosx> <macosx>tar.gz</macosx>
</formats> </formats>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 6b59ed2..64975ba 100644 index 6b59ed2..64975ba 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf --- 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. # Restrict range so we are not an automatic update for 3.x.
update.id= org.eclipse.sdk.ide update.id= org.eclipse.sdk.ide
update.range = [4.0,$version$) update.range = [4.0,$version$)
--- a/pom.xml.orig 2014-06-05 16:00:15.000000000 -0500 diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+++ a/pom.xml 2014-06-19 18:03:47.000000000 -0500 --- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -50,6 +50,6 @@ +++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -35,6 +35,6 @@
<module>eclipse.platform.releng</module> <module>platform.sdk</module>
<module>eclipse.platform.releng.tychoeclipsebuilder</module> <module>sdk</module>
<module>eclipse-junit-tests</module>
- <module>eclipse.platform.repository</module> - <module>eclipse.platform.repository</module>
+<!-- <module>eclipse.platform.repository</module> --> + <!-- module>eclipse.platform.repository</module -->
</modules> </modules>
</project> </project>

334
java/eclipse/files/patch-freebsd_natives
View file

@ -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.orig 2014-04-15 21:04:15.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 2014-04-16 07:41:08.000000000 -0500
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
LIB_NAME_FULL = libunixfile_1_0_0.so LIB_NAME_FULL = libunixfile_1_0_0.so
@ -13,8 +13,8 @@
endif endif
JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} 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=-O2 -g -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+OPT_FLAGS=-O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +OPT_FLAGS=-O2 -g -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
core: core:
- gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C) - gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
@ -28,29 +28,33 @@
-install: core -install: core
- rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so - 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/ - 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/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.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 2014-04-16 07:17:42.000000000 -0500
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.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 Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
Bundle-Localization: fragment Bundle-Localization: fragment
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (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/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.freebsd.x86/pom.xml 2014-03-30 19:37:41.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
@@ -18,7 +18,7 @@ @@ -15,10 +15,10 @@
<relativePath>../../</relativePath> <artifactId>eclipse.platform.resources</artifactId>
<groupId>eclipse.platform.resources</groupId>
<version>4.4.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../../../</relativePath>
</parent> </parent>
<groupId>org.eclipse.core</groupId> <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId> - <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
+ <artifactId>org.eclipse.core.filesystem.freebsd.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> <packaging>eclipse-plugin</packaging>
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
@ -76,44 +80,67 @@
<configuration> <configuration>
<target> <target>
- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/> - <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/"> - <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
- <include name="libunixfile_*.so"/> - <include name="libunixfile_*.so"/>
- </fileset> - </fileset>
- </copy> - </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"/> + <mkdir dir="os/freebsd/x86"/>
+ <copy todir="os/freebsd/x86" > + <copy todir="os/freebsd/x86">
+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> + <fileset dir="../../natives/unix/freebsd/">
+ <include name="libunixfile_*.so"/> + <include name="libunixfile_*.so"/>
+ </fileset> + </fileset>
+ </copy> + </copy>
</target> </target>
</configuration> </configuration>
<goals> <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/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.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 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 @@ @@ -1,9 +1,9 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %fragmentName Bundle-Name: %fragmentName
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true -Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.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 Bundle-Vendor: %providerName
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
Bundle-Localization: fragment Bundle-Localization: fragment
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (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/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.freebsd.x86_64/pom.xml 2014-03-30 19:36:09.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
@@ -18,7 +18,7 @@ @@ -15,10 +15,10 @@
<relativePath>../../</relativePath> <artifactId>eclipse.platform.resources</artifactId>
<groupId>eclipse.platform.resources</groupId>
<version>4.4.0-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../../../../</relativePath>
</parent> </parent>
<groupId>org.eclipse.core</groupId> <groupId>org.eclipse.core</groupId>
- <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId> - <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
+ <artifactId>org.eclipse.core.filesystem.freebsd.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> <packaging>eclipse-plugin</packaging>
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
@ -140,49 +167,70 @@
<target> <target>
- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/> - <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
- <mkdir dir="os/linux/x86_64/"/> - <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/"> - <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
- <include name="libunixfile_*.so"/> - <include name="libunixfile_*.so"/>
- </fileset> - </fileset>
- </copy> - </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/"/> + <mkdir dir="os/freebsd/x86_64/"/>
+ <copy todir="os/freebsd/x86_64/" > + <copy todir="os/freebsd/x86_64/">
+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"> + <fileset dir="../../natives/unix/freebsd/">
+ <include name="libunixfile_*.so"/> + <include name="libunixfile_*.so"/>
+ </fileset> + </fileset>
+ </copy> + </copy>
</target> </target>
</configuration> </configuration>
<goals> <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.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.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 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 @@ @@ -2,7 +2,7 @@
Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName Bundle-Name: %fragmentName
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.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-ManifestVersion: 2
Bundle-Localization: fragment Bundle-Localization: fragment
@@ -30,6 +30,6 @@ @@ -30,7 +30,7 @@
org.eclipse.swt.internal.gtk; x-internal:=true, org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true, org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; 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=linux) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, SWT-WS: gtk
J2SE-1.3 -SWT-OS: linux
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500 +SWT-OS: freebsd
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-03-30 19:49:19.000000000 -0500 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 @@ @@ -20,12 +20,12 @@
<relativePath>../binaries-parent/</relativePath> <relativePath>../binaries-parent/</relativePath>
</parent> </parent>
<groupId>org.eclipse.swt</groupId> <groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId> - <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+ <artifactId>org.eclipse.swt.gtk.freebsd.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> <packaging>eclipse-plugin</packaging>
<properties> <properties>
@ -191,7 +239,7 @@
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86</arch> <arch>x86</arch>
<buildid>${buildId}</buildid> <buildid>${buildId}</buildid>
@@ -112,7 +112,7 @@ @@ -61,7 +61,7 @@
<property> <property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name> <name>native</name>
@ -200,8 +248,17 @@
</property> </property>
</activation> </activation>
<build> <build>
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-03-30 18:51:08.000000000 -0500 @@ -74,7 +74,7 @@
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-03-30 19:49:45.000000000 -0500 <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 @@ @@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir="."> -<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="linux" />
+ <property name="swt.os" value="freebsd" /> + <property name="swt.os" value="freebsd" />
<property name="swt.arch" value="x86" /> <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"/> + <property name="targets" value="install"/>
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
<property name="version.suffix" value="3.102.1" /> <property name="version.suffix" value="3.103.0" />
--- ./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/.project.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-03-30 19:52:06.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 @@ @@ -2,7 +2,7 @@
Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
Bundle-Name: %fragmentName Bundle-Name: %fragmentName
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.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-ManifestVersion: 2
Bundle-Localization: fragment Bundle-Localization: fragment
@@ -30,6 +30,6 @@ @@ -30,7 +30,7 @@
org.eclipse.swt.internal.gtk; x-internal:=true, org.eclipse.swt.internal.gtk; x-internal:=true,
org.eclipse.swt.internal.mozilla; x-internal:=true, org.eclipse.swt.internal.mozilla; x-internal:=true,
org.eclipse.swt.internal.opengl.glx; 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=linux) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, SWT-WS: gtk
J2SE-1.3 -SWT-OS: linux
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-03-30 18:51:08.000000000 -0500 +SWT-OS: freebsd
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-03-30 19:51:51.000000000 -0500 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 @@ @@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir="."> -<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="linux" />
+ <property name="swt.os" value="freebsd" /> + <property name="swt.os" value="freebsd" />
<property name="swt.arch" value="x86_64" /> <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"/> + <property name="targets" value="install"/>
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
<property name="version.suffix" value="3.102.1" /> <property name="version.suffix" value="3.103.0" />
--- ./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.orig 2014-04-15 21:26:16.000000000 -0500
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:51:36.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 @@ @@ -20,12 +20,12 @@
<relativePath>../binaries-parent/</relativePath> <relativePath>../binaries-parent/</relativePath>
</parent> </parent>
<groupId>org.eclipse.swt</groupId> <groupId>org.eclipse.swt</groupId>
- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> - <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+ <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId> + <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId>
<version>3.102.1-SNAPSHOT</version> <version>3.103.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<properties> <properties>
@ -268,7 +337,7 @@
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
<buildid>${buildId}</buildid> <buildid>${buildId}</buildid>
@@ -112,7 +112,7 @@ @@ -61,7 +61,7 @@
<property> <property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( --> <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name> <name>native</name>
@ -277,8 +346,27 @@
</property> </property>
</activation> </activation>
<build> <build>
--- ./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 @@ -74,7 +74,7 @@
+++ ./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 <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_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 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.swt.gtk.linux.x86_64</name>
+ <name>org.eclipse.swt.gtk.freebsd.x86_64</name>
<comment></comment>
<projects>
</projects>
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:26:24.000000000 -0500
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
Bundle-Name: %fragmentName Bundle-Name: %fragmentName
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
@ -290,8 +378,8 @@
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4
--- ./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 --- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./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 +++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml 2014-04-16 07:27:00.000000000 -0500
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<relativePath>../../../../</relativePath> <relativePath>../../../../</relativePath>
</parent> </parent>
@ -324,13 +412,13 @@
<configuration> <configuration>
<target> <target>
- <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/> - <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
- <copy todir="." > - <copy todir=".">
- <fileset dir="../../natives/unix/linux/"> - <fileset dir="../../natives/unix/linux/">
- <include name="libgnomeproxy-*.so"/> - <include name="libgnomeproxy-*.so"/>
- </fileset> - </fileset>
- </copy> - </copy>
+ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/> + <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
+ <copy todir="." > + <copy todir=".">
+ <fileset dir="../../natives/unix/freebsd/"> + <fileset dir="../../natives/unix/freebsd/">
+ <include name="libgnomeproxy-*.so"/> + <include name="libgnomeproxy-*.so"/>
+ </fileset> + </fileset>
@ -338,8 +426,8 @@
</target> </target>
</configuration> </configuration>
<goals> <goals>
--- ./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 --- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./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 +++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-04-16 07:27:11.000000000 -0500
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
# Contributors: # Contributors:
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
@ -347,8 +435,18 @@
-fragmentName = Proxy for Linux -fragmentName = Proxy for Linux
+fragmentName = Proxy for FreeBSD +fragmentName = Proxy for FreeBSD
providerName = Eclipse.org providerName = Eclipse.org
--- ./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 --- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./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 +++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/.project 2014-04-16 07:26:18.000000000 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.core.net.linux.x86</name>
+ <name>org.eclipse.core.net.freebsd.x86</name>
<comment></comment>
<projects>
</projects>
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:28:07.000000000 -0500
@@ -3,8 +3,8 @@ @@ -3,8 +3,8 @@
Bundle-Name: %fragmentName Bundle-Name: %fragmentName
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
@ -360,8 +458,8 @@
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) -Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-RequiredExecutionEnvironment: J2SE-1.4
--- ./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 --- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./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 +++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml 2014-04-16 07:28:28.000000000 -0500
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
<relativePath>../../../../</relativePath> <relativePath>../../../../</relativePath>
</parent> </parent>
@ -394,13 +492,13 @@
<configuration> <configuration>
<target> <target>
- <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/> - <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
- <copy todir="." > - <copy todir=".">
- <fileset dir="../../natives/unix/linux/"> - <fileset dir="../../natives/unix/linux/">
- <include name="libgnomeproxy-*.so"/> - <include name="libgnomeproxy-*.so"/>
- </fileset> - </fileset>
- </copy> - </copy>
+ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/> + <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
+ <copy todir="." > + <copy todir=".">
+ <fileset dir="../../natives/unix/freebsd/"> + <fileset dir="../../natives/unix/freebsd/">
+ <include name="libgnomeproxy-*.so"/> + <include name="libgnomeproxy-*.so"/>
+ </fileset> + </fileset>
@ -408,8 +506,8 @@
</target> </target>
</configuration> </configuration>
<goals> <goals>
--- ./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 --- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./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 +++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-04-16 07:28:39.000000000 -0500
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
# Contributors: # Contributors:
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
@ -417,8 +515,18 @@
-fragmentName = Proxy for Linux x86_64 -fragmentName = Proxy for Linux x86_64
+fragmentName = Proxy for FreeBSD x86_64 +fragmentName = Proxy for FreeBSD x86_64
providerName = Eclipse.org providerName = Eclipse.org
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig 2014-03-30 18:51:46.000000000 -0500 --- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 2014-03-30 19:42:55.000000000 -0500 +++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/.project 2014-04-16 07:28:03.000000000 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.core.net.linux.x86_64</name>
+ <name>org.eclipse.core.net.freebsd.x86_64</name>
<comment></comment>
<projects>
</projects>
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig 2014-04-15 21:27:02.000000000 -0500
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 2014-04-16 07:45:00.000000000 -0500
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
LIB_NAME = gnomeproxy.so LIB_NAME = gnomeproxy.so
LIB_NAME_FULL = libgnomeproxy-1.0.0.so LIB_NAME_FULL = libgnomeproxy-1.0.0.so
@ -448,8 +556,8 @@
@echo "Finished building target: $(LIB_NAME_FULL)" @echo "Finished building target: $(LIB_NAME_FULL)"
@echo " " @echo " "
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:56:10.000000000 -0500 --- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:54:41.000000000 -0500 +++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-04-16 07:49:58.000000000 -0500
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
@ -463,9 +571,9 @@
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
+Bundle-Localization: launcher.gtk.freebsd.x86 +Bundle-Localization: launcher.gtk.freebsd.x86
Eclipse-BundleShape: dir Eclipse-BundleShape: dir
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:56:10.000000000 -0500 --- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-03-30 19:54:29.000000000 -0500 +++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-04-23 10:04:13.000000000 -0500
@@ -18,13 +18,13 @@ @@ -18,12 +18,12 @@
<relativePath>../../launcher-binary-parent</relativePath> <relativePath>../../launcher-binary-parent</relativePath>
</parent> </parent>
<groupId>org.eclipse.equinox</groupId> <groupId>org.eclipse.equinox</groupId>
@ -475,14 +583,13 @@
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<properties> <properties>
<launcher-binary.version>1500</launcher-binary.version>
- <os>linux</os> - <os>linux</os>
+ <os>freebsd</os> + <os>freebsd</os>
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86</arch> <arch>x86</arch>
</properties> </properties>
--- ./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 --- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-04-15 21:32:54.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-03-30 19:54:51.000000000 -0500 +++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-04-16 07:50:08.000000000 -0500
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
# Contributors: # Contributors:
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
@ -490,8 +597,29 @@
-pluginName = Equinox Launcher Linux X86 Fragment -pluginName = Equinox Launcher Linux X86 Fragment
+pluginName = Equinox Launcher FreeBSD X86 Fragment +pluginName = Equinox Launcher FreeBSD X86 Fragment
providerName = Eclipse.org - Equinox providerName = Eclipse.org - Equinox
--- ./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 --- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project.orig 2014-04-15 21:32:54.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:55:31.000000000 -0500 +++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project 2014-04-16 07:49:39.000000000 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.launcher.gtk.linux.x86</name>
+ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86</name>
<comment></comment>
<projects>
</projects>
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 2014-07-25 20:10:23.000000000 -0500
@@ -10,7 +10,7 @@
###############################################################################
bin.includes = META-INF/,\
eclipse_*.so,\
- launcher.gtk.linux.x86.properties,\
+ launcher.gtk.freebsd.x86.properties,\
about.html
customBuildCallbacks=customBuildCallbacks.xml
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-04-15 21:32:54.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-04-16 07:51:22.000000000 -0500
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: %pluginName Bundle-Name: %pluginName
@ -505,9 +633,9 @@
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
+Bundle-Localization: launcher.gtk.freebsd.x86_64 +Bundle-Localization: launcher.gtk.freebsd.x86_64
Eclipse-BundleShape: dir Eclipse-BundleShape: dir
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-03-30 18:56:10.000000000 -0500 --- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-04-23 07:51:42.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:55:25.000000000 -0500 +++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-04-23 10:08:46.000000000 -0500
@@ -18,13 +18,13 @@ @@ -18,12 +18,12 @@
<relativePath>../../launcher-binary-parent</relativePath> <relativePath>../../launcher-binary-parent</relativePath>
</parent> </parent>
<groupId>org.eclipse.equinox</groupId> <groupId>org.eclipse.equinox</groupId>
@ -517,14 +645,13 @@
<packaging>eclipse-plugin</packaging> <packaging>eclipse-plugin</packaging>
<properties> <properties>
<launcher-binary.version>1500</launcher-binary.version>
- <os>linux</os> - <os>linux</os>
+ <os>freebsd</os> + <os>freebsd</os>
<ws>gtk</ws> <ws>gtk</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</properties> </properties>
--- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig 2014-03-30 18:56:11.000000000 -0500 --- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig 2014-04-15 21:32:58.000000000 -0500
+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak 2014-03-30 22:05:58.000000000 -0500 +++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak 2014-04-16 07:57:53.000000000 -0500
@@ -42,15 +42,15 @@ @@ -42,15 +42,15 @@
EXEC = $(PROGRAM_OUTPUT) EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY) DLL = $(PROGRAM_LIBRARY)
@ -537,7 +664,7 @@
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
-CFLAGS = ${M_ARCH} -g -s -Wall\ -CFLAGS = ${M_ARCH} -g -s -Wall\
+CFLAGS = ${M_ARCH} -g -s -Wall -pthread\ +CFLAGS = ${M_ARCH} -g -Wall -pthread\
-fpic \ -fpic \
- -DLINUX \ - -DLINUX \
+ -DFREEBSD \ + -DFREEBSD \
@ -566,8 +693,8 @@
install: all install: all
cp $(EXEC) $(OUTPUT_DIR) cp $(EXEC) $(OUTPUT_DIR)
--- ./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 --- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-07-25 19:31:29.000000000 -0500
+++ ./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 +++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-07-25 20:04:21.000000000 -0500
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
# Contributors: # Contributors:
# IBM Corporation - initial API and implementation # IBM Corporation - initial API and implementation
@ -575,3 +702,24 @@
-pluginName = Equinox Launcher Linux X86_64 Fragment -pluginName = Equinox Launcher Linux X86_64 Fragment
+pluginName = Equinox Launcher FreeBSD X86_64 Fragment +pluginName = Equinox Launcher FreeBSD X86_64 Fragment
providerName = Eclipse.org - Equinox providerName = Eclipse.org - Equinox
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project.orig 2014-04-15 21:32:54.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2014-04-16 07:51:09.000000000 -0500
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.equinox.launcher.gtk.linux.x86_64</name>
+ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</name>
<comment></comment>
<projects>
</projects>
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties.orig 2014-07-25 19:35:37.000000000 -0500
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2014-07-25 20:07:49.000000000 -0500
@@ -10,7 +10,7 @@
###############################################################################
bin.includes = META-INF/,\
eclipse_*.so,\
- launcher.gtk.linux.x86_64.properties,\
+ launcher.gtk.freebsd.x86_64.properties,\
about.html
customBuildCallbacks=customBuildCallbacks.xml

1380
java/eclipse/files/patch-submodules
View file

File diff suppressed because it is too large Load diff

17
java/eclipse/scripts/pre-patch
View file

@ -12,8 +12,7 @@ check_freebsd_mak ()
cp -p "$1" "${d}/make_freebsd.mak" cp -p "$1" "${d}/make_freebsd.mak"
} }
for d in ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x* \ for d in \
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x* \
${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \ ${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \
${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \ ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \ ${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \
@ -25,6 +24,20 @@ do
mkdir -p `echo $d | sed -e 's/linux/freebsd/'` 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 - ) [ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
done done
# "fragments" pieces
for d in \
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.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 - )
done
for d in \
${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x*
do
mkdir -p `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`
[ -d $d ] && ( cd $d; tar cf - . ) | ( cd `dirname $d`/`basename $d | sed -e 's/\.linux.*$//'`/fragments/`basename $d | sed -e 's/linux/freebsd/'`; tar xf - )
done
for d in `find ${WRKSRC} -type d -name \*freebsd\*` for d in `find ${WRKSRC} -type d -name \*freebsd\*`
do do