diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2009-02-15 03:19:44 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2009-02-15 03:19:44 +0000 |
| commit | 98c91f0659633010ec6ff12d7dd9352270acd2c7 (patch) | |
| tree | 63babb95eb65a71045c577895a5530cf7cdd7129 /java | |
| parent | - Fix MASTERSITES (diff) | |
. Update to 3.4.1 (from eclipse-devel).
Notes
Notes:
svn path=/head/; revision=228357
Diffstat (limited to 'java')
156 files changed, 2802 insertions, 4654 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 73ef24ef9a53..2e4eb88de13f 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eclipse -PORTVERSION= 3.3.2 +PORTVERSION= 3.4.1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200802211800 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-200809111700 DISTNAME= eclipse-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse @@ -17,8 +17,9 @@ MAINTAINER= freebsd-eclipse@FreeBSD.org COMMENT= An open extensible IDE for anything and nothing in particular BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ - zip:${PORTSDIR}/archivers/zip -BUILD_DEPENDS+= ${EXTRACT_DEPENDS} + zip:${PORTSDIR}/archivers/zip \ + unzip:${PORTSDIR}/archivers/unzip +PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch ECLIPSE= ${PORTNAME} @@ -27,12 +28,14 @@ USE_GMAKE= yes USE_ZIP= yes USE_GL= glu +PATCH= ${LOCALBASE}/bin/gpatch + .if !defined(WITHOUT_MOZILLA) -USE_GECKO= xulrunner firefox mozilla seamonkey +USE_GECKO= firefox xulrunner seamonkey .endif USE_JAVA= yes -JAVA_VERSION= 1.5+ +JAVA_VERSION= 1.6 JAVA_OS= native NO_WRKSUBDIR= yes @@ -60,10 +63,6 @@ MAKE_CAIRO= make_cairo .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 700000 -JAVA_VERSION= 1.6 -.endif - .if ${OSVERSION} >= 800000 JAVA_VENDOR= bsdjava .endif @@ -96,36 +95,62 @@ MAKE_ENV+= BROWSER=${BROWSER} \ PLIST_FILES= bin/${ECLIPSE} share/applications/${ECLIPSE}.desktop -SWTCAIRO=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library +SWTBASE=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT SWTGTK=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla +ECLIPSE_IU=FreeBSD Eclipse SDK +ECLIPSE_IU_VERSION=${PORTVERSION}.${PORTREVISION} + post-patch: - @${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile" ${FILESDIR}/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile - @${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.update.core.freebsd/src/update.c" ${FILESDIR}/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/build.xml" ${FILESDIR}/post-patch-plugins-swt-PI-gtk-library-build.xml - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak - @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/MozillaDelegate.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/org/eclipse/swt/internal/gtk/OS.java" ${FILESDIR}/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/gtk/library/os.c" ${FILESDIR}/post-patch-plugins-swt-gtk-library-os.c - @${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java" ${FILESDIR}/post-patch-plugins-swt-gtk-swt-FileDialog.java - - @${REINPLACE_CMD} -e 's|%%GECKO%%|${GECKO}|g' \ - "${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh" \ - "${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak" - @${RM} ${WRKSRC}/features/org.eclipse.platform/build.xml - @${CP} ${FILESDIR}/org.eclipse.platform-build.xml ${WRKSRC}/features/org.eclipse.platform/build.xml - @${RM} ${WRKSRC}/features/org.eclipse.rcp/build.xml - @${CP} ${FILESDIR}/org.eclipse.rcp-build.xml ${WRKSRC}/features/org.eclipse.rcp/build.xml + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTBASE}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTBASE}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-DirectoryDialog.java + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTGTK}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTGTK}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.xml + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTGTK}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-make_freebsd.mak + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTGTK}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-org-eclipse-swt-internal-gtk-OS.java + @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTMOZ}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_Mozilla-gtk-org-eclipse-swt-browser-MozillaDelegate.java do-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \ ./build -os ${ECLIPSE_OS} -ws ${ECLIPSE_WS} -arch ${ECLIPSE_ARCH} -compilelibs) + @${JAVA} \ + -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ + -data ${WRKSRC}/workspace \ + -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ + -flavor tooling \ + -metadataRepositoryName "FreeBSD Eclipse" \ + -artifactRepositoryName "FreeBSD Eclipse" \ + -metadataRepository "file:${WRKSRC}/eclipse/metadata" \ + -artifactRepository "file:${WRKSRC}/eclipse/metadata" \ + -root "${ECLIPSE_IU}" \ + -rootVersion "${ECLIPSE_IU_VERSION}" \ + -source ${WRKSRC}/eclipse \ + -append \ + -publishArtifacts do-install: @${MKDIR} ${PORTDESTDIR} - @${CP} -R ${WRKSRC}/eclipse/ ${PORTDESTDIR} + @${JAVA} \ + -Declipse.p2.data.area="file:${PORTDESTDIR}/p2" \ + -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ + -data ${WRKSRC}/workspace \ + -application org.eclipse.equinox.p2.director.app.application \ + -flavor tooling \ + -metadataRepository "file:${WRKSRC}/eclipse/metadata" \ + -artifactRepository "file:${WRKSRC}/eclipse/metadata" \ + -installIU "${ECLIPSE_IU}" \ + -version "${ECLIPSE_IU_VERSION}" \ + -p2.os ${ECLIPSE_OS} \ + -p2.ws ${ECLIPSE_WS} \ + -p2.arch ${ECLIPSE_ARCH} \ + -profile SDKProfile \ + -profileProperties org.eclipse.update.install.features=true \ + -destination "${PORTDESTDIR}" \ + -bundlepool "${PORTDESTDIR}" \ + -roaming + (cd ${WRKSRC}/eclipse; \ + ${CP} -R about.html epl-v10.html icon.xpm notice.html readme ${PORTDESTDIR}) @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ @@ -134,31 +159,33 @@ do-install: -e "s+%%BROWSER%%+${BROWSER}+g" \ -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \ -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \ - ${FILESDIR}/eclipse.in > ${WRKSRC}/eclipse.tmp + ${FILESDIR}/eclipse.in > ${WRKSRC}/eclipse.tmp .if defined(JAVA_VENDOR) - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \ ${WRKSRC}/eclipse.tmp .else - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \ ${WRKSRC}/eclipse.tmp .endif - ${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${ECLIPSE} + @${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${ECLIPSE} @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ + -e "s+%%ECLIPSE%%+${ECLIPSE}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ - ${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp - ${MKDIR} ${PREFIX}/share/applications/ || ${TRUE} - ${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${ECLIPSE}.desktop - ${INSTALL_PROGRAM} ${WRKSRC}/features/org.eclipse.equinox.executable/library/gtk/eclipse ${PORTDESTDIR}/eclipse + ${FILESDIR}/eclipse.desktop > ${WRKSRC}/eclipse.desktop.tmp + @${MKDIR} ${PREFIX}/share/applications/ || ${TRUE} + @${INSTALL_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${ECLIPSE}.desktop @-update-desktop-database - @(cd ${WRKSRC}; ${FIND} -s eclipse -not -type d) \ - | ${SED} -e "s+^eclipse+${ECLIPSE}+g" >> ${TMPPLIST} + @(cd ${PREFIX}; ${FIND} -s ${ECLIPSE} -not -type d) >> ${TMPPLIST} @echo '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} - @(cd ${WRKSRC}; ${FIND} -s -d eclipse -type d) \ - | ${SED} -e "s+^eclipse+${ECLIPSE}+g" \ - -ne 's,^,@dirrm ,p' >> ${TMPPLIST} + @(cd ${PREFIX}; ${FIND} -s -d ${ECLIPSE} -type d) | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} @echo '@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} +setup-user: + @echo 'Preparing Eclipse configuration for user ${USER}' + @${PREFIX}/bin/${ECLIPSE} -initialize -clean -consoleLog + @${FIND} ${HOME}/.eclipse -exec touch {} \; + .include <bsd.port.post.mk> diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index 35761b9460e7..c52b329858c0 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,3 +1,3 @@ -MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.2.zip) = 4b7016cf9aedf07b8f34b39470947799 -SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.3.2.zip) = 94d2f41d317c0d15b5e15420f261ed543928811c93283f4219c177f5547d7827 -SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.3.2.zip) = 94184642 +MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = 5814fb2019f70f00c0952f29df1cac3d +SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = cb451bcc8866ab289b3a322e17eda7d20429463e8b3f329f66626b45b0fd6824 +SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.4.1.zip) = 106290656 diff --git a/java/eclipse/files/XXXorg.eclipse.rcp-build.xml b/java/eclipse/files/XXXorg.eclipse.rcp-build.xml deleted file mode 100644 index fe3cb04a340d..000000000000 --- a/java/eclipse/files/XXXorg.eclipse.rcp-build.xml +++ /dev/null @@ -1,781 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.rcp" default="build.update.jar" basedir="."> - - <target name="init"> - <property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/> - <property name="feature.destination" value="${basedir}"/> - </target> - - <target name="all.plugins" depends="init"> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.win32.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.wpf.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="wpf"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.hpux.PA_RISC" target="${target}"> - <property name="arch" value="PA_RISC"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.aix.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="aix"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64" target="${target}"> - <property name="arch" value="x86_64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.s390x" target="${target}"> - <property name="arch" value="s390x"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.s390" target="${target}"> - <property name="arch" value="s390"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.amd64" target="${target}"> - <property name="arch" value="amd64"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.carbon.macosx" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}"> - <property name="arch" value="ia64_32"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="qnx"/> - <property name="ws" value="photon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}"> - <property name="arch" value="ia64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC" target="${target}"> - <property name="arch" value="PA_RISC"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="aix"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}"> - <property name="arch" value="s390x"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390" target="${target}"> - <property name="arch" value="s390"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> - <property name="arch" value="amd64"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="wpf"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.common" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.configurator" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime.compatibility.auth" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.jobs" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.registry" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.preferences" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.contenttype" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.commands" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.app" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.expressions" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.help" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.databinding" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.databinding.beans" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64" target="${target}"> - <property name="arch" value="x86_64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.databinding" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - </target> - <target name="all.features" depends="init"> - </target> - <target name="update.feature" depends="init"> - </target> - - <target name="all.children" depends="init,all.features,all.plugins,update.feature"> - </target> - - <target name="children" if="include.children"> - <antcall target="all.children"/> - </target> - - <target name="build.jars" depends="init" description="Build all the jars for the feature: org.eclipse.rcp."> - <antcall target="all.children"> - <param name="target" value="build.jars"/> - </antcall> - </target> - - <target name="build.sources" depends="init"> - <antcall target="all.children"> - <param name="target" value="build.sources"/> - </antcall> - </target> - - <target name="build.zips" depends="init"> - <antcall target="all.children"> - <param name="target" value="build.zips"/> - </antcall> - </target> - - <target name="build.update.jar" depends="init" description="Build the feature jar of: org.eclipse.rcp for an update site."> - <antcall target="all.children"> - <param name="target" value="build.update.jar"/> - </antcall> - <property name="feature.base" value="${feature.temp.folder}"/> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="gather.bin.parts" inheritAll="false"> - <param name="arch" value="*"/> - <param name="ws" value="*"/> - <param name="nl" value="*"/> - <param name="os" value="*"/> - <param name="feature.base" value="${feature.temp.folder}"/> - </antcall> - <jar destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar" basedir="${feature.temp.folder}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="gather.bin.parts" depends="init" if="feature.base"> - <mkdir dir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/> - <antcall target="children"> - <param name="destination.temp.folder" value="${feature.base}/plugins"/> - <param name="target" value="gather.bin.parts"/> - </antcall> - <copy todir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" failonerror="true" overwrite="false"> - <fileset dir="${basedir}"> - <include name="feature.xml"/> - <include name="license.html"/> - <include name="epl-v10.html"/> - <include name="feature.properties"/> - <include name="eclipse_update_120.jpg"/> - </fileset> - </copy> - <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/feature.xml" selfVersion="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070906,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.1.M20070822-0800,org.eclipse.core.databinding.beans:0.0.0,1.0.1.M20070910-0800b,org.eclipse.core.jobs:0.0.0,3.3.1.R33x_v20070709,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.2.R33x_v20080105,org.eclipse.help:0.0.0,3.3.2.v20071126_33x,org.eclipse.swt:0.0.0,3.3.2.v3349d,org.eclipse.jface:0.0.0,3.3.2.M20080207-0800,org.eclipse.jface.databinding:0.0.0,1.1.1.M20080207-0800,org.eclipse.ui:0.0.0,3.3.1.M20071128-0800,org.eclipse.ui.workbench:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.101.R33x_v20070810,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.3.v3349,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.2.v3349,org.eclipse.swt.carbon.macosx:0.0.0,3.3.3.v3349,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.1.v3348,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.1.v3349,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.1.r33x_r20080131,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.101.R33x_v20080117,org.eclipse.equinox.registry:0.0.0,3.3.1.R33x_v20070802,org.eclipse.equinox.launcher:0.0.0,1.0.1.R33x_v20080118,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.1.R33x_v20070803,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.3.R33x_v20080118,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> - <mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/win32.win32.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/win32/win32/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileswin32_wpf_x86"> - <mkdir dir="${feature.base}/win32.wpf.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/win32.wpf.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/wpf/win32/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesmacosx_carbon_ppc"> - <mkdir dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" /> - <exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux"> - <arg line="-sf"/> - <arg line="Eclipse.app/Contents/MacOS/eclipse"/> - <arg line="eclipse"/> - </exec> - </target> - <target name="rootFilesfreebsd_gtk_x86"> - <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFilesfreebsd_gtk_amd64"> - <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> - <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_x86"> - <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_ppc"> - <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_ppc64"> - <mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_x86_64"> - <mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86_64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_ia64"> - <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_s390"> - <mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.s390"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_s390x"> - <mkdir dir="${feature.base}/linux.gtk.s390x/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.s390x/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.s390x"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_motif_x86"> - <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.motif.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/linux/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86"> - <include name="libXm.so.2"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFilessolaris_gtk_sparc"> - <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_gtk_x86"> - <mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesaix_motif_ppc"> - <mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/aix/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_PA_RISC"> - <mkdir dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_ia64"> - <mkdir dir="${feature.base}/hpux.motif.ia64/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_ia64_32"> - <mkdir dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesqnx_photon_x86"> - <mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesgroup_group_group"> - <antcall target="rootFileswin32_win32_x86"/> - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> - <antcall target="rootFilesfreebsd_gtk_x86"/> - <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> - <antcall target="rootFileslinux_gtk_x86_64"/> - <antcall target="rootFileslinux_gtk_ia64"/> - <antcall target="rootFileslinux_gtk_s390"/> - <antcall target="rootFileslinux_gtk_s390x"/> - <antcall target="rootFileslinux_motif_x86"/> - <antcall target="rootFilessolaris_gtk_sparc"/> - <antcall target="rootFilessolaris_gtk_x86"/> - <antcall target="rootFilessolaris_motif_sparc"/> - <antcall target="rootFilesaix_motif_ppc"/> - <antcall target="rootFileshpux_motif_PA_RISC"/> - <antcall target="rootFileshpux_motif_ia64"/> - <antcall target="rootFileshpux_motif_ia64_32"/> - <antcall target="rootFilesqnx_photon_x86"/> - </target> - - <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp."> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="gather.bin.parts"> - <param name="arch" value="*"/> - <param name="ws" value="*"/> - <param name="nl" value="*"/> - <param name="include.children" value="true"/> - <param name="feature.base" value="${feature.temp.folder}"/> - <param name="os" value="*"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="zip.sources" depends="init"> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/> - <param name="include.children" value="true"/> - <param name="target" value="gather.sources"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="zip.logs" depends="init"> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children" inheritAll="false"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/> - <param name="include.children" value="true"/> - <param name="target" value="gather.logs"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="clean" depends="init" description="Clean the feature: org.eclipse.rcp of all the zips, jars and logs created."> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar"/> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip"/> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip"/> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip"/> - <delete dir="${feature.temp.folder}"/> - <antcall target="all.children"> - <param name="target" value="clean"/> - </antcall> - </target> - - <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> - <eclipse.convertPath fileSystemPath="/builds/M200802211800/src/features/org.eclipse.rcp/" property="resourcePath"/> - <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> - <antcall target="all.children"> - <param name="target" value="refresh"/> - </antcall> - </target> - <target name="gather.sources"> - <antcall target="children"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/> - <param name="target" value="gather.sources"/> - </antcall> - </target> - - <target name="gather.logs" depends="init"> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children" inheritAll="false"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/> - <param name="target" value="gather.logs"/> - </antcall> - </target> - -</project> diff --git a/java/eclipse/files/eclipse.desktop b/java/eclipse/files/eclipse.desktop index 37a3c2b75e31..9afbdca01a65 100644 --- a/java/eclipse/files/eclipse.desktop +++ b/java/eclipse/files/eclipse.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Comment=Eclipse IDE -Name=Eclipse -Exec=%%PREFIX%%/bin/eclipse +Name=%%ECLIPSE%% +Exec=%%PREFIX%%/bin/%%ECLIPSE%% Encoding=UTF-8 Terminal=false Type=Application diff --git a/java/eclipse/files/org.eclipse.platform-build.xml b/java/eclipse/files/org.eclipse.platform-build.xml deleted file mode 100644 index f580aaffc034..000000000000 --- a/java/eclipse/files/org.eclipse.platform-build.xml +++ /dev/null @@ -1,938 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.platform" default="build.update.jar" basedir="."> - - <target name="init"> - <property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/> - <property name="feature.destination" value="${basedir}"/> - </target> - - <target name="all.plugins" depends="init"> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime.compatibility.registry" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.text" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi.util" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.qnx.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="qnx"/> - <property name="ws" value="photon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.macosx" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.amd64" target="${target}"> - <property name="arch" value="amd64"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.linux.x86_64" target="${target}"> - <property name="arch" value="x86_64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.linux.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.hpux.PA_RISC" target="${target}"> - <property name="arch" value="PA_RISC"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.hpux.ia64_32" target="${target}"> - <property name="arch" value="ia64_32"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.boot" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi.services" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.doc.user" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.help.appserver" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.tomcat" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.variables" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime.compatibility" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.net" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.win32" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.linux" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.win32" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.compatibility" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.team.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.debug.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filebuffers" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ltk.core.refactoring" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.http.servlet" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.http.jetty" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.help.base" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.http.registry" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.jsp.jasper" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.jsp.jasper.registry" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.help.webapp" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jsch.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.views" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.net" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.browser" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.presentations.r21" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jsch.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench.compatibility" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.forms" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.views.properties.tabbed" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.scheduler" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.intro" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.intro.universal" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.help.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.cheatsheets" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.navigator" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.text" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.ide" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.win32" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench.texteditor" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.editors" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.navigator.resources" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.ide.application" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.console" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.search" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.debug.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.externaltools" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.compare" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.team.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ltk.ui.refactoring" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - </target> - <target name="all.features" depends="init"> - <ant antfile="build.xml" dir="../org.eclipse.rcp/" target="${target}"/> - </target> - <target name="update.feature" depends="init"> - </target> - - <target name="all.children" depends="init,all.features,all.plugins,update.feature"> - </target> - - <target name="children" if="include.children"> - <antcall target="all.children"/> - </target> - - <target name="build.jars" depends="init" description="Build all the jars for the feature: org.eclipse.platform."> - <antcall target="all.children"> - <param name="target" value="build.jars"/> - </antcall> - </target> - - <target name="build.sources" depends="init"> - <antcall target="all.children"> - <param name="target" value="build.sources"/> - </antcall> - </target> - - <target name="build.zips" depends="init"> - <antcall target="all.children"> - <param name="target" value="build.zips"/> - </antcall> - </target> - - <target name="build.update.jar" depends="init" description="Build the feature jar of: org.eclipse.platform for an update site."> - <antcall target="all.children"> - <param name="target" value="build.update.jar"/> - </antcall> - <property name="feature.base" value="${feature.temp.folder}"/> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="gather.bin.parts" inheritAll="false"> - <param name="arch" value="*"/> - <param name="ws" value="*"/> - <param name="nl" value="*"/> - <param name="os" value="*"/> - <param name="feature.base" value="${feature.temp.folder}"/> - </antcall> - <jar destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.jar" basedir="${feature.temp.folder}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="gather.bin.parts" depends="init" if="feature.base"> - <mkdir dir="${feature.base}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft"/> - <antcall target="children"> - <param name="destination.temp.folder" value="${feature.base}/plugins"/> - <param name="target" value="gather.bin.parts"/> - </antcall> - <copy todir="${feature.base}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" failonerror="true" overwrite="false"> - <fileset dir="${basedir}"> - <include name="epl-v10.html"/> - <include name="eclipse_update_120.jpg"/> - <include name="feature.xml"/> - <include name="feature.properties"/> - <include name="license.html"/> - </fileset> - </copy> - <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft/feature.xml" selfVersion="3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft" featureIds="org.eclipse.rcp:0.0.0,3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc," pluginIds="com.jcraft.jsch:0.0.0,0.1.31,javax.servlet:0.0.0,2.4.0.v200706111738,javax.servlet.jsp:0.0.0,2.0.0.v200706191603,org.apache.jasper:0.0.0,5.5.17.v200706111724,org.apache.commons.el:0.0.0,1.0.0.v200706111724,org.apache.commons.logging:0.0.0,1.0.4.v200706111724,org.apache.ant:0.0.0,1.7.0.v200706080842,org.apache.lucene:0.0.0,1.9.1.v200706111724,org.apache.lucene.analysis:0.0.0,1.9.1.v200706181610,org.eclipse.ant.core:0.0.0,3.1.200.v20070522,org.eclipse.compare:0.0.0,3.3.2.r33x_20080128,org.eclipse.core.boot:0.0.0,3.1.100.v20060603,org.eclipse.core.filebuffers:0.0.0,3.3.1.r331_v20070829,org.eclipse.core.filesystem:0.0.0,1.1.0.v20070606,org.eclipse.core.net:0.0.0,1.0.1.r33x_20070709,org.eclipse.core.resources:0.0.0,3.3.1.R33x_v20080205,org.eclipse.core.resources.compatibility:0.0.0,3.2.100.v20070502,org.eclipse.core.runtime.compatibility:0.0.0,3.1.200.v20070502,org.eclipse.osgi.services:0.0.0,3.1.200.v20070605,org.eclipse.osgi.util:0.0.0,3.1.200.v20070605,org.eclipse.core.variables:0.0.0,3.2.0.v20070426,org.eclipse.debug.core:0.0.0,3.3.2.v20080117_r332,org.eclipse.debug.ui:0.0.0,3.3.2.v20080117_r332,org.eclipse.equinox.http.registry:0.0.0,1.0.1.R33x_v20071231,org.eclipse.equinox.http.jetty:0.0.0,1.0.1.R33x_v20070816,org.eclipse.equinox.http.servlet:0.0.0,1.0.1.R33x_v20070816,org.eclipse.equinox.jsp.jasper:0.0.0,1.0.1.R33x_v20070816,org.eclipse.equinox.jsp.jasper.registry:0.0.0,1.0.0.v20070607,org.eclipse.help.webapp:0.0.0,3.3.2.v20071102_33x,org.eclipse.help.base:0.0.0,3.3.1.v20070813_33x,org.eclipse.help.ui:0.0.0,3.3.2.v20071126_33x,org.eclipse.help.appserver:0.0.0,3.1.200.v20070510,org.eclipse.ltk.core.refactoring:0.0.0,3.3.1.r332_20080128,org.eclipse.ltk.ui.refactoring:0.0.0,3.3.1.r332_20080128,org.eclipse.platform:0.0.0,3.3.3.r33x_r20080129,org.eclipse.platform.doc.user:0.0.0,3.3.0.M20070913-1400,org.eclipse.search:0.0.0,3.3.1.r331_v20070831-0800,org.eclipse.team.core:0.0.0,3.3.1.r33x_20080128,org.eclipse.team.ui:0.0.0,3.3.2.r33x_20080128,org.eclipse.tomcat:0.0.0,4.1.230.v20070531,org.eclipse.text:0.0.0,3.3.0.v20070606-0010,org.eclipse.jface.text:0.0.0,3.3.2.r332_20071017-0800,org.eclipse.jsch.core:0.0.0,1.0.0.I20070426,org.eclipse.jsch.ui:0.0.0,1.0.1.r33x_20070709,org.eclipse.ui.console:0.0.0,3.2.2.v20071031_r332,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20070605-0010,org.eclipse.ui.intro:0.0.0,3.2.101.v20070827_33x,org.eclipse.ui.intro.universal:0.0.0,3.2.100.v20070530A,org.eclipse.ui.cheatsheets:0.0.0,3.3.1.v20080125_33x,org.eclipse.ui.browser:0.0.0,3.2.100.v20070524A,org.eclipse.ui.navigator:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.navigator.resources:0.0.0,3.3.1.M20070831-2000,org.eclipse.ui.net:0.0.0,1.0.0.I20070516,org.eclipse.ui.workbench.texteditor:0.0.0,3.3.2.r332_20080109-0800,org.eclipse.ui.views:0.0.0,3.2.101.M20080207-0800,org.eclipse.ui.editors:0.0.0,3.3.2.r332_20080109-0800,org.eclipse.ui.forms:0.0.0,3.3.0.v20070511,org.eclipse.ui.externaltools:0.0.0,3.1.200.v20070416,org.eclipse.ui.ide:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20070530-0100,org.eclipse.ui.win32:0.0.0,3.2.100.I20070319-0010,org.eclipse.update.core:0.0.0,3.2.101.R33x_v20070911,org.eclipse.update.scheduler:0.0.0,3.2.100.v20070615,org.eclipse.update.ui:0.0.0,3.2.100.v20070615,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20070319-0010,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20070430,org.eclipse.core.filesystem.freebsd.x86:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.linux.x86:0.0.0,1.1.0.v20070416,org.eclipse.core.filesystem.freebsd.amd64:0.0.0,1.0.100.v20070510,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20070510,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20070425,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20070510,org.eclipse.core.resources.win32:0.0.0,3.3.0.v20070226,org.eclipse.update.core.freebsd:0.0.0,3.2.0.v20070615,org.eclipse.update.core.linux:0.0.0,3.2.0.v20070615,org.eclipse.update.core.win32:0.0.0,3.2.100.v20070615,org.eclipse.ui.views.properties.tabbed:0.0.0,3.3.1.M20070831-0800,org.eclipse.core.runtime.compatibility.registry:0.0.0,3.2.100.v20070316,org.mortbay.jetty:0.0.0,5.1.11.v200706111724,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> - <mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/win32.win32.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/win32/win32/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/win32"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileswin32_wpf_x86"> - <mkdir dir="${feature.base}/win32.wpf.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/win32.wpf.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/wpf/win32/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/wpf"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesmacosx_carbon_ppc"> - <mkdir dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/macosx.carbon"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" /> - <exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux"> - <arg line="-sf"/> - <arg line="Eclipse.app/Contents/MacOS/eclipse"/> - <arg line="eclipse"/> - </exec> - </target> - <target name="rootFilesfreebsd_gtk_x86"> - <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/about_files/freebsd.gtk.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_x86"> - <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/about_files/linux.gtk.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_ppc"> - <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_ppc64"> - <mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../launchertmp"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesfreebsd_gtk_amd64"> - <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> - <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/about_files/freebsd.gtk.amd64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_x86_64"> - <mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/about_files/linux.gtk.x86_64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_ia64"> - <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_s390"> - <mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../launchertmp"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_s390x"> - <mkdir dir="${feature.base}/linux.gtk.s390x/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.s390x/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/about_files/linux.gtk.s390x"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_motif_x86"> - <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/about_files/linux.motif.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/motif"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/linux/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86"> - <include name="Xm.so.2"/> - </fileset> - <fileset dir="${basedir}/motif"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFilessolaris_gtk_sparc"> - <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_gtk_x86"> - <mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../launchertmp"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/gtk"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/motif"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesaix_motif_ppc"> - <mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/aix/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/motif"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_PA_RISC"> - <mkdir dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_ia64"> - <mkdir dir="${feature.base}/hpux.motif.ia64/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../launchertmp"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/motif"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_ia64_32"> - <mkdir dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../launchertmp"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/motif"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesqnx_photon_x86"> - <mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> - <include name="startup.jar"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesgroup_group_group"> - <antcall target="rootFileswin32_win32_x86"/> - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> - <antcall target="rootFilesfreebsd_gtk_x86"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> - <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86_64"/> - <antcall target="rootFileslinux_gtk_ia64"/> - <antcall target="rootFileslinux_gtk_s390"/> - <antcall target="rootFileslinux_gtk_s390x"/> - <antcall target="rootFileslinux_motif_x86"/> - <antcall target="rootFilessolaris_gtk_sparc"/> - <antcall target="rootFilessolaris_gtk_x86"/> - <antcall target="rootFilessolaris_motif_sparc"/> - <antcall target="rootFilesaix_motif_ppc"/> - <antcall target="rootFileshpux_motif_PA_RISC"/> - <antcall target="rootFileshpux_motif_ia64"/> - <antcall target="rootFileshpux_motif_ia64_32"/> - <antcall target="rootFilesqnx_photon_x86"/> - </target> - - <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform."> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="gather.bin.parts"> - <param name="arch" value="*"/> - <param name="ws" value="*"/> - <param name="nl" value="*"/> - <param name="include.children" value="true"/> - <param name="feature.base" value="${feature.temp.folder}"/> - <param name="os" value="*"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="zip.sources" depends="init"> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.platform.source_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft/src"/> - <param name="include.children" value="true"/> - <param name="target" value="gather.sources"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="zip.logs" depends="init"> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children" inheritAll="false"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/> - <param name="include.children" value="true"/> - <param name="target" value="gather.logs"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="clean" depends="init" description="Clean the feature: org.eclipse.platform of all the zips, jars and logs created."> - <delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.jar"/> - <delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.bin.dist.zip"/> - <delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.log.zip"/> - <delete file="${feature.destination}/org.eclipse.platform_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft.src.zip"/> - <delete dir="${feature.temp.folder}"/> - <antcall target="all.children"> - <param name="target" value="clean"/> - </antcall> - </target> - - <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> - <eclipse.convertPath fileSystemPath="/builds/M200802211800/src/features/org.eclipse.platform/" property="resourcePath"/> - <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> - <antcall target="all.children"> - <param name="target" value="refresh"/> - </antcall> - </target> - <target name="gather.sources"> - <antcall target="children"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.platform.source_3.3.3.r33x_r20080129-_19UEl7Ezk_gXF1kouft/src"/> - <param name="target" value="gather.sources"/> - </antcall> - </target> - - <target name="gather.logs" depends="init"> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children" inheritAll="false"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/> - <param name="target" value="gather.logs"/> - </antcall> - </target> - -</project> diff --git a/java/eclipse/files/org.eclipse.rcp-build.xml b/java/eclipse/files/org.eclipse.rcp-build.xml deleted file mode 100644 index 66ef7881f6d7..000000000000 --- a/java/eclipse/files/org.eclipse.rcp-build.xml +++ /dev/null @@ -1,781 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="org.eclipse.rcp" default="build.update.jar" basedir="."> - - <target name="init"> - <property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/> - <property name="feature.destination" value="${basedir}"/> - </target> - - <target name="all.plugins" depends="init"> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.win32.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.wpf.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="wpf"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.hpux.PA_RISC" target="${target}"> - <property name="arch" value="PA_RISC"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.aix.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="aix"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.amd64" target="${target}"> - <property name="arch" value="amd64"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64" target="${target}"> - <property name="arch" value="x86_64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.motif.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.s390x" target="${target}"> - <property name="arch" value="s390x"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.s390" target="${target}"> - <property name="arch" value="s390"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.linux.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.carbon.macosx" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}"> - <property name="arch" value="ia64_32"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.photon.qnx.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="qnx"/> - <property name="ws" value="photon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}"> - <property name="arch" value="ia64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.PA_RISC" target="${target}"> - <property name="arch" value="PA_RISC"/> - <property name="os" value="hpux"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="aix"/> - <property name="ws" value="motif"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.carbon.macosx" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}"> - <property name="arch" value="s390x"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390" target="${target}"> - <property name="arch" value="s390"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="wpf"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.common" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.configurator" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime.compatibility.auth" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.jobs" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.registry" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.preferences" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.contenttype" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.commands" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.app" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.runtime" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.expressions" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.help" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.databinding" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.databinding.beans" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.win32.win32.x86" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> - <property name="arch" value="amd64"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86_64" target="${target}"> - <property name="arch" value="x86_64"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.databinding" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.carbon" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> - <property name="ws" value="carbon"/> - </ant> - </target> - <target name="all.features" depends="init"> - </target> - <target name="update.feature" depends="init"> - </target> - - <target name="all.children" depends="init,all.features,all.plugins,update.feature"> - </target> - - <target name="children" if="include.children"> - <antcall target="all.children"/> - </target> - - <target name="build.jars" depends="init" description="Build all the jars for the feature: org.eclipse.rcp."> - <antcall target="all.children"> - <param name="target" value="build.jars"/> - </antcall> - </target> - - <target name="build.sources" depends="init"> - <antcall target="all.children"> - <param name="target" value="build.sources"/> - </antcall> - </target> - - <target name="build.zips" depends="init"> - <antcall target="all.children"> - <param name="target" value="build.zips"/> - </antcall> - </target> - - <target name="build.update.jar" depends="init" description="Build the feature jar of: org.eclipse.rcp for an update site."> - <antcall target="all.children"> - <param name="target" value="build.update.jar"/> - </antcall> - <property name="feature.base" value="${feature.temp.folder}"/> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="gather.bin.parts" inheritAll="false"> - <param name="arch" value="*"/> - <param name="ws" value="*"/> - <param name="nl" value="*"/> - <param name="os" value="*"/> - <param name="feature.base" value="${feature.temp.folder}"/> - </antcall> - <jar destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar" basedir="${feature.temp.folder}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="gather.bin.parts" depends="init" if="feature.base"> - <mkdir dir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc"/> - <antcall target="children"> - <param name="destination.temp.folder" value="${feature.base}/plugins"/> - <param name="target" value="gather.bin.parts"/> - </antcall> - <copy todir="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" failonerror="true" overwrite="false"> - <fileset dir="${basedir}"> - <include name="feature.xml"/> - <include name="license.html"/> - <include name="epl-v10.html"/> - <include name="feature.properties"/> - <include name="eclipse_update_120.jpg"/> - </fileset> - </copy> - <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/feature.xml" selfVersion="3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070906,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.1.M20070822-0800,org.eclipse.core.databinding.beans:0.0.0,1.0.1.M20070910-0800b,org.eclipse.core.jobs:0.0.0,3.3.1.R33x_v20070709,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.2.R33x_v20080105,org.eclipse.help:0.0.0,3.3.2.v20071126_33x,org.eclipse.swt:0.0.0,3.3.2.v3349d,org.eclipse.jface:0.0.0,3.3.2.M20080207-0800,org.eclipse.jface.databinding:0.0.0,1.1.1.M20080207-0800,org.eclipse.ui:0.0.0,3.3.1.M20071128-0800,org.eclipse.ui.workbench:0.0.0,3.3.2.M20080207-0800,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.101.R33x_v20070810,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.3.v3349,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.R3_3,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.2.v3349,org.eclipse.swt.carbon.macosx:0.0.0,3.3.3.v3349,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.1.v3348,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.2.v3349,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.1.v3349,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.1.v3349,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.1.r33x_r20080131,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.1.R33x_v20070828,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.101.R33x_v20080117,org.eclipse.equinox.registry:0.0.0,3.3.1.R33x_v20070802,org.eclipse.equinox.launcher:0.0.0,1.0.1.R33x_v20080118,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.1.R33x_v20070803,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.3.R33x_v20080118,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.3.R33x_v20080118,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> - <mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/win32.win32.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/win32/win32/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileswin32_wpf_x86"> - <mkdir dir="${feature.base}/win32.wpf.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/win32.wpf.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/wpf/win32/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/win32.wpf.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesmacosx_carbon_ppc"> - <mkdir dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/macosx.carbon.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" includes="Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt" /> - <exec executable="ln" dir="${feature.base}/macosx.carbon.ppc/${collectingFolder}" os="Linux"> - <arg line="-sf"/> - <arg line="Eclipse.app/Contents/MacOS/eclipse"/> - <arg line="eclipse"/> - </exec> - </target> - <target name="rootFilesfreebsd_gtk_x86"> - <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_x86"> - <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_ppc"> - <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_ppc64"> - <mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesfreebsd_gtk_amd64"> - <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> - <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_x86_64"> - <mkdir dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.x86_64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFileslinux_gtk_ia64"> - <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_s390"> - <mkdir dir="${feature.base}/linux.gtk.s390/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.s390/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.s390"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_gtk_s390x"> - <mkdir dir="${feature.base}/linux.gtk.s390x/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.s390x/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.gtk.s390x"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="*.so*" /> - <chmod perm="755" dir="${feature.base}/linux.gtk.s390x/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileslinux_motif_x86"> - <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/linux.motif.x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/linux/x86"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.linux.x86"> - <include name="libXm.so.2"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> - <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFilessolaris_gtk_sparc"> - <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_gtk_x86"> - <mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.gtk.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesaix_motif_ppc"> - <mkdir dir="${feature.base}/aix.motif.ppc/${collectingFolder}/"/> - <copy todir="${feature.base}/aix.motif.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/motif/aix/ppc"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_PA_RISC"> - <mkdir dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_ia64"> - <mkdir dir="${feature.base}/hpux.motif.ia64/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFileshpux_motif_ia64_32"> - <mkdir dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/"/> - <copy todir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesqnx_photon_x86"> - <mkdir dir="${feature.base}/qnx.photon.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/qnx.photon.x86/${collectingFolder}/" failonerror="true" overwrite="true"> - <fileset dir="${basedir}/rootfiles"> - <include name="**"/> - </fileset> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> - <include name="**"/> - </fileset> - </copy> - <chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilesgroup_group_group"> - <antcall target="rootFileswin32_win32_x86"/> - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> - <antcall target="rootFilesfreebsd_gtk_x86"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> - <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86_64"/> - <antcall target="rootFileslinux_gtk_ia64"/> - <antcall target="rootFileslinux_gtk_s390"/> - <antcall target="rootFileslinux_gtk_s390x"/> - <antcall target="rootFileslinux_motif_x86"/> - <antcall target="rootFilessolaris_gtk_sparc"/> - <antcall target="rootFilessolaris_gtk_x86"/> - <antcall target="rootFilessolaris_motif_sparc"/> - <antcall target="rootFilesaix_motif_ppc"/> - <antcall target="rootFileshpux_motif_PA_RISC"/> - <antcall target="rootFileshpux_motif_ia64"/> - <antcall target="rootFileshpux_motif_ia64_32"/> - <antcall target="rootFilesqnx_photon_x86"/> - </target> - - <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp."> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="gather.bin.parts"> - <param name="arch" value="*"/> - <param name="ws" value="*"/> - <param name="nl" value="*"/> - <param name="include.children" value="true"/> - <param name="feature.base" value="${feature.temp.folder}"/> - <param name="os" value="*"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip" basedir="${feature.temp.folder}" filesonly="false" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="zip.sources" depends="init"> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/> - <param name="include.children" value="true"/> - <param name="target" value="gather.sources"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="zip.logs" depends="init"> - <delete dir="${feature.temp.folder}"/> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children" inheritAll="false"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/> - <param name="include.children" value="true"/> - <param name="target" value="gather.logs"/> - </antcall> - <zip destfile="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip" basedir="${feature.temp.folder}" filesonly="true" whenempty="skip" update="false"/> - <delete dir="${feature.temp.folder}"/> - </target> - - <target name="clean" depends="init" description="Clean the feature: org.eclipse.rcp of all the zips, jars and logs created."> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.jar"/> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.bin.dist.zip"/> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.log.zip"/> - <delete file="${feature.destination}/org.eclipse.rcp_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc.src.zip"/> - <delete dir="${feature.temp.folder}"/> - <antcall target="all.children"> - <param name="target" value="clean"/> - </antcall> - </target> - - <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> - <eclipse.convertPath fileSystemPath="/builds/M200802211800/src/features/org.eclipse.rcp/" property="resourcePath"/> - <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> - <antcall target="all.children"> - <param name="target" value="refresh"/> - </antcall> - </target> - <target name="gather.sources"> - <antcall target="children"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins/org.eclipse.rcp.source_3.3.3.r33x_r20080129-8y8eE9UEUWI6qujeED0xT7bc/src"/> - <param name="target" value="gather.sources"/> - </antcall> - </target> - - <target name="gather.logs" depends="init"> - <mkdir dir="${feature.temp.folder}"/> - <antcall target="all.children" inheritAll="false"> - <param name="destination.temp.folder" value="${feature.temp.folder}/plugins"/> - <param name="target" value="gather.logs"/> - </antcall> - </target> - -</project> diff --git a/java/eclipse/files/patch-another-extra-patches b/java/eclipse/files/patch-another-extra-patches deleted file mode 100644 index 1dfd472483e5..000000000000 --- a/java/eclipse/files/patch-another-extra-patches +++ /dev/null @@ -1,182 +0,0 @@ ---- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2007-06-26 04:57:18.000000000 +0900 -+++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2007-09-13 09:48:55.000000000 +0900 -@@ -193,6 +193,17 @@ - public static final String OS_WIN32 = "win32";//$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * FreeBSD-based operating system. -+ * <p> -+ * Note this constant has been moved from the deprecated -+ * org.eclipse.core.boot.BootLoader class and its value has not changed. -+ * </p> -+ * @since 3.0 -+ */ -+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ -+ -+ /** - * Constant string (value "linux") indicating the platform is running on a - * Linux-based operating system. - * <p> - ---- plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java.orig 2007-06-26 04:57:18.000000000 +0900 -+++ plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 2007-09-13 09:37:01.000000000 +0900 -@@ -18,6 +18,7 @@ - public static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$ - public static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$ - public static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ -+ public static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ - public static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$ - public static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ - public static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ -@@ -34,6 +35,12 @@ - public static final String OS_WIN32 = "win32";//$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * Linux-based operating system. -+ */ -+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ -+ -+ /** - * Constant string (value "linux") indicating the platform is running on a - * Linux-based operating system. - */ - ---- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java.orig 2007-06-26 04:57:16.000000000 +0900 -+++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java 2007-09-13 01:54:23.000000000 +0900 -@@ -72,6 +72,8 @@ - brandWindows(); - if ("linux".equals(os)) //$NON-NLS-1$ - brandLinux(); -+ if ("freebsd".equals(os)) //$NON-NLS-1$ -+ brandFreeBSD(); - if ("solaris".equals(os)) //$NON-NLS-1$ - brandSolaris(); - if ("macosx".equals(os)) //$NON-NLS-1$ -@@ -90,6 +92,12 @@ - renameLauncher(); - } - -+ private void brandFreeBSD() throws Exception { -+ renameLauncher(); -+ if (brandIcons) -+ copy(new File(icons[0]), new File(root, "icon.xpm")); -+ } -+ - private void brandLinux() throws Exception { - renameLauncher(); - if (brandIcons) - ---- plugins/org.eclipse.pde.build/templates/packager/packaging.properties.orig 2007-06-26 04:57:16.000000000 +0900 -+++ plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2007-09-13 01:51:19.000000000 +0900 -@@ -18,6 +18,8 @@ - - root.win32.win32.x86=eclipse.exe, eclipsec.exe - root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html,icon.xpm -+root.freebsd.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm -+root.freebsd.amd64.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm - root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm - root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm - root.linux.gtk.ppc=eclipse - ---- plugins/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java.orig 2007-06-26 04:57:02.000000000 +0900 -+++ plugins/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java 2007-09-13 01:40:37.000000000 +0900 -@@ -169,7 +169,7 @@ - IPluginElement implementationElement = factory - .createElement(presentationElement); - implementationElement.setName("implementation"); //$NON-NLS-1$ -- implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ -+ implementationElement.setAttribute("os", "win32,linux,freebsd,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ - if (getTargetVersion() == 3.0) - implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$ - - ---- plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java.orig 2007-06-26 04:57:25.000000000 +0900 -+++ plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java 2007-09-13 01:38:36.000000000 +0900 -@@ -72,6 +72,13 @@ - public static final String OS_LINUX = "linux";//$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * Linux-based operating system. -+ * @deprecated Replaced by {@link Platform#OS_FREEBSD}. -+ */ -+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ -+ -+ /** - * Constant string (value "aix") indicating the platform is running on an - * AIX-based operating system. - * @deprecated Replaced by {@link Platform#OS_AIX}. - ---- plugins/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java.orig 2007-06-26 04:57:18.000000000 +0900 -+++ plugins/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java 2007-09-13 01:10:07.000000000 +0900 -@@ -82,8 +82,8 @@ - isBidi = true; - - String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ -- if (osName.startsWith("windows") || osName.startsWith("linux")) { //$NON-NLS-1$ //$NON-NLS-2$ -- -+ if (osName.startsWith("windows") || osName.startsWith("linux") -+ || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ - // Only consider platforms that can support control characters - isSupportedPlatform = true; - } - ---- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java.orig 2007-06-26 04:57:02.000000000 +0900 -+++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2007-09-13 01:03:14.000000000 +0900 -@@ -29,6 +29,12 @@ - public static final String OS_LINUX = "linux";//$NON-NLS-1$ - - /** -+ * Constant string (value "freebsd") indicating the platform is running on a -+ * FreeBSD-based operating system. -+ */ -+ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ -+ -+ /** - * Constant string (value "aix") indicating the platform is running on an - * AIX-based operating system. - */ - - ---- features/org.eclipse.rcp/build.properties.orig 2007-06-26 04:57:18.000000000 +0900 -+++ features/org.eclipse.rcp/build.properties 2007-09-13 00:43:31.000000000 +0900 -@@ -23,6 +23,10 @@ - - root.solaris.gtk.sparc=../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc - -+root.freebsd.gtk.x86=../../features/org.eclipse.platform/about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 -+root.freebsd.gtk.x86.permissions.755=*.so* -+root.freebsd.gtk.amd64=../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64 -+root.freebsd.gtk.amd64.permissions.755=*.so* - root.linux.gtk.x86=../../features/org.eclipse.platform/about_files/linux.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86 - root.linux.gtk.x86.permissions.755=*.so* - root.linux.gtk.s390=../../features/org.eclipse.platform/about_files/linux.gtk.s390,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390 - ---- features/org.eclipse.platform/build.properties.orig 2007-06-26 04:57:18.000000000 +0900 -+++ features/org.eclipse.platform/build.properties 2007-09-13 00:35:59.000000000 +0900 -@@ -32,7 +32,10 @@ - root.solaris.motif.sparc=../../features/org.eclipse.equinox.executable/bin/gtk/solaris/sparc,motif - root.solaris.gtk.x86=../../launchertmp,gtk - -- -+root.freebsd.gtk.x86=about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86,gtk -+root.freebsd.gtk.x86.permissions.755=*.so* -+root.freebsd.gtk.amd64=about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64,gtk -+root.freebsd.gtk.amd64.permissions.755=*.so* - root.linux.gtk.x86=about_files/linux.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/linux/x86,gtk - root.linux.gtk.x86.permissions.755=*.so* - root.linux.gtk.s390=about_files/linux.gtk.s390,../../features/org.eclipse.equinox.executable/contributed/gtk/linux/s390,gtk - ---- features/org.eclipse.sdk/build.properties.orig 2007-06-26 04:57:03.000000000 +0900 -+++ features/org.eclipse.sdk/build.properties 2007-09-13 00:32:31.000000000 +0900 -@@ -32,6 +32,8 @@ - root.aix.motif.ppc=motif - root.hpux.motif.PA_RISC=motif - root.solaris.gtk.sparc=gtk -+root.freebsd.gtk.x86=gtk -+root.freebsd.gtk.amd64=gtk - root.linux.gtk.x86=gtk - root.linux.gtk.x86_64=gtk - root.linux.gtk.ppc=gtk diff --git a/java/eclipse/files/patch-another-extra-patches2 b/java/eclipse/files/patch-another-extra-patches2 deleted file mode 100644 index 9d2ded65ca21..000000000000 --- a/java/eclipse/files/patch-another-extra-patches2 +++ /dev/null @@ -1,119 +0,0 @@ ---- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java.orig 2007-06-26 04:57:03.000000000 +0900 -+++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java 2007-09-13 13:38:20.000000000 +0900 -@@ -214,6 +214,9 @@ - key = VM_ARGS_WIN; - } else if( os.equals(Platform.OS_LINUX)) { - key = VM_ARGS_LINUX; -+ } else if( os.equals(Platform.OS_FREEBSD)) { -+ // You do not like this? -+ key = VM_ARGS_LINUX; - } else if( os.equals(Platform.OS_MACOSX)) { - key = VM_ARGS_MAC; - } else if(os.equals(Platform.OS_SOLARIS)) { -@@ -237,6 +240,8 @@ - key = PROGRAM_ARGS_WIN; - } else if( os.equals(Platform.OS_LINUX)) { - key = PROGRAM_ARGS_LINUX; -+ } else if( os.equals(Platform.OS_FREEBSD)) { -+ key = PROGRAM_ARGS_LINUX; - } else if( os.equals(Platform.OS_MACOSX)) { - key = PROGRAM_ARGS_MAC; - } else if(os.equals(Platform.OS_SOLARIS)) { -@@ -494,7 +499,7 @@ - } - - private void processLinux(Attributes attributes) { -- if (!osMatch(Platform.OS_LINUX)) -+ if (!osMatch(Platform.OS_LINUX) && !osMatch(Platform.OS_FREEBSD) ) - return; - result.add(attributes.getValue("icon")); //$NON-NLS-1$ - } - - ---- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java.orig 2007-06-26 04:57:09.000000000 +0900 -+++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 2007-09-13 15:40:52.000000000 +0900 -@@ -419,12 +419,18 @@ - - private static void generateLinkInstruction(AntScript script, String dir, String files) { - String[] links = Utils.getArrayFromString(files, ","); //$NON-NLS-1$ -- List arguments = new ArrayList(2); -+ List arguments = new ArrayList(2); -+ String os_running = "FreeBSD"; -+ -+ String os = System.getProperty("os.name"); //$NON-NLS-1$ -+ if (os != null && os.toLowerCase().indexOf("lin") >= 0) os_running = "Linux"; //$NON-NLS-1$ -+ if (os != null && os.toLowerCase().indexOf("free") >= 0) os_running = "FreeBSD"; //$NON-NLS-1$ -+ - for (int i = 0; i < links.length; i += 2) { - arguments.add("-sf"); //$NON-NLS-1$ - arguments.add(links[i]); - arguments.add(links[i + 1]); -- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ -+ script.printExecTask("ln", dir, arguments, os_running); //$NON-NLS-1$ //$NON-NLS-2$ - arguments.clear(); - } - } - - ---- plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java.orig 2007-06-26 04:57:06.000000000 +0900 -+++ plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 2007-09-13 13:45:14.000000000 +0900 -@@ -307,6 +307,8 @@ - return "Mac"; //$NON-NLS-1$ - if ("linux".equalsIgnoreCase(os)) //$NON-NLS-1$ - return "Linux"; //$NON-NLS-1$ -+ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ -+ return "FreeBSD"; //$NON-NLS-1$ - if ("solaris".equalsIgnoreCase(os)) //$NON-NLS-1$ - return "Solaris"; //$NON-NLS-1$ - if ("hpux".equalsIgnoreCase(os)) //$NON-NLS-1$ - - ---- plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java.orig 2007-06-26 04:57:14.000000000 +0900 -+++ plugins/org.eclipse.ui.browser/src/org/eclipse/ui/internal/browser/WebBrowserUtil.java 2007-09-13 13:48:02.000000000 +0900 -@@ -70,6 +70,18 @@ - } - - /** -+ * Returns true if we're running on freebsd. -+ * -+ * @return boolean -+ */ -+ public static boolean isFreeBSD() { -+ String os = System.getProperty("os.name"); //$NON-NLS-1$ -+ if (os != null && os.toLowerCase().indexOf("free") >= 0) //$NON-NLS-1$ -+ return true; -+ return false; -+ } -+ -+ /** - * Open a dialog window. - * - * @param message -@@ -293,4 +305,4 @@ - } - return encodedId; - } --} -\ No newline at end of file -+} - - ---- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java.orig 2007-06-26 04:57:21.000000000 +0900 -+++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 2007-09-13 15:40:33.000000000 +0900 -@@ -561,10 +561,15 @@ - private void generateLinkInstruction(String dir, String files) { - String[] links = Utils.getArrayFromString(files, ","); //$NON-NLS-1$ - List arguments = new ArrayList(2); -+ String os_running = "FreeBSD"; -+ String os = System.getProperty("os.name"); //$NON-NLS-1$ -+ if (os != null && os.toLowerCase().indexOf("lin") >= 0) os_running = "Linux"; //$NON-NLS-1$ -+ if (os != null && os.toLowerCase().indexOf("free") >= 0) os_running = "FreeBSD"; //$NON-NLS-1$ -+ - for (int i = 0; i < links.length; i += 2) { - arguments.add(links[i]); - arguments.add(links[i + 1]); -- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ -+ script.printExecTask("ln", dir, arguments, os_running); //$NON-NLS-1$ //$NON-NLS-2$ - arguments.clear(); - } - } diff --git a/java/eclipse/files/patch-assemble-sdk-all.xml b/java/eclipse/files/patch-assemble-sdk-all.xml deleted file mode 100644 index b8ce1b3bb4cb..000000000000 --- a/java/eclipse/files/patch-assemble-sdk-all.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- assemble.org.eclipse.sdk.all.xml.orig 2007-06-26 04:39:43.000000000 +0900 -+++ assemble.org.eclipse.sdk.all.xml 2007-08-25 12:12:43.000000000 +0900 -@@ -10,6 +10,12 @@ - <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.macosx.carbon.ppc"> - <property name="assembleScriptName" value="assemble.org.eclipse.sdk.macosx.carbon.ppc.xml"/> - </ant> -+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.x86"> -+ <property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.x86.xml"/> -+ </ant> -+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.amd64"> -+ <property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml"/> -+ </ant> - <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.x86"> - <property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.x86.xml"/> - </ant> diff --git a/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-amd64.xml b/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-amd64.xml deleted file mode 100644 index f5cf21777a4d..000000000000 --- a/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-amd64.xml +++ /dev/null @@ -1,125 +0,0 @@ ---- assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml.orig 2008-03-11 00:23:57.000000000 +0900 -+++ assemble.org.eclipse.sdk.freebsd.gtk.amd64.xml 2008-03-11 01:00:02.000000000 +0900 -@@ -11,6 +11,9 @@ - <property name="eclipse.features" value="${eclipse.base}/features"/> - <property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/> - <property name="tarargs" value=""/> -+ <condition property="jdk16"> -+ <isset property="JavaSE-1.6"/> -+ </condition> - <!-- Beginning of the jarUp task --> - <target name="jarUp" description="Create a jar from the given location."> - <available property="${source}/${elementName}_exists" file="${source}/${elementName}"/> -@@ -50,9 +53,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui.templates" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -128,9 +128,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.app" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -143,15 +140,15 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}"/> -+ </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jsch.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -188,9 +185,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.compare" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jsch.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -474,10 +468,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.help_3.3.2.v20071126_33x"/> - </antcall> - <antcall target="jarUp"> -@@ -590,10 +580,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.jdt.junit.runtime_3.3.0.v20070606-0010"/> - </antcall> - <antcall target="jarUp"> -@@ -892,6 +878,9 @@ - <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.team.core_3.3.1.r33x_20080128"/> - </antcall> -+ -+ <antcall target="main.jdk16" inheritAll="true" /> -+ - <eclipse.brand root="${eclipse.base}/freebsd.gtk.amd64/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" /> - <exec executable="cp" dir="${basedir}"> - <arg line="-r '${assemblyTempDir}/${collectingFolder}/freebsd.gtk.amd64/${collectingFolder}' '${assemblyTempDir}'"/> -@@ -909,6 +898,31 @@ - </exec> - <delete dir="${assemblyTempDir}"/> - </target> -+ -+ <target name="main.jdk16" if="jdk16"> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}" /> -+ </ant> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}" /> -+ </ant> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}" /> -+ </ant> -+ <antcall target="jarUp"> -+ <param name="source" value="${eclipse.plugins}" /> -+ <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100" /> -+ </antcall> -+ <antcall target="jarUp"> -+ <param name="source" value="${eclipse.plugins}" /> -+ <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100" /> -+ </antcall> -+ <antcall target="jarUp"> -+ <param name="source" value="${eclipse.plugins}" /> -+ <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x" /> -+ </antcall> -+ </target> -+ - <target name="gzipResults" unless="runPackager"> - <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> - <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> diff --git a/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-x86.xml b/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-x86.xml deleted file mode 100644 index 45d2d2245bb0..000000000000 --- a/java/eclipse/files/patch-assemble-sdk-freebsd-gtk-x86.xml +++ /dev/null @@ -1,117 +0,0 @@ ---- assemble.org.eclipse.sdk.freebsd.gtk.x86.xml.orig 2008-03-08 12:58:43.000000000 +0900 -+++ assemble.org.eclipse.sdk.freebsd.gtk.x86.xml 2008-03-08 13:35:32.000000000 +0900 -@@ -11,6 +11,9 @@ - <property name="eclipse.features" value="${eclipse.base}/features"/> - <property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/> - <property name="tarargs" value=""/> -+ <condition property="jdk16"> -+ <isset property="JavaSE-1.6"/> -+ </condition> - <!-- Beginning of the jarUp task --> - <target name="jarUp" description="Create a jar from the given location."> - <available property="${source}/${elementName}_exists" file="${source}/${elementName}"/> -@@ -50,9 +53,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui.templates" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -134,9 +134,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.equinox.app" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -146,9 +143,6 @@ - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -- <property name="destination.temp.folder" value="${eclipse.plugins}"/> -- </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro.universal" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> -@@ -474,10 +468,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349"/> - </antcall> - <antcall target="jarUp"> -@@ -574,10 +564,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.equinox.app_1.0.1.R33x_v20070828"/> - </antcall> - <antcall target="jarUp"> -@@ -590,10 +576,6 @@ - </antcall> - <antcall target="jarUp"> - <param name="source" value="${eclipse.plugins}"/> -- <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100"/> -- </antcall> -- <antcall target="jarUp"> -- <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.jdt.junit.runtime_3.3.0.v20070606-0010"/> - </antcall> - <antcall target="jarUp"> -@@ -892,6 +874,9 @@ - <param name="source" value="${eclipse.plugins}"/> - <param name="elementName" value="org.eclipse.team.core_3.3.1.r33x_20080128"/> - </antcall> -+ -+ <antcall target="main.jdk16" inheritAll="true"/> -+ - <eclipse.brand root="${eclipse.base}/freebsd.gtk.x86/${collectingFolder}" icons="${launcherIcons}" name="${launcherName}" os="${os}" /> - <exec executable="cp" dir="${basedir}"> - <arg line="-r '${assemblyTempDir}/${collectingFolder}/freebsd.gtk.x86/${collectingFolder}' '${assemblyTempDir}'"/> -@@ -909,6 +894,31 @@ - </exec> - <delete dir="${assemblyTempDir}"/> - </target> -+ -+ <target name="main.jdk16" if="jdk16"> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}" /> -+ </ant> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}" /> -+ </ant> -+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts"> -+ <property name="destination.temp.folder" value="${eclipse.plugins}" /> -+ </ant> -+ <antcall target="jarUp"> -+ <param name="source" value="${eclipse.plugins}" /> -+ <param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20071002-2100" /> -+ </antcall> -+ <antcall target="jarUp"> -+ <param name="source" value="${eclipse.plugins}" /> -+ <param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100" /> -+ </antcall> -+ <antcall target="jarUp"> -+ <param name="source" value="${eclipse.plugins}" /> -+ <param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x" /> -+ </antcall> -+ </target> -+ - <target name="gzipResults" unless="runPackager"> - <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> - <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> diff --git a/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml b/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml new file mode 100644 index 000000000000..487675b8d363 --- /dev/null +++ b/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml @@ -0,0 +1,11 @@ +--- assemble.org.eclipse.sdk.all.xml.orig 2008-08-02 14:21:21.000000000 -0400 ++++ assemble.org.eclipse.sdk.all.xml 2008-08-02 14:47:11.000000000 -0400 +@@ -30,6 +30,8 @@ + <assemble config="linux.gtk.s390" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> + <assemble config="linux.gtk.s390x" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> + <assemble config="linux.motif.x86" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> ++<assemble config="freebsd.gtk.x86" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> ++<assemble config="freebsd.gtk.amd64" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> + <assemble config="solaris.gtk.sparc" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> + <assemble config="solaris.gtk.x86" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> + <assemble config="solaris.motif.sparc" element="org.eclipse.sdk" dot="." scriptPrefix="assemble" /> diff --git a/java/eclipse/files/patch-build b/java/eclipse/files/patch-build index 46047caff10d..f054d26a3e4a 100644 --- a/java/eclipse/files/patch-build +++ b/java/eclipse/files/patch-build @@ -1,20 +1,15 @@ ---- build.orig 2007-06-26 04:57:50.000000000 +0900 -+++ build 2007-08-31 23:03:43.000000000 +0900 -@@ -52,16 +52,16 @@ +--- build.orig 2008-08-02 14:21:20.000000000 -0400 ++++ build 2008-08-02 14:28:48.000000000 -0400 +@@ -52,7 +52,7 @@ exit 1 fi --if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] -+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ] +-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-ia64" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] ++if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-ia64" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ] then ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH - ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml - CLASSPATH=$PWD/jdtcoresrc/ecj.jar:$CLASSPATH;export CLASSPATH - ant -q -buildfile jdtcoresrc/compilejdtcore.xml - CLASSPATH=$PWD/ecj.jar:$ORIGCLASSPATH;export CLASSPATH -- ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath -+ ant -q -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch $compilelibs $bootclasspath - else + ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -propertyfile build.properties +@@ -64,4 +64,4 @@ echo "The os-ws-arch combination of $os-$ws-$arch is not valid." exit 1 fi diff --git a/java/eclipse/files/patch-build.properties b/java/eclipse/files/patch-build.properties new file mode 100644 index 000000000000..08bad60f8be6 --- /dev/null +++ b/java/eclipse/files/patch-build.properties @@ -0,0 +1,10 @@ +--- build.properties.orig 2008-08-02 14:21:21.000000000 -0400 ++++ build.properties 2008-08-02 14:50:18.000000000 -0400 +@@ -1,3 +1,3 @@ +-J2SE-1.4= +-J2SE-1.5= +-JavaSE-1.6= +\ No newline at end of file ++#J2SE-1.4= ++#J2SE-1.5= ++#JavaSE-1.6= diff --git a/java/eclipse/files/patch-build.xml b/java/eclipse/files/patch-build.xml index aa74f0125b20..50a29ce0b1ac 100644 --- a/java/eclipse/files/patch-build.xml +++ b/java/eclipse/files/patch-build.xml @@ -1,16 +1,17 @@ ---- build.xml.orig 2007-09-22 02:02:44.000000000 +0900 -+++ build.xml 2007-10-19 13:37:04.000000000 +0900 -@@ -10,6 +10,7 @@ +--- build.xml.orig 2008-09-29 19:16:32.000000000 -0400 ++++ build.xml 2008-09-29 19:19:37.000000000 -0400 +@@ -1,7 +1,7 @@ + <project name="Eclipse SDK Source Build" default="run" basedir="."> - <target name="fetch" depends="init" if="srcFetch"> - <touch file="${cvspass}" /> -+ - <property name="featureOnly" value="true" /> - <property name="featureAndPlugins" value="true" /> - <property name="featuresRecursively" value="true" /> -@@ -21,6 +22,17 @@ - <mkdir dir="${linux.motif.rootfiles}" /> - <copy tofile="${linux.motif.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86/about.html" /> + <!-- default target that runs complete build --> +- <target name="run" depends="fetch,insertBuildId,compile,install" /> ++ <target name="run" depends="fetch,insertBuildId,compilelibs,compile,install" /> + + <!-- all features required to build eclipse sdk and javadoc --> + <target name="allElements"> +@@ -41,6 +41,16 @@ + <mkdir dir="${linux.gtk.s390x.rootfiles}" /> + <copy tofile="${linux.gtk.s390x.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.s390x/about.html" /> + <!--copy freebsd gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time--> + <property name="freebsd.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86" /> @@ -22,66 +23,53 @@ + <mkdir dir="${freebsd.gtk.amd64.rootfiles}" /> + <copy tofile="${freebsd.gtk.amd64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.amd64/about.html" /> + -+ - <!--copy linux gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time--> - <property name="linux.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86" /> - <mkdir dir="${linux.gtk.x86.rootfiles}" /> -@@ -108,11 +120,18 @@ - </copy> - - <!-- build liblocalfile --> -+ <!-- - <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" /> - <move file="plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.linux.${installArch}/os/linux/${installArch}"> -+ --> -+ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/freebsd" executable="make" failonerror="true" /> -+ <move file="plugins/org.eclipse.core.filesystem/natives/unix/freebsd/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.freebsd.${installArch}/os/freebsd/${installArch}"> - </move> - <!-- build libupdate --> -+ <!-- - <ant dir="plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> -+ --> -+ <ant dir="plugins/org.eclipse.update.core.freebsd/src" antfile="build.xml" /> - + <copy todir="${linux.gtk.x86_64.rootfiles}"> + <fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64" includes=" + about_files/mpl-v11.txt" /> +@@ -71,6 +81,25 @@ + <record name="compilelog.txt" action="stop" /> </target> -@@ -305,8 +324,16 @@ - </fail> - - <property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" /> -- <property name="javacSource" value="1.6" /> -- <property name="javacTarget" value="1.6" /> -+ <property name="javacSource" value="1.5" /> -+ <property name="javacTarget" value="1.5" /> -+ <!-- for jdk1.6 --> -+ <condition property="javacSource" value="1.6"> -+ <isset property="JavaSE-1.6"/> -+ </condition> -+ <condition property="javacTarget" value="1.6"> -+ <isset property="JavaSE-1.6"/> -+ </condition> ++ <target name="compilelibs" depends="init,clean" if="libsconfig"> ++ <echo message="Compiling SWT native libraries..."/> ++ <ant dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" antfile="build.xml" target="build.jnilibs"/> + - <property name="javacDebugInfo" value="true" /> - <property name="javacFailOnError" value="true" /> - -@@ -322,6 +349,8 @@ - <!-- determines if libraries need to be recompiled for specific platforms --> - <condition property="libsconfig"> - <or> -+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-x86" /> -+ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64" /> - <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-ppc64" /> ++ <echo message="Compiling native launcher..."/> ++ <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" /> ++ <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true"> ++ <arg line="build.sh install" /> ++ </exec> ++ ++ <echo message="Compiling liblocalfile..."/> ++ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/freebsd" executable="make" failonerror="true" /> ++ <move file="plugins/org.eclipse.core.filesystem/natives/unix/freebsd/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.freebsd.${installArch}/os/freebsd/${installArch}"> ++ </move> ++ ++ <echo message="Compiling native update library..."/> ++ <ant dir="plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" /> ++ </target> ++ + <!--create an installable eclipse runtime--> + <target name="install" depends="init"> + <echo message="Assembling..." /> +@@ -277,6 +306,8 @@ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86" /> <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390" /> -@@ -335,7 +364,10 @@ + <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390x" /> ++ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-x86" /> ++ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="freebsd-gtk-amd64" /> + <equals arg1="${installOs}-${installWs}-${installArch}" arg2="solaris-gtk-x86" /> + <equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-PA_RISC" /> + </or> +@@ -284,7 +315,10 @@ <!--used to add doc plug-ins to result after initial assembly--> <condition property="archive.format" value="tar"> -+ <or> - <equals arg1="${installOs}" arg2="linux" /> -+ <equals arg1="${installOs}" arg2="freebsd" /> -+ </or> +- <equals arg1="${installOs}" arg2="linux" /> ++ <or> ++ <equals arg1="${installOs}" arg2="linux" /> ++ <equals arg1="${installOs}" arg2="freebsd" /> ++ </or> </condition> <property name="archive.format" value="zip" /> </target> - diff --git a/java/eclipse/files/patch-features-cvs-build.xml b/java/eclipse/files/patch-features-cvs-build.xml deleted file mode 100644 index 51acc07c11f9..000000000000 --- a/java/eclipse/files/patch-features-cvs-build.xml +++ /dev/null @@ -1,34 +0,0 @@ ---- features/org.eclipse.cvs/build.xml.orig 2007-06-26 04:39:43.000000000 +0900 -+++ features/org.eclipse.cvs/build.xml 2007-08-23 23:51:19.000000000 +0900 -@@ -123,6 +123,22 @@ - </fileset> - </copy> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles"> -+ <include name="**"/> -+ </fileset> -+ </copy> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles"> -+ <include name="**"/> -+ </fileset> -+ </copy> -+ </target> - <target name="rootFileslinux_gtk_x86"> - <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/> - <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> -@@ -255,6 +271,8 @@ - <antcall target="rootFileswin32_win32_x86"/> - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> diff --git a/java/eclipse/files/patch-features-cvs-source-build.xml b/java/eclipse/files/patch-features-cvs-source-build.xml deleted file mode 100644 index f8f669f7d0e8..000000000000 --- a/java/eclipse/files/patch-features-cvs-source-build.xml +++ /dev/null @@ -1,22 +0,0 @@ ---- features/org.eclipse.cvs.source/build.xml.orig 2007-06-26 04:39:42.000000000 +0900 -+++ features/org.eclipse.cvs.source/build.xml 2007-08-23 23:49:08.000000000 +0900 -@@ -83,6 +83,10 @@ - </target> - <target name="rootFileswin32_wpf_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> - <target name="rootFilesmacosx_carbon_ppc"> - </target> - <target name="rootFileslinux_gtk_x86"> -@@ -121,6 +125,8 @@ - <antcall target="rootFileswin32_win32_x86"/> - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> diff --git a/java/eclipse/files/patch-features-equinox-executable-target-build.properties b/java/eclipse/files/patch-features-equinox-executable-target-build.properties deleted file mode 100644 index ed8b557399d7..000000000000 --- a/java/eclipse/files/patch-features-equinox-executable-target-build.properties +++ /dev/null @@ -1,14 +0,0 @@ ---- features/org.eclipse.equinox.executable/target.build.properties.orig 2007-06-26 04:57:23.000000000 +0900 -+++ features/org.eclipse.equinox.executable/target.build.properties 2007-08-24 16:35:31.000000000 +0900 -@@ -21,6 +21,12 @@ - root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root - root.linux.gtk.x86.permissions.755=libcairo-swt.so - -+root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root -+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so -+ -+root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root -+root.freebsd.gtk.amd64.permissions.755=libcairo-swt.so -+ - root.linux.gtk.ppc=bin/gtk/linux/ppc,gtk_root - root.linux.gtk.ppc.permissions.755=libcairo-swt.so diff --git a/java/eclipse/files/patch-features-equinox-executable-target.build.xml b/java/eclipse/files/patch-features-equinox-executable-target.build.xml deleted file mode 100644 index 854251ced0ee..000000000000 --- a/java/eclipse/files/patch-features-equinox-executable-target.build.xml +++ /dev/null @@ -1,36 +0,0 @@ ---- features/org.eclipse.equinox.executable/target.build.xml.orig 2007-06-26 04:57:02.000000000 +0900 -+++ features/org.eclipse.equinox.executable/target.build.xml 2007-09-05 21:45:39.000000000 +0900 -@@ -73,6 +73,24 @@ - <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}.app/Contents/MacOS/${launcherName}" /> - <chmod perm="755" dir="${feature.base}/macosx.carbon.x86/${collectingFolder}" includes="${launcherName}.app/Contents/Resources/Splash.app/Contents/MacOS/${launcherName}"/> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/bin/gtk/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/gtk_root" includes="**" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="${launcherName}" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" /> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/bin/gtk/freebsd/amd64" includes="**" /> -+ <fileset dir="${basedir}/gtk_root" includes="**" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="${launcherName}" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" /> -+ </target> - <target name="rootFileslinux_gtk_x86"> - <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -@@ -166,6 +184,8 @@ - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> - <antcall target="rootFilesmacosx_carbon_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> diff --git a/java/eclipse/files/patch-features-equinox-gtk-make_freebsd.mak b/java/eclipse/files/patch-features-equinox-gtk-make_freebsd.mak deleted file mode 100644 index 0be077f9b453..000000000000 --- a/java/eclipse/files/patch-features-equinox-gtk-make_freebsd.mak +++ /dev/null @@ -1,25 +0,0 @@ ---- features/org.eclipse.equinox.executable/library/gtk/make_freebsd.mak.orig 2007-10-11 15:42:00.000000000 +0900 -+++ features/org.eclipse.equinox.executable/library/gtk/make_freebsd.mak 2007-10-11 15:57:13.000000000 +0900 -@@ -32,7 +32,7 @@ - ifeq ($(DEFAULT_JAVA),) - DEFAULT_JAVA=DEFAULT_JAVA_JNI - endif -- -+ - # Define the object modules to be compiled and flags. - CC=gcc - MAIN_OBJS = eclipseMain.o -@@ -41,11 +41,11 @@ - - EXEC = $(PROGRAM_OUTPUT) - DLL = $(PROGRAM_LIBRARY) --LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -+LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread #-ldl - LFLAGS = -shared -fpic -Wl,--export-dynamic - CFLAGS = -O -s -Wall\ - -fpic \ -- -DLINUX \ -+ -DFREEBSD \ - -DMOZILLA_FIX \ - -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ - -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ diff --git a/java/eclipse/files/patch-features-jdt-build.xml b/java/eclipse/files/patch-features-jdt-build.xml deleted file mode 100644 index 734b3ab5fb13..000000000000 --- a/java/eclipse/files/patch-features-jdt-build.xml +++ /dev/null @@ -1,99 +0,0 @@ ---- features/org.eclipse.jdt/build.xml.orig Fri Sep 21 18:25:30 2007 -+++ features/org.eclipse.jdt/build.xml Sun Oct 21 17:11:44 2007 -@@ -1,5 +1,8 @@ - <?xml version="1.0" encoding="UTF-8"?> - <project name="org.eclipse.jdt" default="build.update.jar" basedir="."> -+ <condition property="jdk16"> -+ <isset property="JavaSE-1.6"/> -+ </condition> - - <target name="init"> - <property name="feature.temp.folder" value="${basedir}/feature.temp.folder"/> -@@ -32,26 +35,13 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="win32"/> -- </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="win32"/> -- </ant> -+ - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -- <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.pluggable.core" target="${target}"> -- <property name="arch" value="x86"/> -- <property name="os" value="win32"/> -- <property name="ws" value="win32"/> -- </ant> -+ - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.debug" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -102,7 +92,30 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -+ -+ <antcall target="all.plugins.jdk16" inheritAll="true"/> - </target> -+ <target name="all.plugins.jdk16" if="jdk16"> -+ <!-- 1.6 --> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.pluggable.core" target="${target}"> -+ <property name="arch" value="x86" /> -+ <property name="os" value="win32" /> -+ <property name="ws" value="win32" /> -+ </ant> -+ <!-- 1.6 --> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" target="${target}"> -+ <property name="arch" value="x86" /> -+ <property name="os" value="win32" /> -+ <property name="ws" value="win32" /> -+ </ant> -+ <!-- 1.6 --> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" target="${target}"> -+ <property name="arch" value="x86" /> -+ <property name="os" value="win32" /> -+ <property name="ws" value="win32" /> -+ </ant> -+ </target> -+ - <target name="all.features" depends="init"> - </target> - <target name="update.feature" depends="init"> -@@ -257,6 +270,18 @@ - </fileset> - </copy> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ </copy> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ </copy> -+ </target> - <target name="rootFilessolaris_gtk_sparc"> - <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> -@@ -333,6 +358,8 @@ - <antcall target="rootFileslinux_gtk_s390"/> - <antcall target="rootFileslinux_gtk_s390x"/> - <antcall target="rootFileslinux_motif_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFilessolaris_gtk_sparc"/> - <antcall target="rootFilessolaris_gtk_x86"/> - <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-jdt-feature.xml b/java/eclipse/files/patch-features-jdt-feature.xml deleted file mode 100644 index a5865b096491..000000000000 --- a/java/eclipse/files/patch-features-jdt-feature.xml +++ /dev/null @@ -1,32 +0,0 @@ ---- features/org.eclipse.jdt/feature.xml.orig 2008-02-22 09:09:09.000000000 +0900 -+++ features/org.eclipse.jdt/feature.xml 2008-03-11 00:19:04.000000000 +0900 -@@ -52,29 +52,6 @@ - unpack="false"/> - - <plugin -- id="org.eclipse.jdt.apt.pluggable.core" -- download-size="0" -- install-size="0" -- version="0.0.0" -- unpack="false"/> -- -- <plugin -- id="org.eclipse.jdt.compiler.apt" -- download-size="0" -- install-size="0" -- version="0.0.0" -- fragment="true" -- unpack="false"/> -- -- <plugin -- id="org.eclipse.jdt.compiler.tool" -- download-size="0" -- install-size="0" -- version="0.0.0" -- fragment="true" -- unpack="false"/> -- -- <plugin - id="org.eclipse.jdt.core" - download-size="0" - install-size="0" diff --git a/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml b/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml new file mode 100644 index 000000000000..368cdf8fbb5e --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml @@ -0,0 +1,41 @@ +--- features/org.eclipse.cvs/build.xml.orig 2008-08-02 14:53:20.000000000 -0400 ++++ features/org.eclipse.cvs/build.xml 2008-08-02 14:53:59.000000000 -0400 +@@ -155,6 +155,14 @@ + </fileset> + </copy> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -171,6 +179,14 @@ + </fileset> + </copy> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -272,6 +288,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-pde-source-build.xml b/java/eclipse/files/patch-features-org.eclipse.cvs.source-build.xml index fc7899c1c47f..77fa433272da 100644 --- a/java/eclipse/files/patch-features-pde-source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.cvs.source-build.xml @@ -1,17 +1,17 @@ ---- features/org.eclipse.pde.source/build.xml.orig Mon Jun 25 15:39:43 2007 -+++ features/org.eclipse.pde.source/build.xml Fri Aug 17 15:41:11 2007 -@@ -101,6 +101,10 @@ +--- features/org.eclipse.cvs.source/build.xml.orig 2008-08-02 14:55:45.000000000 -0400 ++++ features/org.eclipse.cvs.source/build.xml 2008-08-02 14:56:33.000000000 -0400 +@@ -131,6 +131,10 @@ </target> <target name="rootFileslinux_motif_x86"> </target> + <target name="rootFilesfreebsd_gtk_x86"> -+ </target> ++ </target> + <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> ++ </target> <target name="rootFilessolaris_gtk_sparc"> </target> <target name="rootFilessolaris_gtk_x86"> -@@ -129,6 +133,8 @@ +@@ -158,6 +162,8 @@ <antcall target="rootFileslinux_gtk_s390"/> <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> diff --git a/java/eclipse/files/patch-features-equinox-executable-feature.xml b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml index 997b83780f76..df4ef06d246f 100644 --- a/java/eclipse/files/patch-features-equinox-executable-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml @@ -1,9 +1,9 @@ ---- features/org.eclipse.equinox.executable/feature.xml.orig 2007-06-26 04:57:23.000000000 +0900 -+++ features/org.eclipse.equinox.executable/feature.xml 2007-08-23 23:47:11.000000000 +0900 -@@ -52,6 +52,28 @@ - unpack="true"/> +--- features/org.eclipse.equinox.executable/feature.xml.orig 2008-08-02 15:03:58.000000000 -0400 ++++ features/org.eclipse.equinox.executable/feature.xml 2008-08-02 15:04:36.000000000 -0400 +@@ -79,6 +79,16 @@ + fragment="true"/> - <plugin + <plugin + id="org.eclipse.equinox.launcher.gtk.freebsd.x86" + os="freebsd" + ws="gtk" @@ -11,10 +11,16 @@ + download-size="0" + install-size="0" + version="0.0.0" -+ fragment="true" -+ unpack="true"/> ++ fragment="true"/> + -+ <plugin ++ <plugin + id="org.eclipse.equinox.launcher.gtk.linux.x86_64" + os="linux" + ws="gtk" +@@ -89,6 +99,16 @@ + fragment="true"/> + + <plugin + id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" + os="freebsd" + ws="gtk" @@ -22,10 +28,9 @@ + download-size="0" + install-size="0" + version="0.0.0" -+ fragment="true" -+ unpack="true"/> ++ fragment="true"/> + -+ <plugin - id="org.eclipse.equinox.launcher.gtk.linux.x86" - os="linux" - ws="gtk" ++ <plugin + id="org.eclipse.equinox.launcher.motif.aix.ppc" + os="aix" + ws="motif" diff --git a/java/eclipse/files/patch-features-equinox-executable-library-gtk-build.sh b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh index 60227e2bb485..a86cc3eb059b 100644 --- a/java/eclipse/files/patch-features-equinox-executable-library-gtk-build.sh +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh @@ -1,22 +1,22 @@ ---- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2007-09-22 01:59:40.000000000 +0900 -+++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2007-10-20 18:57:55.000000000 +0900 -@@ -10,6 +10,9 @@ - # IBM Corporation - initial API and implementation - # Kevin Cornell (Rational Software Corporation) - # Martin Oberhuber (Wind River) - [176805] Support building with gcc and debug -+# -+# This is from "features/org.eclipse.equinox.executable/library/gtk/build.sh" -+# - #******************************************************************************* - # - # Usage: sh build.sh [<optional switches>] [clean] -@@ -50,6 +53,25 @@ - fi - - case $OS in +--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2008-09-30 19:29:09.000000000 -0400 ++++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2008-09-30 19:28:40.000000000 -0400 +@@ -53,6 +53,7 @@ + "Linux") + makefile="make_linux.mak" + defaultOS="linux" ++ MAKE=make + case $MODEL in + "x86_64") + defaultOSArch="x86_64" +@@ -94,9 +95,31 @@ + ;; + esac + ;; + "FreeBSD") + makefile="make_freebsd.mak" + defaultOS="freebsd" ++ MAKE=gmake ++ javaHome="$JAVA_HOME" + case $MODEL in + "amd64") + defaultOSArch="amd64" @@ -33,32 +33,37 @@ + ;; + esac + ;; - "Linux") - makefile="make_linux.mak" - defaultOS="linux" -@@ -148,7 +170,6 @@ - DEFAULT_OS="$defaultOS" - DEFAULT_OS_ARCH="$defaultOSArch" - DEFAULT_WS="$defaultWS" --JAVA_HOME=$javaHome + "SunOS") + makefile="make_solaris.mak" + defaultOS="solaris" ++ MAKE=make + javaHome="/usr/jdk/jdk1.5.0_01" + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH +@@ -154,7 +177,7 @@ + JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava - export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA -@@ -156,13 +177,13 @@ +-LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" ++LIBRARY_DIR="../../../../plugins/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch" + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + + export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS JAVA_HOME DEFAULT_JAVA LIBRARY_DIR +@@ -162,13 +185,13 @@ # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then - make -f $makefile $extraArgs -+ gmake -f $makefile $extraArgs ++ ${MAKE} -f $makefile $extraArgs else echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" - make -f $makefile clean -+ gmake -f $makefile clean ++ ${MAKE} -f $makefile clean case x$CC in - x*gcc*) make -f $makefile all PICFLAG=-fpic ;; - *) make -f $makefile all ;; -+ x*gcc*) gmake -f $makefile all PICFLAG=-fpic ;; -+ *) gmake -f $makefile all ;; ++ x*gcc*) ${MAKE} -f $makefile all PICFLAG=-fpic ;; ++ *) ${MAKE} -f $makefile all ;; esac fi else diff --git a/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-make_freebsd.mak b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-make_freebsd.mak new file mode 100644 index 000000000000..4367ab83a407 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-make_freebsd.mak @@ -0,0 +1,17 @@ +--- features/org.eclipse.equinox.executable/library/gtk/make_freebsd.mak.orig 2008-08-02 15:47:34.000000000 -0400 ++++ features/org.eclipse.equinox.executable/library/gtk/make_freebsd.mak 2008-08-02 15:47:42.000000000 -0400 +@@ -42,12 +42,12 @@ + EXEC = $(PROGRAM_OUTPUT) + DLL = $(PROGRAM_LIBRARY) + #LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl +-LIBS = -lpthread -ldl ++LIBS = -lpthread + GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" + LFLAGS = -shared -fpic -Wl,--export-dynamic + CFLAGS = -g -s -Wall\ + -fpic \ +- -DLINUX \ ++ -DFREEBSD \ + -DMOZILLA_FIX \ + -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ + -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ diff --git a/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties new file mode 100644 index 000000000000..772048790797 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.properties @@ -0,0 +1,14 @@ +--- features/org.eclipse.equinox.executable/target.build.properties.orig 2008-08-02 14:57:57.000000000 -0400 ++++ features/org.eclipse.equinox.executable/target.build.properties 2008-08-02 15:02:29.000000000 -0400 +@@ -46,4 +46,9 @@ + root.qnx.photon.x86=bin/photon/qnx/x86 + + root.linux.motif.x86=bin/motif/linux/x86,motif_root +-root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so +\ No newline at end of file ++root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so ++ ++root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root ++root.freebsd.gtk.x86.permissions.755=${launcherName} ++root.freebsd.gtk.amd64=bin/gtk/freebsd/amd64,gtk_root ++root.freebsd.gtk.amd64.permissions.755=${launcherName} diff --git a/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml new file mode 100644 index 000000000000..e0d78cc01f73 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-target.build.xml @@ -0,0 +1,41 @@ +--- features/org.eclipse.equinox.executable/target.build.xml.orig 2008-08-02 15:00:18.000000000 -0400 ++++ features/org.eclipse.equinox.executable/target.build.xml 2008-08-02 15:02:09.000000000 -0400 +@@ -102,6 +102,14 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="${launcherName}" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" /> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/bin/gtk/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/gtk_root" includes="**" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="${launcherName}" /> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -126,6 +134,14 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="${launcherName}" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="libcairo-swt.so" /> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/bin/gtk/freebsd/amd64" includes="**" /> ++ <fileset dir="${basedir}/gtk_root" includes="**" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="${launcherName}" /> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -209,6 +225,8 @@ + <antcall target="rootFileslinux_gtk_x86_64"/> + <antcall target="rootFileslinux_gtk_ia64"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml b/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml new file mode 100644 index 000000000000..5e93d3b5135e --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.equinox.p2.user.ui/build.xml.orig 2008-08-02 15:07:43.000000000 -0400 ++++ features/org.eclipse.equinox.p2.user.ui/build.xml 2008-08-02 15:08:24.000000000 -0400 +@@ -236,6 +236,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -263,6 +267,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml new file mode 100644 index 000000000000..d16869524f5d --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.p2.user.ui.source-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.equinox.p2.user.ui.source/build.xml.orig 2008-08-02 15:09:24.000000000 -0400 ++++ features/org.eclipse.equinox.p2.user.ui.source/build.xml 2008-08-02 15:10:18.000000000 -0400 +@@ -236,6 +236,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -263,6 +267,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-pde-build.xml b/java/eclipse/files/patch-features-org.eclipse.help-build.xml index df6f705a7ae8..df3c989e911b 100644 --- a/java/eclipse/files/patch-features-pde-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.help-build.xml @@ -1,17 +1,17 @@ ---- features/org.eclipse.pde/build.xml.orig Mon Jun 25 15:39:42 2007 -+++ features/org.eclipse.pde/build.xml Fri Aug 17 15:41:11 2007 -@@ -136,6 +136,10 @@ +--- features/org.eclipse.help/build.xml.orig 2008-08-02 15:11:04.000000000 -0400 ++++ features/org.eclipse.help/build.xml 2008-08-02 15:11:38.000000000 -0400 +@@ -177,6 +177,10 @@ </target> <target name="rootFileslinux_motif_x86"> </target> + <target name="rootFilesfreebsd_gtk_x86"> -+ </target> ++ </target> + <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> ++ </target> <target name="rootFilessolaris_gtk_sparc"> </target> <target name="rootFilessolaris_gtk_x86"> -@@ -164,6 +168,8 @@ +@@ -204,6 +208,8 @@ <antcall target="rootFileslinux_gtk_s390"/> <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml new file mode 100644 index 000000000000..d722c0718b5a --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.help.source/build.xml.orig 2008-08-02 15:12:30.000000000 -0400 ++++ features/org.eclipse.help.source/build.xml 2008-08-02 15:13:22.000000000 -0400 +@@ -177,6 +177,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -204,6 +208,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.jdt-build.xml b/java/eclipse/files/patch-features-org.eclipse.jdt-build.xml new file mode 100644 index 000000000000..447e0b66b8df --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.jdt-build.xml @@ -0,0 +1,41 @@ +--- features/org.eclipse.jdt/build.xml.orig 2008-08-02 15:14:06.000000000 -0400 ++++ features/org.eclipse.jdt/build.xml 2008-08-02 15:15:01.000000000 -0400 +@@ -225,6 +225,14 @@ + </fileset> + </copy> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -241,6 +249,14 @@ + </fileset> + </copy> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -342,6 +358,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.jdt.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.jdt.source-build.xml new file mode 100644 index 000000000000..3f453f4810e9 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.jdt.source-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.jdt.source/build.xml.orig 2008-08-02 15:15:44.000000000 -0400 ++++ features/org.eclipse.jdt.source/build.xml 2008-08-02 15:16:07.000000000 -0400 +@@ -201,6 +201,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -228,6 +232,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.pde-build.xml b/java/eclipse/files/patch-features-org.eclipse.pde-build.xml new file mode 100644 index 000000000000..67dc317a101b --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.pde-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.pde/build.xml.orig 2008-08-02 15:16:40.000000000 -0400 ++++ features/org.eclipse.pde/build.xml 2008-08-02 15:17:03.000000000 -0400 +@@ -161,6 +161,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -187,6 +191,8 @@ + <antcall target="rootFileslinux_gtk_ia64"/> + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> diff --git a/java/eclipse/files/patch-features-jdt-source-build.xml b/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml index 619787c5b776..3c4963db4d86 100644 --- a/java/eclipse/files/patch-features-jdt-source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml @@ -1,17 +1,17 @@ ---- features/org.eclipse.jdt.source/build.xml.orig Mon Jun 25 15:39:41 2007 -+++ features/org.eclipse.jdt.source/build.xml Fri Aug 17 15:41:11 2007 +--- features/org.eclipse.pde.p2/build.xml.orig 2008-08-02 12:26:51.000000000 -0400 ++++ features/org.eclipse.pde.p2/build.xml 2008-08-02 12:27:51.000000000 -0400 @@ -111,6 +111,10 @@ </target> <target name="rootFileslinux_motif_x86"> </target> + <target name="rootFilesfreebsd_gtk_x86"> -+ </target> ++ </target> + <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> ++ </target> <target name="rootFilessolaris_gtk_sparc"> </target> <target name="rootFilessolaris_gtk_x86"> -@@ -139,6 +143,8 @@ +@@ -138,6 +142,8 @@ <antcall target="rootFileslinux_gtk_s390"/> <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml new file mode 100644 index 000000000000..23a079f9b078 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.pde.p2.source/build.xml.orig 2008-08-02 11:44:51.000000000 -0400 ++++ features/org.eclipse.pde.p2.source/build.xml 2008-08-02 11:45:51.000000000 -0400 +@@ -111,6 +111,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -138,6 +142,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.pde.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.pde.source-build.xml new file mode 100644 index 000000000000..f28cd366f576 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.pde.source-build.xml @@ -0,0 +1,22 @@ +--- features/org.eclipse.pde.source/build.xml.orig 2008-08-02 15:18:03.000000000 -0400 ++++ features/org.eclipse.pde.source/build.xml 2008-08-02 15:18:19.000000000 -0400 +@@ -156,6 +156,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -183,6 +187,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.platform-build.properties b/java/eclipse/files/patch-features-org.eclipse.platform-build.properties new file mode 100644 index 000000000000..687760aa685f --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.platform-build.properties @@ -0,0 +1,21 @@ +--- features/org.eclipse.platform/build.properties.orig 2008-08-02 15:18:51.000000000 -0400 ++++ features/org.eclipse.platform/build.properties 2008-08-02 15:20:21.000000000 -0400 +@@ -49,6 +49,11 @@ + #root.linux.gtk.ia64=../../features/org.eclipse.equinox.executable/bin/gtk/linux/ia64,gtk + root.hpux.motif.ia64_32=../../features/org.eclipse.equinox.executable/bin/motif/hpux/ia64_32,motif + ++root.freebsd.gtk.x86=about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86,gtk ++root.freebsd.gtk.x86.permissions.755=*.so* ++root.freebsd.gtk.amd64=about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64,gtk ++root.freebsd.gtk.amd64.permissions.755=*.so* ++ + # Need to be fixed to reflect eventual change into feature.xml + #root.qnx.photon.x86=../../features/org.eclipse.equinox.executable/bin/photon/qnx/x86,win32 + +@@ -62,4 +67,4 @@ + #expected location of eclipse executable when compiled as part of build + root.linux.gtk.ppc64=../../launchertmp,gtk + root.linux.gtk.ppc64.permissions.755=*.so* +-root.hpux.motif.ia64=../../launchertmp,motif +\ No newline at end of file ++root.hpux.motif.ia64=../../launchertmp,motif diff --git a/java/eclipse/files/patch-features-org.eclipse.platform-build.xml b/java/eclipse/files/patch-features-org.eclipse.platform-build.xml new file mode 100644 index 000000000000..f441d4f4550c --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.platform-build.xml @@ -0,0 +1,126 @@ +--- features/org.eclipse.platform/build.xml.orig 2008-09-25 19:20:11.000000000 -0400 ++++ features/org.eclipse.platform/build.xml 2008-09-25 19:19:54.000000000 -0400 +@@ -27,6 +27,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.qnx.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="qnx"/> +@@ -67,6 +72,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.hpux.PA_RISC" target="${target}"> + <property name="arch" value="PA_RISC"/> + <property name="os" value="hpux"/> +@@ -147,6 +157,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.net.win32.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -157,6 +172,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.net.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.jsch.core" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -390,7 +410,7 @@ + <include name="license.html"/> + </fileset> + </copy> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu/feature.xml" selfVersion="3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu" featureIds="org.eclipse.help:0.0.0,1.0.1.R34x_v20080827-7r7xEIxEI6Zu5nEqN7M3UBpglaat,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.1.r34x_v20080721-7d-7OEMsLAz-vTBJ-ZHQaF155CE," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.0.I20080604,org.eclipse.core.boot:0.0.0,3.1.100.v20080218,org.eclipse.core.filebuffers:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.filesystem:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.net:0.0.0,1.1.0.I20080604,org.eclipse.core.net.win32.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.linux.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.1.R34x_v20080902,org.eclipse.core.resources.compatibility:0.0.0,3.4.0.v20080604-1400,org.eclipse.osgi.util:0.0.0,3.1.300.v20080303,org.eclipse.debug.core:0.0.0,3.4.0.v20080612,org.eclipse.debug.ui:0.0.0,3.4.1.v20080811_r341,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.platform:0.0.0,3.3.101.v200809111700,org.eclipse.platform.doc.user:0.0.0,3.4.1.r341_v20080808-0800,org.eclipse.search:0.0.0,3.4.1.r341_v20080813-0800,org.eclipse.team.core:0.0.0,3.4.1.r34x_20080827,org.eclipse.team.ui:0.0.0,3.4.1.r34x_20080827,org.eclipse.text:0.0.0,3.4.0.v20080605-1800,org.eclipse.jface.text:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.jsch.core:0.0.0,1.1.100.I20080604,org.eclipse.jsch.ui:0.0.0,1.1.100.I20080415,org.eclipse.ui.console:0.0.0,3.3.0.v20080529-1300,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20080512-2000,org.eclipse.ui.intro:0.0.0,3.2.201.v20080702_34x,org.eclipse.ui.intro.universal:0.0.0,3.2.200.v20080508,org.eclipse.ui.cheatsheets:0.0.0,3.3.101.v20080702_34x,org.eclipse.ui.browser:0.0.0,3.2.201.v20080708_34x,org.eclipse.ui.navigator:0.0.0,3.3.101.M20080827-0800,org.eclipse.ui.navigator.resources:0.0.0,3.3.101.M20080910-0800,org.eclipse.ui.net:0.0.0,1.0.0.I20080605,org.eclipse.ui.workbench.texteditor:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.ui.views:0.0.0,3.3.0.I20080509-2000,org.eclipse.ui.editors:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.externaltools:0.0.0,3.2.0.v20080514-1542,org.eclipse.ui.ide:0.0.0,3.4.1.M20080903-2000,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20080603-2000,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.201.R34x_v20080714,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.100.v20080318,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20080509-2000,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.linux.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20080604-1400,org.eclipse.core.filesystem.win32.ia64:0.0.0,1.1.0.v20071121,org.eclipse.core.resources.win32.x86:0.0.0,3.4.0.v20071204,org.eclipse.core.resources.win32.ia64:0.0.0,3.4.0.v20071204,org.eclipse.update.core.linux:0.0.0,3.2.0.v20080422,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.1.M20080730-0800,org.eclipse.equinox.security:0.0.0,1.0.1.R34x_v20080721,org.eclipse.equinox.security.ui:0.0.0,1.0.0.v20080603-1810,org.eclipse.equinox.security.win32.x86:0.0.0,1.0.0.v20080529-1600,org.eclipse.equinox.security.macosx:0.0.0,1.0.0.v20080602-2000,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu/feature.xml" selfVersion="3.4.1.r341_v20080731-9I96EiDElYevwz-p1bP5z-NlAaP7vtX6Utotqsu" featureIds="org.eclipse.help:0.0.0,1.0.1.R34x_v20080827-7r7xEIxEI6Zu5nEqN7M3UBpglaat,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.1.r34x_v20080721-7d-7OEMsLAz-vTBJ-ZHQaF155CE," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.0.I20080604,org.eclipse.core.boot:0.0.0,3.1.100.v20080218,org.eclipse.core.filebuffers:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.filesystem:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.net:0.0.0,1.1.0.I20080604,org.eclipse.core.net.win32.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.linux.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.net.freebsd.x86:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.1.R34x_v20080902,org.eclipse.core.resources.compatibility:0.0.0,3.4.0.v20080604-1400,org.eclipse.osgi.util:0.0.0,3.1.300.v20080303,org.eclipse.debug.core:0.0.0,3.4.0.v20080612,org.eclipse.debug.ui:0.0.0,3.4.1.v20080811_r341,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.platform:0.0.0,3.3.101.v200809111700,org.eclipse.platform.doc.user:0.0.0,3.4.1.r341_v20080808-0800,org.eclipse.search:0.0.0,3.4.1.r341_v20080813-0800,org.eclipse.team.core:0.0.0,3.4.1.r34x_20080827,org.eclipse.team.ui:0.0.0,3.4.1.r34x_20080827,org.eclipse.text:0.0.0,3.4.0.v20080605-1800,org.eclipse.jface.text:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.jsch.core:0.0.0,1.1.100.I20080604,org.eclipse.jsch.ui:0.0.0,1.1.100.I20080415,org.eclipse.ui.console:0.0.0,3.3.0.v20080529-1300,org.eclipse.ui.presentations.r21:0.0.0,3.2.100.I20080512-2000,org.eclipse.ui.intro:0.0.0,3.2.201.v20080702_34x,org.eclipse.ui.intro.universal:0.0.0,3.2.200.v20080508,org.eclipse.ui.cheatsheets:0.0.0,3.3.101.v20080702_34x,org.eclipse.ui.browser:0.0.0,3.2.201.v20080708_34x,org.eclipse.ui.navigator:0.0.0,3.3.101.M20080827-0800,org.eclipse.ui.navigator.resources:0.0.0,3.3.101.M20080910-0800,org.eclipse.ui.net:0.0.0,1.0.0.I20080605,org.eclipse.ui.workbench.texteditor:0.0.0,3.4.1.r341_v20080827-1100,org.eclipse.ui.views:0.0.0,3.3.0.I20080509-2000,org.eclipse.ui.editors:0.0.0,3.4.0.v20080603-2000,org.eclipse.ui.externaltools:0.0.0,3.2.0.v20080514-1542,org.eclipse.ui.ide:0.0.0,3.4.1.M20080903-2000,org.eclipse.ui.ide.application:0.0.0,1.0.0.I20080603-2000,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.201.R34x_v20080714,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.100.v20080318,org.eclipse.ui.workbench.compatibility:0.0.0,3.2.0.I20080509-2000,org.eclipse.core.filesystem.hpux.ia64_32:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.hpux.PA_RISC:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.linux.ppc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.linux.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.linux.x86_64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.freebsd.x86:0.0.0,1.2.0.v20080604-1400,org.eclipse.core.filesystem.freebsd.amd64:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.solaris.sparc:0.0.0,1.0.100.v20080604-1400,org.eclipse.core.filesystem.macosx:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.qnx.x86:0.0.0,1.0.0.v20080604-1400,org.eclipse.core.filesystem.win32.x86:0.0.0,1.1.0.v20080604-1400,org.eclipse.core.filesystem.win32.ia64:0.0.0,1.1.0.v20071121,org.eclipse.core.resources.win32.x86:0.0.0,3.4.0.v20071204,org.eclipse.core.resources.win32.ia64:0.0.0,3.4.0.v20071204,org.eclipse.update.core.linux:0.0.0,3.2.0.v20080422,org.eclipse.update.core.freebsd:0.0.0,3.2.0.v20080422,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.1.M20080730-0800,org.eclipse.equinox.security:0.0.0,1.0.1.R34x_v20080721,org.eclipse.equinox.security.ui:0.0.0,1.0.0.v20080603-1810,org.eclipse.equinox.security.win32.x86:0.0.0,1.0.0.v20080529-1600,org.eclipse.equinox.security.macosx:0.0.0,1.0.0.v20080602-2000,"/> + <antcall target="rootFiles"> + <param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/> + </antcall> +@@ -517,6 +537,28 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.x86"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/gtk"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> ++ <include name="startup.jar"/> ++ </fileset> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -558,6 +600,28 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.amd64"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/gtk"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> ++ <include name="startup.jar"/> ++ </fileset> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -769,6 +833,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-platform-feature.xml b/java/eclipse/files/patch-features-org.eclipse.platform-feature.xml index 01dd087306c7..9b4f09d7485d 100644 --- a/java/eclipse/files/patch-features-platform-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.platform-feature.xml @@ -1,11 +1,10 @@ ---- features/org.eclipse.platform/feature.xml.orig 2007-06-26 04:57:25.000000000 +0900 -+++ features/org.eclipse.platform/feature.xml 2007-08-23 23:20:27.000000000 +0900 -@@ -523,9 +523,29 @@ +--- features/org.eclipse.platform/feature.xml.orig 2008-08-02 15:25:04.000000000 -0400 ++++ features/org.eclipse.platform/feature.xml 2008-08-02 15:25:49.000000000 -0400 +@@ -96,6 +96,16 @@ unpack="false"/> <plugin -- id="org.eclipse.core.filesystem.linux.x86_64" -+ id="org.eclipse.core.filesystem.freebsd.x86" ++ id="org.eclipse.core.net.freebsd.x86" + os="freebsd" + arch="x86" + download-size="0" @@ -15,24 +14,37 @@ + unpack="false"/> + + <plugin -+ id="org.eclipse.core.filesystem.linux.x86" - os="linux" -- arch="x86_64" + id="org.eclipse.core.resources" + download-size="0" + install-size="0" +@@ -406,6 +416,26 @@ + unpack="false"/> + + <plugin ++ id="org.eclipse.core.filesystem.freebsd.x86" ++ os="freebsd" + arch="x86" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" -+ unpack="false"/> ++ unpack="false"/> + + <plugin + id="org.eclipse.core.filesystem.freebsd.amd64" + os="freebsd" + arch="amd64" - download-size="0" - install-size="0" - version="0.0.0" -@@ -582,6 +602,15 @@ ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin + id="org.eclipse.core.filesystem.solaris.sparc" + os="solaris" + arch="sparc" +@@ -494,6 +524,15 @@ unpack="false"/> <plugin @@ -45,6 +57,6 @@ + unpack="false"/> + + <plugin - id="org.eclipse.update.core.linux" - os="linux" + id="org.eclipse.ui.views.properties.tabbed" download-size="0" + install-size="0" diff --git a/java/eclipse/files/patch-features-org.eclipse.platform.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.platform.source-build.xml new file mode 100644 index 000000000000..e757e3c5111e --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.platform.source-build.xml @@ -0,0 +1,34 @@ +--- features/org.eclipse.platform.source/build.xml.orig 2008-08-02 15:26:47.000000000 -0400 ++++ features/org.eclipse.platform.source/build.xml 2008-08-02 15:27:23.000000000 -0400 +@@ -42,6 +42,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd.source" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.ui.workbench.compatibility.source" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -348,6 +353,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -375,6 +384,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtl_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.platform.source-feature.xml b/java/eclipse/files/patch-features-org.eclipse.platform.source-feature.xml new file mode 100644 index 000000000000..d1b022b59f3a --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.platform.source-feature.xml @@ -0,0 +1,10 @@ +--- features/org.eclipse.platform.source/feature.xml.orig 2008-09-25 19:28:09.000000000 -0400 ++++ features/org.eclipse.platform.source/feature.xml 2008-09-25 19:27:48.000000000 -0400 +@@ -67,6 +67,7 @@ + <plugin id="org.eclipse.update.ui.source" version="3.2.100.v20080318" unpack="false"/> + <plugin id="org.eclipse.ui.workbench.compatibility.source" version="3.2.0.I20080509-2000" unpack="false"/> + <plugin id="org.eclipse.update.core.linux.source" version="3.2.0.v20080422" os="linux" unpack="false"/> ++ <plugin id="org.eclipse.update.core.freebsd.source" version="3.2.0.v20080422" os="freebsd" unpack="false"/> + <plugin id="org.eclipse.update.core.win32.source" version="3.2.100.v20080107" os="win32" unpack="false"/> + <plugin id="org.eclipse.ui.views.properties.tabbed.source" version="3.4.1.M20080730-0800" unpack="false"/> + <plugin id="org.eclipse.equinox.security.source" version="1.0.1.R34x_v20080721" unpack="false"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.rcp-build.properties b/java/eclipse/files/patch-features-org.eclipse.rcp-build.properties new file mode 100644 index 000000000000..cfca5ed4fd1c --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.rcp-build.properties @@ -0,0 +1,14 @@ +--- features/org.eclipse.rcp/build.properties.orig 2008-08-02 15:34:27.000000000 -0400 ++++ features/org.eclipse.rcp/build.properties 2008-08-02 15:35:07.000000000 -0400 +@@ -42,6 +42,11 @@ + root.linux.motif.x86=../../features/org.eclipse.platform/about_files/linux.motif.x86,../../features/org.eclipse.equinox.executable/bin/motif/linux/x86,file:../../plugins/org.eclipse.swt.motif.linux.x86/libXm.so.2 + root.linux.motif.x86.permissions.755=*.so* + ++root.freebsd.gtk.x86=../../features/org.eclipse.platform/about_files/freebsd.gtk.x86,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86 ++root.freebsd.gtk.x86.permissions.755=*.so* ++root.freebsd.gtk.amd64=../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64 ++root.freebsd.gtk.amd64.permissions.755=*.so* ++ + root.macosx.carbon.ppc=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc + root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse + root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt diff --git a/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml b/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml new file mode 100644 index 000000000000..b1602cff84de --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml @@ -0,0 +1,118 @@ +--- features/org.eclipse.rcp/build.xml.orig 2008-09-26 19:38:22.000000000 -0400 ++++ features/org.eclipse.rcp/build.xml 2008-09-26 19:38:10.000000000 -0400 +@@ -37,6 +37,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.carbon.macosx" target="${target}"> + <property name="arch" value="ppc"/> + <property name="os" value="macosx"/> +@@ -72,6 +77,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.solaris.sparc" target="${target}"> + <property name="arch" value="sparc"/> + <property name="os" value="solaris"/> +@@ -112,11 +122,21 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.wpf.win32.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -363,7 +383,7 @@ + <include name="eclipse_update_120.jpg"/> + </fileset> + </copy> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341/feature.xml" selfVersion="3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.8.1.v20080530,org.eclipse.core.commands:0.0.0,3.4.0.I20080509-2000,org.eclipse.core.databinding:0.0.0,1.1.1.M20080827-0800b,org.eclipse.core.databinding.beans:0.0.0,1.1.1.M20080827-0800a,org.eclipse.core.jobs:0.0.0,3.4.0.v20080512,org.eclipse.core.expressions:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.runtime:0.0.0,3.4.0.v20080512,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.4.2.R34x_v20080826-1230,org.eclipse.help:0.0.0,3.3.101.v20080702_34x,org.eclipse.swt:0.0.0,3.4.1.v3449c,org.eclipse.jface:0.0.0,3.4.1.M20080827-2000,org.eclipse.jface.databinding:0.0.0,1.2.1.M20080827-0800a,org.eclipse.ui:0.0.0,3.4.1.M20080910-0800,org.eclipse.ui.workbench:0.0.0,3.4.1.M20080827-0800a,org.eclipse.ui.carbon:0.0.0,4.0.0.I20080610-1200,org.eclipse.update.configurator:0.0.0,3.2.201.R34x_v20080819,org.eclipse.equinox.simpleconfigurator:0.0.0,1.0.0.v20080604,org.eclipse.swt.win32.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.carbon.macosx:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.4.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.1.v3449c,org.eclipse.rcp:0.0.0,3.4.0.v20080507,org.eclipse.core.contenttype:0.0.0,3.3.0.v20080604-1400,org.eclipse.equinox.app:0.0.0,1.1.0.v20080421-2006,org.eclipse.equinox.common:0.0.0,3.4.0.v20080421-2006,org.eclipse.equinox.preferences:0.0.0,3.2.201.R34x_v20080709,org.eclipse.equinox.registry:0.0.0,3.4.0.v20080516-0950,org.eclipse.equinox.launcher:0.0.0,1.0.101.R34x_v20080819,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.ia64_32:0.0.0,1.0.1.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.100.v20080303,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.ia64:0.0.0,1.0.101.R34x_v20080731,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341/feature.xml" selfVersion="3.4.100.r341_v20080814-989JESIEdAciFYfkZZsBfSwQ2341" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.8.1.v20080530,org.eclipse.core.commands:0.0.0,3.4.0.I20080509-2000,org.eclipse.core.databinding:0.0.0,1.1.1.M20080827-0800b,org.eclipse.core.databinding.beans:0.0.0,1.1.1.M20080827-0800a,org.eclipse.core.jobs:0.0.0,3.4.0.v20080512,org.eclipse.core.expressions:0.0.0,3.4.0.v20080603-2000,org.eclipse.core.runtime:0.0.0,3.4.0.v20080512,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.4.2.R34x_v20080826-1230,org.eclipse.help:0.0.0,3.3.101.v20080702_34x,org.eclipse.swt:0.0.0,3.4.1.v3449c,org.eclipse.jface:0.0.0,3.4.1.M20080827-2000,org.eclipse.jface.databinding:0.0.0,1.2.1.M20080827-0800a,org.eclipse.ui:0.0.0,3.4.1.M20080910-0800,org.eclipse.ui.workbench:0.0.0,3.4.1.M20080827-0800a,org.eclipse.ui.carbon:0.0.0,4.0.0.I20080610-1200,org.eclipse.update.configurator:0.0.0,3.2.201.R34x_v20080819,org.eclipse.equinox.simpleconfigurator:0.0.0,1.0.0.v20080604,org.eclipse.swt.win32.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.R3_4,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.4.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.freebsd.amd64:0.0.0,3.4.1.v3449c,org.eclipse.swt.carbon.macosx:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.0.v3448f,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.1.v3449c,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.1.v3449c,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.4.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.4.1.v3449c,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.1.v3449c,org.eclipse.rcp:0.0.0,3.4.0.v20080507,org.eclipse.core.contenttype:0.0.0,3.3.0.v20080604-1400,org.eclipse.equinox.app:0.0.0,1.1.0.v20080421-2006,org.eclipse.equinox.common:0.0.0,3.4.0.v20080421-2006,org.eclipse.equinox.preferences:0.0.0,3.2.201.R34x_v20080709,org.eclipse.equinox.registry:0.0.0,3.4.0.v20080516-0950,org.eclipse.equinox.launcher:0.0.0,1.0.101.R34x_v20080819,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.freebsd.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0.v20080303,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.101.R34x_v20080805,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.gtk.freebsd.amd64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.ia64_32:0.0.0,1.0.1.R34x_v20080731,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.100.v20080303,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.x86_64:0.0.0,1.0.101.R34x_v20080731,org.eclipse.equinox.launcher.win32.win32.ia64:0.0.0,1.0.101.R34x_v20080731,"/> + <antcall target="rootFiles"> + <param name="rootTarget" value="rootFiles${os}_${ws}_${arch}"/> + </antcall> +@@ -472,6 +492,25 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -506,6 +545,25 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -684,6 +742,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-rcp-feature.xml b/java/eclipse/files/patch-features-org.eclipse.rcp-feature.xml index b86cd7745c14..b91aeb55ff02 100644 --- a/java/eclipse/files/patch-features-rcp-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.rcp-feature.xml @@ -1,12 +1,11 @@ ---- features/org.eclipse.rcp/feature.xml.orig 2007-10-10 20:23:28.000000000 +0900 -+++ features/org.eclipse.rcp/feature.xml 2007-10-10 20:26:39.000000000 +0900 -@@ -199,6 +199,26 @@ - version="0.0.0" - fragment="true" +--- features/org.eclipse.rcp/feature.xml.orig 2008-09-26 19:47:12.000000000 -0400 ++++ features/org.eclipse.rcp/feature.xml 2008-09-26 19:46:59.000000000 -0400 +@@ -207,6 +207,17 @@ unpack="false"/> -+ <plugin + + <plugin + id="org.eclipse.swt.gtk.freebsd.x86" -+ os="linux" ++ os="freebsd" + ws="gtk" + arch="x86" + download-size="0" @@ -14,25 +13,35 @@ + version="0.0.0" + fragment="true" + unpack="false"/> ++ + <plugin + id="org.eclipse.swt.gtk.linux.s390" + os="linux" + ws="gtk" +@@ -273,6 +284,17 @@ + unpack="false"/> + + <plugin + id="org.eclipse.swt.gtk.freebsd.amd64" -+ os="linux" ++ os="freebsd" + ws="gtk" -+ arch="x86" ++ arch="amd64" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> - - <plugin - id="org.eclipse.swt.gtk.linux.s390" -@@ -442,6 +462,26 @@ ++ ++ <plugin + id="org.eclipse.swt.carbon.macosx" + os="macosx" + ws="carbon" +@@ -448,6 +470,16 @@ fragment="true"/> <plugin + id="org.eclipse.equinox.launcher.gtk.freebsd.x86" -+ os="linux" ++ os="freebsd" + ws="gtk" + arch="x86" + download-size="0" @@ -41,16 +50,23 @@ + fragment="true"/> + + <plugin + id="org.eclipse.equinox.launcher.gtk.linux.s390" + os="linux" + ws="gtk" +@@ -488,6 +520,16 @@ + fragment="true"/> + + <plugin + id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" -+ os="linux" ++ os="freebsd" + ws="gtk" -+ arch="x86" ++ arch="amd64" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true"/> + + <plugin - id="org.eclipse.equinox.launcher.gtk.linux.s390" - os="linux" - ws="gtk" + id="org.eclipse.equinox.launcher.motif.aix.ppc" + os="aix" + ws="motif" diff --git a/java/eclipse/files/patch-features-org.eclipse.rcp.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.rcp.source-build.xml new file mode 100644 index 000000000000..379f6a3305aa --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.rcp.source-build.xml @@ -0,0 +1,39 @@ +--- features/org.eclipse.rcp.source/build.xml.orig 2008-08-02 15:37:58.000000000 -0400 ++++ features/org.eclipse.rcp.source/build.xml 2008-08-02 15:38:41.000000000 -0400 +@@ -92,6 +92,16 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86.source" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64.source" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.x86.source" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="solaris"/> +@@ -316,6 +326,10 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + </target> + <target name="rootFilessolaris_gtk_x86"> +@@ -343,6 +357,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml b/java/eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml new file mode 100644 index 000000000000..21762a8d7c98 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml @@ -0,0 +1,11 @@ +--- features/org.eclipse.rcp.source/feature.xml.orig 2008-09-26 19:53:35.000000000 -0400 ++++ features/org.eclipse.rcp.source/feature.xml 2008-09-26 19:53:21.000000000 -0400 +@@ -35,6 +35,8 @@ + <plugin id="org.eclipse.swt.gtk.linux.x86.source" version="3.4.1.v3449c" os="linux" arch="x86" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.s390.source" version="3.4.0.R3_4" os="linux" arch="s390" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.s390x.source" version="3.4.0.R3_4" os="linux" arch="s390x" ws="gtk" unpack="false"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.x86.source" version="3.4.1.v3449c" os="freebsd" arch="x86" ws="gtk" unpack="false"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.amd64.source" version="3.4.1.v3449c" os="freebsd" arch="amd64" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.solaris.sparc.source" version="3.4.1.v3449c" os="solaris" arch="sparc" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.solaris.x86.source" version="3.4.0.HEAD" os="solaris" arch="x86" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.ppc.source" version="3.4.1.v3449c" os="linux" arch="ppc" ws="gtk" unpack="false"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.sdk-build.properties b/java/eclipse/files/patch-features-org.eclipse.sdk-build.properties new file mode 100644 index 000000000000..6dacd35b82aa --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.sdk-build.properties @@ -0,0 +1,8 @@ +--- features/org.eclipse.sdk/build.properties.orig 2008-08-02 15:41:30.000000000 -0400 ++++ features/org.eclipse.sdk/build.properties 2008-08-02 15:41:44.000000000 -0400 +@@ -50,3 +50,5 @@ + root.qnx.photon.x86=win32 + root.linux.motif.x86=motif + root.macosx.carbon.ppc=macosx.carbon ++root.freebsd.gtk.x86=gtk ++root.freebsd.gtk.amd64=gtk diff --git a/java/eclipse/files/patch-features-org.eclipse.sdk-build.xml b/java/eclipse/files/patch-features-org.eclipse.sdk-build.xml new file mode 100644 index 000000000000..f574f111cf14 --- /dev/null +++ b/java/eclipse/files/patch-features-org.eclipse.sdk-build.xml @@ -0,0 +1,34 @@ +--- features/org.eclipse.sdk/build.xml.orig 2008-08-02 15:40:07.000000000 -0400 ++++ features/org.eclipse.sdk/build.xml 2008-08-02 15:40:38.000000000 -0400 +@@ -187,6 +187,22 @@ + </fileset> + </copy> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/gtk"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/gtk"> ++ <include name="**"/> ++ </fileset> ++ </copy> ++ </target> + <target name="rootFilessolaris_gtk_sparc"> + <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/> + <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -244,6 +260,8 @@ + <antcall target="rootFileslinux_gtk_s390"/> + <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-plat-library-eclipseShm.c b/java/eclipse/files/patch-features-plat-library-eclipseShm.c deleted file mode 100644 index 4e7a4a190282..000000000000 --- a/java/eclipse/files/patch-features-plat-library-eclipseShm.c +++ /dev/null @@ -1,17 +0,0 @@ ---- features/org.eclipse.equinox.executable/library/eclipseShm.c.orig Wed Aug 2 11:32:25 2006 -+++ features/org.eclipse.equinox.executable/library/eclipseShm.c Wed Aug 2 11:33:30 2006 -@@ -182,11 +182,13 @@ - - #else /* Unix like platforms */ - -+#include <machine/param.h> -+#include <sys/types.h> -+#include <sys/ipc.h> - #include <sys/shm.h> - #include <string.h> - #include <stdlib.h> - #include <stdio.h> --#include <sys/types.h> - #include <unistd.h> - - int createSharedData(char** id, int size) { diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml deleted file mode 100644 index 9a0499cbd3c8..000000000000 --- a/java/eclipse/files/patch-features-platform-source-build.xml +++ /dev/null @@ -1,46 +0,0 @@ ---- features/org.eclipse.platform.source/build.xml.orig Mon Jun 25 15:39:42 2007 -+++ features/org.eclipse.platform.source/build.xml Fri Aug 17 16:38:54 2007 -@@ -37,6 +37,11 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> -@@ -62,6 +67,11 @@ - <property name="os" value="win32"/> - <property name="ws" value="wpf"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC" target="${target}"> - <property name="arch" value="PA_RISC"/> - <property name="os" value="hpux"/> -@@ -187,6 +197,10 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> - <target name="rootFilessolaris_gtk_sparc"> - </target> - <target name="rootFilessolaris_gtk_x86"> -@@ -215,6 +229,8 @@ - <antcall target="rootFileslinux_gtk_s390"/> - <antcall target="rootFileslinux_gtk_s390x"/> - <antcall target="rootFileslinux_motif_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFilessolaris_gtk_sparc"/> - <antcall target="rootFilessolaris_gtk_x86"/> - <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml deleted file mode 100644 index 77e36c5ac94f..000000000000 --- a/java/eclipse/files/patch-features-rcp-build.xml +++ /dev/null @@ -1,38 +0,0 @@ ---- features/org.eclipse.rcp/feature.xml.orig 2008-02-22 09:17:35.000000000 +0900 -+++ features/org.eclipse.rcp/feature.xml 2008-03-10 18:21:58.000000000 +0900 -@@ -168,6 +168,17 @@ - unpack="false"/> - - <plugin -+ id="org.eclipse.swt.gtk.freebsd.x86" -+ os="freebsd" -+ ws="gtk" -+ arch="x86" -+ download-size="0" -+ install-size="0" -+ version="0.0.0" -+ fragment="true" -+ unpack="false"/> -+ -+ <plugin - id="org.eclipse.swt.gtk.linux.x86" - os="linux" - ws="gtk" -@@ -234,6 +245,17 @@ - unpack="false"/> - - <plugin -+ id="org.eclipse.swt.gtk.freebsd.amd64" -+ os="freebsd" -+ ws="gtk" -+ arch="amd64" -+ download-size="0" -+ install-size="0" -+ version="0.0.0" -+ fragment="true" -+ unpack="false"/> -+ -+ <plugin - id="org.eclipse.swt.gtk.linux.x86_64" - os="linux" - ws="gtk" diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml deleted file mode 100644 index fa5b86172537..000000000000 --- a/java/eclipse/files/patch-features-rcp-source-build.xml +++ /dev/null @@ -1,39 +0,0 @@ ---- features/org.eclipse.rcp.source/build.xml.orig 2007-06-26 04:39:43.000000000 +0900 -+++ features/org.eclipse.rcp.source/build.xml 2007-08-23 23:11:51.000000000 +0900 -@@ -37,6 +37,16 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.aix.motif.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="aix"/> -@@ -170,6 +180,10 @@ - </target> - <target name="rootFilesmacosx_carbon_ppc"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ </target> - <target name="rootFileslinux_gtk_x86"> - </target> - <target name="rootFileslinux_gtk_ppc"> -@@ -206,6 +220,8 @@ - <antcall target="rootFileswin32_win32_x86"/> - <antcall target="rootFileswin32_wpf_x86"/> - <antcall target="rootFilesmacosx_carbon_ppc"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFileslinux_gtk_x86"/> - <antcall target="rootFileslinux_gtk_ppc"/> - <antcall target="rootFileslinux_gtk_ppc64"/> diff --git a/java/eclipse/files/patch-features-sdk-build.xml b/java/eclipse/files/patch-features-sdk-build.xml deleted file mode 100644 index 0862854d290f..000000000000 --- a/java/eclipse/files/patch-features-sdk-build.xml +++ /dev/null @@ -1,30 +0,0 @@ ---- features/org.eclipse.sdk/build.xml.orig Mon Jun 25 15:39:43 2007 -+++ features/org.eclipse.sdk/build.xml Fri Aug 17 17:23:44 2007 -@@ -169,6 +169,18 @@ - </fileset> - </copy> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/gtk" includes="**" /> -+ </copy> -+ </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/gtk" includes="**" /> -+ </copy> -+ </target> - <target name="rootFilessolaris_gtk_sparc"> - <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/"/> - <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}/" failonerror="true" overwrite="true"> -@@ -227,6 +239,8 @@ - <antcall target="rootFileslinux_gtk_s390"/> - <antcall target="rootFileslinux_gtk_s390x"/> - <antcall target="rootFileslinux_motif_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> - <antcall target="rootFilessolaris_gtk_sparc"/> - <antcall target="rootFilessolaris_gtk_x86"/> - <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-package-sdk-all.xml b/java/eclipse/files/patch-package-sdk-all.xml deleted file mode 100644 index 710e6f8b5714..000000000000 --- a/java/eclipse/files/patch-package-sdk-all.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- package.org.eclipse.sdk.all.xml.orig Mon Jun 25 15:39:43 2007 -+++ package.org.eclipse.sdk.all.xml Fri Aug 17 17:45:03 2007 -@@ -22,6 +22,12 @@ - <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.x86_64"> - <property name="assembleScriptName" value="package.org.eclipse.sdk.linux.gtk.x86_64.xml"/> - </ant> -+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.x86"> -+ <property name="assembleScriptName" value="package.org.eclipse.sdk.freebsd.gtk.x86.xml"/> -+ </ant> -+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.amd64"> -+ <property name="assembleScriptName" value="package.org.eclipse.sdk.freebsd.gtk.amd64.xml"/> -+ </ant> - <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.ia64"> - <property name="assembleScriptName" value="package.org.eclipse.sdk.linux.gtk.ia64.xml"/> - </ant> diff --git a/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml b/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml new file mode 100644 index 000000000000..70cb774b5bc4 --- /dev/null +++ b/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml @@ -0,0 +1,11 @@ +--- package.org.eclipse.sdk.all.xml.orig 2008-10-01 19:09:30.000000000 -0400 ++++ package.org.eclipse.sdk.all.xml 2008-10-01 19:10:57.000000000 -0400 +@@ -30,6 +30,8 @@ + <assemble config="linux.gtk.s390" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> + <assemble config="linux.gtk.s390x" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> + <assemble config="linux.motif.x86" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> ++<assemble config="freebsd.gtk.x86" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> ++<assemble config="freebsd.gtk.amd64" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> + <assemble config="solaris.gtk.sparc" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> + <assemble config="solaris.gtk.x86" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> + <assemble config="solaris.motif.sparc" element="org.eclipse.sdk" dot="." scriptPrefix="package" /> diff --git a/java/eclipse/files/patch-plugin-compare-build.xml b/java/eclipse/files/patch-plugin-compare-build.xml deleted file mode 100644 index 4a82c3e16c68..000000000000 --- a/java/eclipse/files/patch-plugin-compare-build.xml +++ /dev/null @@ -1,41 +0,0 @@ ---- plugins/org.eclipse.compare/build.xml.orig 2008-02-22 08:45:33.000000000 +0900 -+++ plugins/org.eclipse.compare/build.xml 2008-03-10 16:48:47.000000000 +0900 -@@ -127,12 +127,16 @@ - <pathelement path="../javax.servlet_2.4.0.v200706111738.jar"/> - <pathelement path="../org.eclipse.swt/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt_3.3.2.v3349d/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> -@@ -209,8 +213,12 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> -@@ -238,6 +246,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> diff --git a/java/eclipse/files/patch-pluging-ltk-core-refactoring-build.xml b/java/eclipse/files/patch-pluging-ltk-core-refactoring-build.xml deleted file mode 100644 index f23c439b4517..000000000000 --- a/java/eclipse/files/patch-pluging-ltk-core-refactoring-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.ltk.core.refactoring/build.xml.orig 2008-02-22 08:45:35.000000000 +0900 -+++ plugins/org.eclipse.ltk.core.refactoring/build.xml 2008-03-10 16:52:01.000000000 +0900 -@@ -134,6 +134,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> diff --git a/java/eclipse/files/patch-plugins-ant-ui-build.xml b/java/eclipse/files/patch-plugins-ant-ui-build.xml deleted file mode 100644 index ae9bd07a9fed..000000000000 --- a/java/eclipse/files/patch-plugins-ant-ui-build.xml +++ /dev/null @@ -1,66 +0,0 @@ ---- plugins/org.eclipse.ant.ui/build.xml.orig 2008-02-22 08:45:19.000000000 +0900 -+++ plugins/org.eclipse.ant.ui/build.xml 2008-03-10 16:58:30.000000000 +0900 -@@ -155,6 +155,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> -@@ -180,6 +184,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> -@@ -470,6 +476,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> -@@ -495,6 +503,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> -@@ -784,6 +794,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> -@@ -803,12 +815,16 @@ - <pathelement path="../org.eclipse.ui.carbon/@dot"/> - <pathelement path="../org.eclipse.swt/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt_3.3.2.v3349d/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> diff --git a/java/eclipse/files/patch-plugins-ant-ui-buildfiles-buildRemoteExtraJAR.xml b/java/eclipse/files/patch-plugins-ant-ui-buildfiles-buildRemoteExtraJAR.xml deleted file mode 100644 index 496fc2a35432..000000000000 --- a/java/eclipse/files/patch-plugins-ant-ui-buildfiles-buildRemoteExtraJAR.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml.orig 2007-06-26 04:57:25.000000000 +0900 -+++ plugins/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml 2007-09-06 11:06:07.000000000 +0900 -@@ -8,6 +8,8 @@ - <property name="build.result.folder" value="${basedir}"/> - <property name="version.suffix" value="_3.1.0"/> - <property name="win32.jar" value="${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86${version.suffix}.jar"/> -+ <property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.x86${version.suffix}.jar"/> -+ <property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.amd64${version.suffix}.jar"/> - <property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.linux.x86${version.suffix}.jar"/> - <property name="motif.jar" value="${eclipse.home}/plugins/org.eclipse.swt.motif${version.suffix}.jar"/> - <property name="osx.jar" value="${eclipse.home}/plugins/org.eclipse.swt.carbon.macosx.ppc${version.suffix}.jar"/> diff --git a/java/eclipse/files/patch-plugins-core-resources-component.xml b/java/eclipse/files/patch-plugins-core-resources-component.xml deleted file mode 100644 index 50cf5dfe97ba..000000000000 --- a/java/eclipse/files/patch-plugins-core-resources-component.xml +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/org.eclipse.core.resources/component.xml.orig 2007-06-26 04:57:20.000000000 +0900 -+++ plugins/org.eclipse.core.resources/component.xml 2007-09-06 11:12:08.000000000 +0900 -@@ -7,6 +7,7 @@ - - <plugin id="org.eclipse.core.resources" /> - <plugin id="org.eclipse.core.resources.win32" fragment="true" /> -+ <plugin id="org.eclipse.core.resources.freebsd" fragment="true" /> - <plugin id="org.eclipse.core.resources.linux" fragment="true" /> - <plugin id="org.eclipse.core.resources.hpux" fragment="true" /> - <plugin id="org.eclipse.core.resources.macosx" fragment="true" /> diff --git a/java/eclipse/files/patch-plugins-debug-core-build.xml b/java/eclipse/files/patch-plugins-debug-core-build.xml deleted file mode 100644 index 22d02a1b56f4..000000000000 --- a/java/eclipse/files/patch-plugins-debug-core-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/org.eclipse.debug.core/build.xml.orig 2008-02-22 08:45:23.000000000 +0900 -+++ plugins/org.eclipse.debug.core/build.xml 2008-03-10 17:05:48.000000000 +0900 -@@ -148,8 +148,12 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> diff --git a/java/eclipse/files/patch-plugins-filesystem-component.xml b/java/eclipse/files/patch-plugins-filesystem-component.xml deleted file mode 100644 index 3cb31f9822ed..000000000000 --- a/java/eclipse/files/patch-plugins-filesystem-component.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.core.filesystem/component.xml.orig 2007-06-26 04:57:18.000000000 +0900 -+++ plugins/org.eclipse.core.filesystem/component.xml 2007-09-06 11:09:49.000000000 +0900 -@@ -8,6 +8,8 @@ - <plugin id="org.eclipse.core.filesystem" /> - <plugin id="org.eclipse.core.filesystem.hpux.ia64_32" fragment="true" /> - <plugin id="org.eclipse.core.filesystem.hpux.PA_RISC" fragment="true" /> -+ <plugin id="org.eclipse.core.filesystem.freebsd.x86" fragment="true" /> -+ <plugin id="org.eclipse.core.filesystem.freebsd.amd64" fragment="true" /> - <plugin id="org.eclipse.core.filesystem.linux.x86" fragment="true" /> - <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true" /> - <plugin id="org.eclipse.core.filesystem.macosx.ppc" fragment="true" /> diff --git a/java/eclipse/files/patch-plugins-jdt-apt-core-build.xml b/java/eclipse/files/patch-plugins-jdt-apt-core-build.xml deleted file mode 100644 index 4d04d801fe74..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-apt-core-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/org.eclipse.jdt.apt.core/build.xml.orig 2008-02-22 08:45:26.000000000 +0900 -+++ plugins/org.eclipse.jdt.apt.core/build.xml 2008-03-10 17:08:57.000000000 +0900 -@@ -159,8 +159,12 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-apt-pluggable-core-build.xml b/java/eclipse/files/patch-plugins-jdt-apt-pluggable-core-build.xml deleted file mode 100644 index c0cdd3dc9c67..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-apt-pluggable-core-build.xml +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/org.eclipse.jdt.apt.pluggable.core/build.xml.orig 2008-02-22 08:45:49.000000000 +0900 -+++ plugins/org.eclipse.jdt.apt.pluggable.core/build.xml 2008-03-10 17:12:40.000000000 +0900 -@@ -159,8 +159,12 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-compiler-apt-build.xml b/java/eclipse/files/patch-plugins-jdt-compiler-apt-build.xml deleted file mode 100644 index 6932f19d1596..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-compiler-apt-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.jdt.compiler.apt/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.jdt.compiler.apt/build.xml 2007-11-19 13:39:25.000000000 +0900 -@@ -156,6 +156,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-compiler-tool-build.xml b/java/eclipse/files/patch-plugins-jdt-compiler-tool-build.xml deleted file mode 100644 index 2503030065d7..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-compiler-tool-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.jdt.compiler.tool/build.xml.orig 2008-02-22 08:45:25.000000000 +0900 -+++ plugins/org.eclipse.jdt.compiler.tool/build.xml 2008-03-08 13:14:06.000000000 +0900 -@@ -153,6 +153,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-core-build.xmo b/java/eclipse/files/patch-plugins-jdt-core-build.xmo deleted file mode 100644 index c3b2073de328..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-core-build.xmo +++ /dev/null @@ -1,24 +0,0 @@ ---- plugins/org.eclipse.jdt.core/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.jdt.core/build.xml 2007-11-19 13:44:12.000000000 +0900 -@@ -149,6 +149,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> -@@ -367,6 +371,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-core-manipulation-build.xml b/java/eclipse/files/patch-plugins-jdt-core-manipulation-build.xml deleted file mode 100644 index 94608d24f532..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-core-manipulation-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.jdt.core.manipulation/build.xml.orig 2007-10-24 06:31:14.000000000 +0900 -+++ plugins/org.eclipse.jdt.core.manipulation/build.xml 2007-11-19 13:46:06.000000000 +0900 -@@ -147,6 +147,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-debug-build.xml b/java/eclipse/files/patch-plugins-jdt-debug-build.xml deleted file mode 100644 index ce683e779e70..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-debug-build.xml +++ /dev/null @@ -1,24 +0,0 @@ ---- plugins/org.eclipse.jdt.debug/build.xml.orig 2007-10-24 06:31:14.000000000 +0900 -+++ plugins/org.eclipse.jdt.debug/build.xml 2007-11-19 13:51:36.000000000 +0900 -@@ -148,6 +148,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> -@@ -294,6 +298,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jdt-launching-build.xml b/java/eclipse/files/patch-plugins-jdt-launching-build.xml deleted file mode 100644 index c9608056fb4b..000000000000 --- a/java/eclipse/files/patch-plugins-jdt-launching-build.xml +++ /dev/null @@ -1,24 +0,0 @@ ---- plugins/org.eclipse.jdt.launching/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.jdt.launching/build.xml 2007-11-19 14:01:46.000000000 +0900 -@@ -148,6 +148,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> -@@ -305,6 +309,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-jsch-core-build.xml b/java/eclipse/files/patch-plugins-jsch-core-build.xml deleted file mode 100644 index 540e021dcb37..000000000000 --- a/java/eclipse/files/patch-plugins-jsch-core-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.jsch.core/build.xml.orig 2007-10-24 06:31:14.000000000 +0900 -+++ plugins/org.eclipse.jsch.core/build.xml 2007-11-19 14:15:37.000000000 +0900 -@@ -139,6 +139,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml b/java/eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml new file mode 100644 index 000000000000..137cca053b18 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml @@ -0,0 +1,20 @@ +--- plugins/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml.orig 2008-08-02 10:58:33.000000000 -0400 ++++ plugins/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml 2008-08-02 11:02:19.000000000 -0400 +@@ -8,11 +8,15 @@ + <property name="build.result.folder" value="${basedir}"/> + <property name="version.suffix" value="_3.1.0"/> + <property name="win32.jar" value="${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86${version.suffix}.jar"/> +- <property name="gtk.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.linux.x86${version.suffix}.jar"/> ++ <property name="gtk.linux.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.linux.x86${version.suffix}.jar"/> ++ <property name="gtk.freebsd.x86.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.x86${version.suffix}.jar"/> ++ <property name="gtk.freebsd.amd64.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.amd64${version.suffix}.jar"/> + <property name="motif.jar" value="${eclipse.home}/plugins/org.eclipse.swt.motif${version.suffix}.jar"/> + <property name="osx.jar" value="${eclipse.home}/plugins/org.eclipse.swt.carbon.macosx.ppc${version.suffix}.jar"/> + <available file="${win32.jar}" property="swt.jar" value="${win32.jar}"/> +- <available file="${gtk.jar}" property="swt.jar" value="${gtk.jar}"/> ++ <available file="${gtk.linux.jar}" property="swt.jar" value="${gtk.linux.jar}"/> ++ <available file="${gtk.freebsd.x86.jar}" property="swt.jar" value="${gtk.freebsd.x86.jar}"/> ++ <available file="${gtk.freebsd.amd64.jar}" property="swt.jar" value="${gtk.freebsd.amd64.jar}"/> + <available file="${motif.jar}" property="swt.jar" value="${motif.jar}"/> + <available file="${osx.jar}" property="swt.jar" value="${osx.jar}"/> + </target> diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile index aec22abb6bda..04c00601e53e 100644 --- a/java/eclipse/files/post-patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-Makefile @@ -1,11 +1,11 @@ ---- plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig Sun Aug 19 23:58:06 2007 -+++ plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile Sun Aug 19 23:58:15 2007 +--- plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2008-08-02 10:38:16.000000000 -0400 ++++ plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2008-08-02 10:38:32.000000000 -0400 @@ -17,7 +17,7 @@ OS_TYPE = freebsd #Set this to be the location of your JRE -JAVA_HOME = ~/vm/sun142 -+ ++#JAVA_HOME = ~/vm/sun142 JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} COMMON_INCLUDE = -I include diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h index 909bb37ae2ba..db7f84da5fd3 100644 --- a/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-natives-unix-freebsd-include-os_custom.h @@ -1,5 +1,5 @@ ---- plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h.orig Sun Aug 19 23:58:06 2007 -+++ plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h Sun Aug 19 23:58:15 2007 +--- plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h.orig 2008-08-02 10:40:44.000000000 -0400 ++++ plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h 2008-08-02 10:40:55.000000000 -0400 @@ -11,8 +11,8 @@ ***********************************************************************/ @@ -10,4 +10,4 @@ +#define FREEBSD #endif - /* Linux supports reading symbolic links */ + /* FreeBSD supports reading symbolic links */ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-src-org-eclipse-core-internal-filesystem-local-LocalFileSystem.java b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-src-org-eclipse-core-internal-filesystem-local-LocalFileSystem.java new file mode 100644 index 000000000000..39d7552ba711 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.filesystem-src-org-eclipse-core-internal-filesystem-local-LocalFileSystem.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java.orig 2008-08-02 12:35:45.000000000 -0400 ++++ plugins/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java 2008-08-02 12:34:53.000000000 -0400 +@@ -98,7 +98,7 @@ + String arch = System.getProperty("osgi.arch", ""); //$NON-NLS-1$ //$NON-NLS-2$ + if (os.equals(Constants.OS_WIN32)) + attributes |= EFS.ATTRIBUTE_ARCHIVE | EFS.ATTRIBUTE_HIDDEN; +- else if (os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) ++ else if (os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_FREEBSD)) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) + attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET; + else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX)) + attributes |= EFS.ATTRIBUTE_EXECUTABLE; diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-internal-runtime-InternalPlatform.java b/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-internal-runtime-InternalPlatform.java new file mode 100644 index 000000000000..299871acc853 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-internal-runtime-InternalPlatform.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java.orig 2008-08-02 14:56:13.000000000 -0400 ++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java 2008-08-02 14:56:49.000000000 -0400 +@@ -61,7 +61,7 @@ + //XXX This is not synchronized + private static Map logs = new HashMap(5); + +- private static final String[] OS_LIST = {Platform.OS_AIX, Platform.OS_HPUX, Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_QNX, Platform.OS_SOLARIS, Platform.OS_WIN32}; ++ private static final String[] OS_LIST = {Platform.OS_AIX, Platform.OS_HPUX, Platform.OS_LINUX, Platform.OS_FREEBSD, Platform.OS_MACOSX, Platform.OS_QNX, Platform.OS_SOLARIS, Platform.OS_WIN32}; + private static String password = ""; //$NON-NLS-1$ + private static final String PASSWORD = "-password"; //$NON-NLS-1$ + private static PlatformLogWriter platformLog = null; diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java b/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java new file mode 100644 index 000000000000..931136fbcea0 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.runtime-src-org-eclipse-core-runtime-Platform.java @@ -0,0 +1,29 @@ +--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2008-08-09 09:17:56.822774634 -0400 ++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2008-08-09 09:17:33.922680697 -0400 +@@ -204,6 +204,17 @@ + public static final String OS_LINUX = "linux";//$NON-NLS-1$ + + /** ++ * Constant string (value "freebsd") indicating the platform is running on a ++ * FreeBSD-based operating system. ++ * <p> ++ * Note this constant has been moved from the deprecated ++ * org.eclipse.core.boot.BootLoader class and its value has not changed. ++ * </p> ++ * @since 3.0 ++ */ ++ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ ++ ++ /** + * Constant string (value "aix") indicating the platform is running on an + * AIX-based operating system. + * <p> +@@ -329,7 +340,7 @@ + * @deprecated use <code>ARCH_X86_64</code> instead. Note the values + * has been changed to be the value of the <code>ARCH_X86_64</code> constant. + */ +- public static final String ARCH_AMD64 = ARCH_X86_64; ++ public static final String ARCH_AMD64 = "amd64";//$NON-NLS-1$ + + /** + * Constant string (value "ia64") indicating the platform is running on an diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.runtime.compatibility-src-boot-org-eclipse-core-boot-BootLoader.java b/java/eclipse/files/patch-plugins-org.eclipse.core.runtime.compatibility-src-boot-org-eclipse-core-boot-BootLoader.java new file mode 100644 index 000000000000..3e91b5fa9b4b --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.runtime.compatibility-src-boot-org-eclipse-core-boot-BootLoader.java @@ -0,0 +1,16 @@ +--- plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java.orig 2008-08-02 14:57:57.000000000 -0400 ++++ plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java 2008-08-02 14:59:13.000000000 -0400 +@@ -72,6 +72,13 @@ + public static final String OS_LINUX = "linux";//$NON-NLS-1$ + + /** ++ * Constant string (value "freebsd") indicating the platform is running on a ++ * FreeBSD-based operating system. ++ * @deprecated Replaced by {@link Platform#OS_FREEBSD}. ++ */ ++ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ ++ ++ /** + * Constant string (value "aix") indicating the platform is running on an + * AIX-based operating system. + * @deprecated Replaced by {@link Platform#OS_AIX}. diff --git a/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-internal-launcher-Constants.java b/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-internal-launcher-Constants.java new file mode 100644 index 000000000000..2fb51f5d35f5 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-internal-launcher-Constants.java @@ -0,0 +1,23 @@ +--- plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java.orig 2008-08-02 12:22:09.000000000 -0400 ++++ plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 2008-08-02 12:24:21.000000000 -0400 +@@ -19,6 +19,7 @@ + public static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$ + public static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ + public static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$ ++ public static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ + public static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ + public static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ + public static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$ +@@ -40,6 +41,12 @@ + public static final String OS_LINUX = "linux";//$NON-NLS-1$ + + /** ++ * Constant string (value "freebsd") indicating the platform is running on a ++ * FreeBSD-based operating system. ++ */ ++ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ ++ ++ /** + * Constant string (value "aix") indicating the platform is running on an + * AIX-based operating system. + */ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java b/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java new file mode 100644 index 000000000000..98ecab5ea2e1 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.equinox.launcher-src-org-eclipse-equinox-launcher-Main.java @@ -0,0 +1,30 @@ +--- plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig 2008-08-09 01:52:52.897300867 -0400 ++++ plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 2008-08-09 01:53:31.527460286 -0400 +@@ -291,6 +291,8 @@ + return Constants.WS_WIN32; + if (osName.equals(Constants.OS_LINUX)) + return Constants.WS_GTK; ++ if (osName.equals(Constants.OS_FREEBSD)) ++ return Constants.WS_GTK; + if (osName.equals(Constants.OS_MACOSX)) + return Constants.WS_CARBON; + if (osName.equals(Constants.OS_HPUX)) +@@ -315,6 +317,8 @@ + return Constants.OS_SOLARIS; + if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_LINUX)) + return Constants.OS_LINUX; ++ if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_FREEBSD)) ++ return Constants.OS_FREEBSD; + if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_QNX)) + return Constants.OS_QNX; + if (osName.equalsIgnoreCase(Constants.INTERNAL_OS_AIX)) +@@ -334,9 +338,6 @@ + // Map i386 architecture to x86 + if (name.equalsIgnoreCase(Constants.INTERNAL_ARCH_I386)) + return Constants.ARCH_X86; +- // Map amd64 architecture to x86_64 +- else if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64)) +- return Constants.ARCH_X86_64; + + return name; + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.equinox.p2.metadata.generator-src-org-eclipse-equinox-internal-p2-metadata-generator-features-ProductFile.java b/java/eclipse/files/patch-plugins-org.eclipse.equinox.p2.metadata.generator-src-org-eclipse-equinox-internal-p2-metadata-generator-features-ProductFile.java new file mode 100644 index 000000000000..76f49d471213 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.equinox.p2.metadata.generator-src-org-eclipse-equinox-internal-p2-metadata-generator-features-ProductFile.java @@ -0,0 +1,143 @@ +--- plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/ProductFile.java.orig 2008-08-02 15:21:00.000000000 -0400 ++++ plugins/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/p2/metadata/generator/features/ProductFile.java 2008-08-02 15:20:23.000000000 -0400 +@@ -28,11 +28,13 @@ + + private static final String PROGRAM_ARGS = "programArgs"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_LINUX = "programArgsLin"; //$NON-NLS-1$ ++ private static final String PROGRAM_ARGS_FREEBSD = "programArgsFre"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_SOLARIS = "programArgsSol"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ + private static final String VM_ARGS = "vmArgs"; //$NON-NLS-1$ + private static final String VM_ARGS_LINUX = "vmArgsLin"; //$NON-NLS-1$ ++ private static final String VM_ARGS_FREEBSD = "vmArgsFre"; //$NON-NLS-1$ + private static final String VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ + private static final String VM_ARGS_SOLARIS = "vmArgsSol"; //$NON-NLS-1$ + private static final String VM_ARGS_WIN = "vmArgsWin"; //$NON-NLS-1$ +@@ -51,6 +53,7 @@ + + private static final String OS_WIN32 = "win32";//$NON-NLS-1$ + private static final String OS_LINUX = "linux";//$NON-NLS-1$ ++ private static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ + private static final String OS_SOLARIS = "solaris";//$NON-NLS-1$ + private static final String OS_MACOSX = "macosx";//$NON-NLS-1$ + +@@ -72,15 +75,17 @@ + private static final int STATE_FEATURES = 5; + private static final int STATE_PROGRAM_ARGS = 6; + private static final int STATE_PROGRAM_ARGS_LINUX = 7; +- private static final int STATE_PROGRAM_ARGS_MAC = 8; +- private static final int STATE_PROGRAM_ARGS_SOLARIS = 9; +- private static final int STATE_PROGRAM_ARGS_WIN = 10; +- private static final int STATE_VM_ARGS = 11; +- private static final int STATE_VM_ARGS_LINUX = 12; +- private static final int STATE_VM_ARGS_MAC = 13; +- private static final int STATE_VM_ARGS_SOLARIS = 14; +- private static final int STATE_VM_ARGS_WIN = 15; +- private static final int STATE_CONFIG_INI = 16; ++ private static final int STATE_PROGRAM_ARGS_FREEBSD = 8; ++ private static final int STATE_PROGRAM_ARGS_MAC = 9; ++ private static final int STATE_PROGRAM_ARGS_SOLARIS = 10; ++ private static final int STATE_PROGRAM_ARGS_WIN = 11; ++ private static final int STATE_VM_ARGS = 12; ++ private static final int STATE_VM_ARGS_LINUX = 13; ++ private static final int STATE_VM_ARGS_FREEBSD = 14; ++ private static final int STATE_VM_ARGS_MAC = 15; ++ private static final int STATE_VM_ARGS_SOLARIS = 16; ++ private static final int STATE_VM_ARGS_WIN = 17; ++ private static final int STATE_CONFIG_INI = 18; + + private int state = STATE_START; + +@@ -233,6 +238,8 @@ + key = VM_ARGS_WIN; + } else if (os.equals(OS_LINUX)) { + key = VM_ARGS_LINUX; ++ } else if (os.equals(OS_FREEBSD)) { ++ key = VM_ARGS_FREEBSD; + } else if (os.equals(OS_MACOSX)) { + key = VM_ARGS_MAC; + } else if (os.equals(OS_SOLARIS)) { +@@ -256,6 +263,8 @@ + key = PROGRAM_ARGS_WIN; + } else if (os.equals(OS_LINUX)) { + key = PROGRAM_ARGS_LINUX; ++ } else if (os.equals(OS_FREEBSD)) { ++ key = PROGRAM_ARGS_FREEBSD; + } else if (os.equals(OS_MACOSX)) { + key = PROGRAM_ARGS_MAC; + } else if (os.equals(OS_SOLARIS)) { +@@ -311,6 +320,8 @@ + processWin(attributes); + } else if (OS_LINUX.equals(localName)) { + processLinux(attributes); ++ } else if (OS_FREEBSD.equals(localName)) { ++ processFreeBSD(attributes); + } else if (OS_MACOSX.equals(localName)) { + processMac(attributes); + } +@@ -326,6 +337,8 @@ + state = STATE_PROGRAM_ARGS; + } else if (PROGRAM_ARGS_LINUX.equals(localName)) { + state = STATE_PROGRAM_ARGS_LINUX; ++ } else if (PROGRAM_ARGS_FREEBSD.equals(localName)) { ++ state = STATE_PROGRAM_ARGS_FREEBSD; + } else if (PROGRAM_ARGS_MAC.equals(localName)) { + state = STATE_PROGRAM_ARGS_MAC; + } else if (PROGRAM_ARGS_SOLARIS.equals(localName)) { +@@ -336,6 +349,8 @@ + state = STATE_VM_ARGS; + } else if (VM_ARGS_LINUX.equals(localName)) { + state = STATE_VM_ARGS_LINUX; ++ } else if (VM_ARGS_FREEBSD.equals(localName)) { ++ state = STATE_VM_ARGS_FREEBSD; + } else if (VM_ARGS_MAC.equals(localName)) { + state = STATE_VM_ARGS_MAC; + } else if (VM_ARGS_SOLARIS.equals(localName)) { +@@ -380,11 +395,13 @@ + + case STATE_PROGRAM_ARGS : + case STATE_PROGRAM_ARGS_LINUX : ++ case STATE_PROGRAM_ARGS_FREEBSD : + case STATE_PROGRAM_ARGS_MAC : + case STATE_PROGRAM_ARGS_SOLARIS : + case STATE_PROGRAM_ARGS_WIN : + case STATE_VM_ARGS : + case STATE_VM_ARGS_LINUX : ++ case STATE_VM_ARGS_FREEBSD : + case STATE_VM_ARGS_MAC : + case STATE_VM_ARGS_SOLARIS : + case STATE_VM_ARGS_WIN : +@@ -408,6 +425,9 @@ + case STATE_PROGRAM_ARGS_LINUX : + addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length)); + break; ++ case STATE_PROGRAM_ARGS_FREEBSD : ++ addLaunchArgumentToMap(PROGRAM_ARGS_FREEBSD, String.valueOf(ch, start, length)); ++ break; + case STATE_PROGRAM_ARGS_MAC : + addLaunchArgumentToMap(PROGRAM_ARGS_MAC, String.valueOf(ch, start, length)); + break; +@@ -423,6 +443,9 @@ + case STATE_VM_ARGS_LINUX : + addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length)); + break; ++ case STATE_VM_ARGS_FREEBSD : ++ addLaunchArgumentToMap(VM_ARGS_FREEBSD, String.valueOf(ch, start, length)); ++ break; + case STATE_VM_ARGS_MAC : + addLaunchArgumentToMap(VM_ARGS_MAC, String.valueOf(ch, start, length)); + break; +@@ -555,6 +578,12 @@ + result.add(attributes.getValue("icon")); //$NON-NLS-1$ + } + ++ private void processFreeBSD(Attributes attributes) { ++ if (!osMatch(OS_FREEBSD)) ++ return; ++ result.add(attributes.getValue("icon")); //$NON-NLS-1$ ++ } ++ + private void processMac(Attributes attributes) { + if (!osMatch(OS_MACOSX)) + return; diff --git a/java/eclipse/files/patch-plugins-org.eclipse.equinox.p2.reconciler.dropins-Bootstrap.product b/java/eclipse/files/patch-plugins-org.eclipse.equinox.p2.reconciler.dropins-Bootstrap.product new file mode 100644 index 000000000000..0d1e8c8b225b --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.equinox.p2.reconciler.dropins-Bootstrap.product @@ -0,0 +1,10 @@ +--- plugins/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product.orig 2008-08-02 15:24:39.000000000 -0400 ++++ plugins/org.eclipse.equinox.p2.reconciler.dropins/Bootstrap.product 2008-08-02 15:26:30.000000000 -0400 +@@ -5,6 +5,7 @@ + + <configIni use="default"> + <linux>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</linux> ++ <freebsd>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</freebsd> + <macosx>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</macosx> + <solaris>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</solaris> + <win32>/org.eclipse.equinox.p2.reconciler.dropins/config.ini</win32> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java b/java/eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java new file mode 100644 index 000000000000..5dc9bf398dfd --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java @@ -0,0 +1,12 @@ +--- plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java.orig 2008-08-09 14:32:49.360935838 -0400 ++++ plugins/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java 2008-08-09 14:32:30.730855758 -0400 +@@ -209,9 +209,6 @@ + // Map i386 architecture to x86 + if (name.equalsIgnoreCase(INTERNAL_ARCH_I386)) + arch = org.eclipse.osgi.service.environment.Constants.ARCH_X86; +- // Map amd64 architecture to x86_64 +- else if (name.equalsIgnoreCase(INTERNAL_AMD64)) +- arch = org.eclipse.osgi.service.environment.Constants.ARCH_X86_64; + else + arch = name; + platformProperties.setProperty("osgi.arch", arch); //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.help.base-plugin.xml b/java/eclipse/files/patch-plugins-org.eclipse.help.base-plugin.xml new file mode 100644 index 000000000000..4f145147f618 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.help.base-plugin.xml @@ -0,0 +1,29 @@ +--- plugins/org.eclipse.help.base/plugin.xml.orig 2008-08-02 15:36:47.000000000 -0400 ++++ plugins/org.eclipse.help.base/plugin.xml 2008-08-02 15:37:20.000000000 -0400 +@@ -113,7 +113,7 @@ + </parameter> + <parameter + name="os" +- value="Linux,AIX,HP,SunOS"> ++ value="Linux,FreeBSD,AIX,HP,SunOS"> + </parameter> + </factoryclass> + </browser> +@@ -132,7 +132,7 @@ + </parameter> + <parameter + name="os" +- value="Linux,AIX,HP,SunOS"> ++ value="Linux,FreeBSD,AIX,HP,SunOS"> + </parameter> + </factoryclass> + </browser> +@@ -151,7 +151,7 @@ + </parameter> + <parameter + name="os" +- value="Linux,AIX,HP,SunOS"> ++ value="Linux,FreeBSD,AIX,HP,SunOS"> + </parameter> + </factoryclass> + </browser> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.help.base-src-org-eclipse-help-internal-base-HelpBasePreferenceInitializer.java b/java/eclipse/files/patch-plugins-org.eclipse.help.base-src-org-eclipse-help-internal-base-HelpBasePreferenceInitializer.java new file mode 100644 index 000000000000..f0ff37f9be50 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.help.base-src-org-eclipse-help-internal-base-HelpBasePreferenceInitializer.java @@ -0,0 +1,12 @@ +--- plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java.orig 2008-08-02 15:30:15.000000000 -0400 ++++ plugins/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBasePreferenceInitializer.java 2008-08-02 15:31:53.000000000 -0400 +@@ -37,6 +37,9 @@ + } else if (os.indexOf("linux") != -1) { //$NON-NLS-1$ + prefs.setDefault("custom_browser_path", //$NON-NLS-1$ + "konqueror %1"); //$NON-NLS-1$ ++ } else if (os.indexOf("freebsd") != -1) { //$NON-NLS-1$ ++ prefs.setDefault("custom_browser_path", //$NON-NLS-1$ ++ "firefox %1"); //$NON-NLS-1$ + } else { + prefs.setDefault("custom_browser_path", "mozilla %1"); //$NON-NLS-1$ //$NON-NLS-2$ + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.help.base-src-org-eclipse-help-internal-browser-BrowserManager.java b/java/eclipse/files/patch-plugins-org.eclipse.help.base-src-org-eclipse-help-internal-browser-BrowserManager.java new file mode 100644 index 000000000000..8593aa68f156 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.help.base-src-org-eclipse-help-internal-browser-BrowserManager.java @@ -0,0 +1,10 @@ +--- plugins/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java.orig 2008-08-02 15:35:43.000000000 -0400 ++++ plugins/org.eclipse.help.base/src/org/eclipse/help/internal/browser/BrowserManager.java 2008-08-02 15:35:12.000000000 -0400 +@@ -94,6 +94,7 @@ + } else if (Constants.OS_AIX.equalsIgnoreCase(os) + || (Constants.OS_HPUX.equalsIgnoreCase(os)) + || (Constants.OS_LINUX.equalsIgnoreCase(os)) ++ || (Constants.OS_FREEBSD.equalsIgnoreCase(os)) + || (Constants.OS_SOLARIS.equalsIgnoreCase(os))) { + setDefaultBrowserID(BROWSER_ID_MOZILLA); + if (defaultBrowserDesc == null) { diff --git a/java/eclipse/files/patch-plugins-org.eclipse.help.ui-src-org-eclipse-help-ui-internal-browser-embedded-EmbeddedBrowserFactory.java b/java/eclipse/files/patch-plugins-org.eclipse.help.ui-src-org-eclipse-help-ui-internal-browser-embedded-EmbeddedBrowserFactory.java new file mode 100644 index 000000000000..1c368e5b065d --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.help.ui-src-org-eclipse-help-ui-internal-browser-embedded-EmbeddedBrowserFactory.java @@ -0,0 +1,12 @@ +--- plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java.orig 2008-08-02 15:38:33.000000000 -0400 ++++ plugins/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/browser/embedded/EmbeddedBrowserFactory.java 2008-08-02 15:40:18.000000000 -0400 +@@ -61,7 +61,8 @@ + */ + private boolean test() { + if (!Constants.OS_WIN32.equalsIgnoreCase(Platform.getOS()) +- && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS())) { ++ && !Constants.OS_LINUX.equalsIgnoreCase(Platform.getOS()) ++ && !Constants.OS_FREEBSD.equalsIgnoreCase(Platform.getOS())) { + return false; + } + if (!tested) { diff --git a/java/eclipse/files/patch-plugins-org.eclipse.osgi-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.osgi-build.xml new file mode 100644 index 000000000000..bd7ceded4109 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.osgi-build.xml @@ -0,0 +1,25 @@ +--- plugins/org.eclipse.osgi/build.xml.orig 2008-09-29 19:38:37.000000000 -0400 ++++ plugins/org.eclipse.osgi/build.xml 2008-09-29 19:39:37.000000000 -0400 +@@ -16,7 +16,13 @@ + <property name="compilerArg" value=""/> + <property name="javacSource" value="1.3"/> + <property name="javacTarget" value="1.2"/> +- <property name="bundleBootClasspath" value="osgi/exceptions.jar;osgi/xmlParserAPIs.jar;${CDC-1.0/Foundation-1.0}"/> ++ <property name="dir_bootclasspath" value="${java.home}/lib"/> ++ <path id="path_bootclasspath"> ++ <fileset dir="${dir_bootclasspath}"> ++ <include name="*.jar"/> ++ </fileset> ++ </path> ++ <property name="bootclasspath" refid="path_bootclasspath"/> + <condition property="bundleJavacSource" value="1.3" > + <isset property="CDC-1.0/Foundation-1.0"/> + </condition> +@@ -37,6 +43,7 @@ + </condition> + <property name="bundleJavacSource" value="${javacSource}"/> + <property name="bundleJavacTarget" value="${javacTarget}"/> ++ <property name="bundleBootClasspath" value="${bootclasspath}"/> + + <target name="init" depends="properties"> + <condition property="pluginTemp" value="${buildTempFolder}/plugins" > diff --git a/java/eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java b/java/eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java new file mode 100644 index 000000000000..4a48310aef0a --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.osgi-core-adaptor-org-eclipse-osgi-util-TextProcessor.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java.orig 2008-08-02 13:18:14.000000000 -0400 ++++ plugins/org.eclipse.osgi/core/adaptor/org/eclipse/osgi/util/TextProcessor.java 2008-08-02 13:20:06.000000000 -0400 +@@ -77,7 +77,7 @@ + + if ("iw".equals(lang) || "he".equals(lang) || "ar".equals(lang) || "fa".equals(lang) || "ur".equals(lang)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$ +- if (osName.startsWith("windows") || osName.startsWith("linux")) { //$NON-NLS-1$ //$NON-NLS-2$ ++ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ + IS_PROCESSING_NEEDED = true; + } + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java new file mode 100644 index 000000000000..31981c41dccc --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-EclipseEnvironementInfo.java @@ -0,0 +1,48 @@ +--- ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java.orig 2008-08-08 23:54:36.137941647 -0400 ++++ ./plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java 2008-08-08 23:52:33.527433817 -0400 +@@ -33,6 +33,7 @@ + // this internally to be Solaris. + private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ + private static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$ ++ private static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ + private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ + private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ + private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$ +@@ -41,9 +42,6 @@ + // While we recognize the i386 architecture, we change + // this internally to be x86. + private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$ +- // While we recognize the amd64 architecture, we change +- // this internally to be x86_64. +- private static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$ + + private EclipseEnvironmentInfo() { + super(); +@@ -159,9 +157,6 @@ + // Map i386 architecture to x86 + if (name.equalsIgnoreCase(INTERNAL_ARCH_I386)) + arch = Constants.ARCH_X86; +- // Map amd64 architecture to x86_64 +- else if (name.equalsIgnoreCase(INTERNAL_AMD64)) +- arch = Constants.ARCH_X86_64; + else + arch = name; + FrameworkProperties.setProperty("osgi.arch", arch); //$NON-NLS-1$ +@@ -189,6 +184,8 @@ + return Constants.WS_WIN32; + if (os.equals(Constants.OS_LINUX)) + return Constants.WS_GTK; ++ if (os.equals(Constants.OS_FREEBSD)) ++ return Constants.WS_GTK; + if (os.equals(Constants.OS_MACOSX)) + return Constants.WS_CARBON; + if (os.equals(Constants.OS_HPUX)) +@@ -212,6 +209,8 @@ + return Constants.OS_SOLARIS; + if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX)) + return Constants.OS_LINUX; ++ if (osName.equalsIgnoreCase(INTERNAL_OS_FREEBSD)) ++ return Constants.OS_FREEBSD; + if (osName.equalsIgnoreCase(INTERNAL_OS_QNX)) + return Constants.OS_QNX; + if (osName.equalsIgnoreCase(INTERNAL_OS_AIX)) diff --git a/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-PluginConverterImpl.java b/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-PluginConverterImpl.java new file mode 100644 index 000000000000..786dddf21646 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.osgi-eclipseAdaptor-src-org-eclipse-core-runtime-internal-adaptor-PluginConverterImpl.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java.orig 2008-08-02 13:21:52.000000000 -0400 ++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 2008-08-02 13:22:39.000000000 -0400 +@@ -68,7 +68,7 @@ + static public final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ + static public final String GENERATED_FROM = "Generated-from"; //$NON-NLS-1$ + static public final String MANIFEST_TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$ +- private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; ++ private static final String[] OS_LIST = {org.eclipse.osgi.service.environment.Constants.OS_AIX, org.eclipse.osgi.service.environment.Constants.OS_HPUX, org.eclipse.osgi.service.environment.Constants.OS_LINUX, org.eclipse.osgi.service.environment.Constants.OS_FREEBSD, org.eclipse.osgi.service.environment.Constants.OS_MACOSX, org.eclipse.osgi.service.environment.Constants.OS_QNX, org.eclipse.osgi.service.environment.Constants.OS_SOLARIS, org.eclipse.osgi.service.environment.Constants.OS_WIN32}; + protected static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$ + protected static final String PI_BOOT = "org.eclipse.core.boot"; //$NON-NLS-1$ + protected static final String PI_RUNTIME_COMPATIBILITY = "org.eclipse.core.runtime.compatibility"; //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java b/java/eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java new file mode 100644 index 000000000000..ce1a083678f9 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.osgi-supplement-src-org-eclipse-osgi-service-environment-Constants.java @@ -0,0 +1,24 @@ +--- plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java.orig 2008-08-09 09:16:08.932328502 -0400 ++++ plugins/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 2008-08-09 09:15:29.572165618 -0400 +@@ -34,6 +34,12 @@ + public static final String OS_LINUX = "linux";//$NON-NLS-1$ + + /** ++ * Constant string (value "freebsd") indicating the platform is running on a ++ * FreeBSD-based operating system. ++ */ ++ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ ++ ++ /** + * Constant string (value "aix") indicating the platform is running on an + * AIX-based operating system. + */ +@@ -115,7 +121,7 @@ + * @deprecated use <code>ARCH_X86_64</code> instead. Note the values + * has been changed to be the value of the <code>ARCH_X86_64</code> constant. + */ +- public static final String ARCH_AMD64 = ARCH_X86_64; ++ public static final String ARCH_AMD64 = "amd64";//$NON-NLS-1$ + + /** + * Constant string (value "ia64") indicating the platform is running on an diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml new file mode 100644 index 000000000000..2816426fb485 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-scripts-productBuild-allElements.xml @@ -0,0 +1,21 @@ +--- plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml.orig 2008-08-02 16:07:51.000000000 -0400 ++++ plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml 2008-08-02 16:09:56.000000000 -0400 +@@ -48,6 +48,18 @@ + <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/> + </ant> + </target> ++ ++ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.x86"> ++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> ++ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86.zip"/> ++ </ant> ++ </target> ++ ++ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64"> ++ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> ++ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> ++ </ant> ++ </target> + + <target name="assemble.org.eclipse.pde.build.container.feature.linux.motif.x86"> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-BrandingIron.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-BrandingIron.java new file mode 100644 index 000000000000..0e87eab94461 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-BrandingIron.java @@ -0,0 +1,24 @@ +--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java.orig 2008-08-02 16:46:29.000000000 -0400 ++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java 2008-08-02 16:48:54.000000000 -0400 +@@ -70,6 +70,8 @@ + brandWindows(); + if ("linux".equals(os)) //$NON-NLS-1$ + brandLinux(); ++ if ("freebsd".equals(os)) //$NON-NLS-1$ ++ brandFreeBSD(); + if ("solaris".equals(os)) //$NON-NLS-1$ + brandSolaris(); + if ("macosx".equals(os)) //$NON-NLS-1$ +@@ -94,6 +96,12 @@ + copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$ + } + ++ private void brandFreeBSD() throws Exception { ++ renameLauncher(); ++ if (brandIcons) ++ copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$ ++ } ++ + private void brandSolaris() throws Exception { + renameLauncher(); + if (brandIcons == false) diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-ProductFile.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-ProductFile.java new file mode 100644 index 000000000000..3986ba23a2ff --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-ProductFile.java @@ -0,0 +1,135 @@ +--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java.orig 2008-08-02 16:20:38.000000000 -0400 ++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java 2008-08-02 16:26:31.000000000 -0400 +@@ -28,11 +28,13 @@ + + private static final String PROGRAM_ARGS = "programArgs"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_LINUX = "programArgsLin"; //$NON-NLS-1$ ++ private static final String PROGRAM_ARGS_FREEBSD = "programArgsFre"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_SOLARIS = "programArgsSol"; //$NON-NLS-1$ + private static final String PROGRAM_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ + private static final String VM_ARGS = "vmArgs"; //$NON-NLS-1$ + private static final String VM_ARGS_LINUX = "vmArgsLin"; //$NON-NLS-1$ ++ private static final String VM_ARGS_FREEBSD = "vmArgsFre"; //$NON-NLS-1$ + private static final String VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ + private static final String VM_ARGS_SOLARIS = "vmArgsSol"; //$NON-NLS-1$ + private static final String VM_ARGS_WIN = "vmArgsWin"; //$NON-NLS-1$ +@@ -67,15 +69,17 @@ + private static final int STATE_FEATURES = 5; + private static final int STATE_PROGRAM_ARGS = 6; + private static final int STATE_PROGRAM_ARGS_LINUX = 7; +- private static final int STATE_PROGRAM_ARGS_MAC = 8; +- private static final int STATE_PROGRAM_ARGS_SOLARIS = 9; +- private static final int STATE_PROGRAM_ARGS_WIN = 10; +- private static final int STATE_VM_ARGS = 11; +- private static final int STATE_VM_ARGS_LINUX = 12; +- private static final int STATE_VM_ARGS_MAC = 13; +- private static final int STATE_VM_ARGS_SOLARIS = 14; +- private static final int STATE_VM_ARGS_WIN = 15; +- private static final int STATE_CONFIG_INI = 16; ++ private static final int STATE_PROGRAM_ARGS_FREEBSD = 8; ++ private static final int STATE_PROGRAM_ARGS_MAC = 9; ++ private static final int STATE_PROGRAM_ARGS_SOLARIS = 10; ++ private static final int STATE_PROGRAM_ARGS_WIN = 11; ++ private static final int STATE_VM_ARGS = 12; ++ private static final int STATE_VM_ARGS_LINUX = 13; ++ private static final int STATE_VM_ARGS_FREEBSD = 14; ++ private static final int STATE_VM_ARGS_MAC = 15; ++ private static final int STATE_VM_ARGS_SOLARIS = 16; ++ private static final int STATE_VM_ARGS_WIN = 17; ++ private static final int STATE_CONFIG_INI = 18; + + private int state = STATE_START; + +@@ -234,6 +238,8 @@ + key = VM_ARGS_WIN; + } else if( os.equals(Platform.OS_LINUX)) { + key = VM_ARGS_LINUX; ++ } else if( os.equals(Platform.OS_FREEBSD)) { ++ key = VM_ARGS_FREEBSD; + } else if( os.equals(Platform.OS_MACOSX)) { + key = VM_ARGS_MAC; + } else if(os.equals(Platform.OS_SOLARIS)) { +@@ -257,6 +263,8 @@ + key = PROGRAM_ARGS_WIN; + } else if( os.equals(Platform.OS_LINUX)) { + key = PROGRAM_ARGS_LINUX; ++ } else if( os.equals(Platform.OS_FREEBSD)) { ++ key = PROGRAM_ARGS_FREEBSD; + } else if( os.equals(Platform.OS_MACOSX)) { + key = PROGRAM_ARGS_MAC; + } else if(os.equals(Platform.OS_SOLARIS)) { +@@ -312,6 +320,8 @@ + processWin(attributes); + } else if (Platform.OS_LINUX.equals(localName)) { + processLinux(attributes); ++ } else if (Platform.OS_FREEBSD.equals(localName)) { ++ processFreeBSD(attributes); + } else if (Platform.OS_MACOSX.equals(localName)) { + processMac(attributes); + } +@@ -327,6 +337,8 @@ + state = STATE_PROGRAM_ARGS; + } else if (PROGRAM_ARGS_LINUX.equals(localName)) { + state = STATE_PROGRAM_ARGS_LINUX; ++ } else if (PROGRAM_ARGS_FREEBSD.equals(localName)) { ++ state = STATE_PROGRAM_ARGS_FREEBSD; + } else if (PROGRAM_ARGS_MAC.equals(localName)) { + state = STATE_PROGRAM_ARGS_MAC; + } else if (PROGRAM_ARGS_SOLARIS.equals(localName)) { +@@ -337,6 +349,8 @@ + state = STATE_VM_ARGS; + } else if (VM_ARGS_LINUX.equals(localName)) { + state = STATE_VM_ARGS_LINUX; ++ } else if (VM_ARGS_FREEBSD.equals(localName)) { ++ state = STATE_VM_ARGS_FREEBSD; + } else if (VM_ARGS_MAC.equals(localName)) { + state = STATE_VM_ARGS_MAC; + } else if (VM_ARGS_SOLARIS.equals(localName)) { +@@ -381,11 +395,13 @@ + + case STATE_PROGRAM_ARGS : + case STATE_PROGRAM_ARGS_LINUX : ++ case STATE_PROGRAM_ARGS_FREEBSD : + case STATE_PROGRAM_ARGS_MAC : + case STATE_PROGRAM_ARGS_SOLARIS : + case STATE_PROGRAM_ARGS_WIN : + case STATE_VM_ARGS : + case STATE_VM_ARGS_LINUX : ++ case STATE_VM_ARGS_FREEBSD : + case STATE_VM_ARGS_MAC : + case STATE_VM_ARGS_SOLARIS : + case STATE_VM_ARGS_WIN : +@@ -409,6 +425,9 @@ + case STATE_PROGRAM_ARGS_LINUX : + addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length)); + break; ++ case STATE_PROGRAM_ARGS_FREEBSD : ++ addLaunchArgumentToMap(PROGRAM_ARGS_FREEBSD, String.valueOf(ch, start, length)); ++ break; + case STATE_PROGRAM_ARGS_MAC : + addLaunchArgumentToMap(PROGRAM_ARGS_MAC, String.valueOf(ch, start, length)); + break; +@@ -424,6 +443,9 @@ + case STATE_VM_ARGS_LINUX : + addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length)); + break; ++ case STATE_VM_ARGS_FREEBSD : ++ addLaunchArgumentToMap(VM_ARGS_FREEBSD, String.valueOf(ch, start, length)); ++ break; + case STATE_VM_ARGS_MAC : + addLaunchArgumentToMap(VM_ARGS_MAC, String.valueOf(ch, start, length)); + break; +@@ -555,6 +577,12 @@ + result.add(attributes.getValue("icon")); //$NON-NLS-1$ + } + ++ private void processFreeBSD(Attributes attributes) { ++ if (!osMatch(Platform.OS_FREEBSD)) ++ return; ++ result.add(attributes.getValue("icon")); //$NON-NLS-1$ ++ } ++ + private void processMac(Attributes attributes) { + if (!osMatch(Platform.OS_MACOSX)) + return; diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-Utils.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-Utils.java new file mode 100644 index 000000000000..909174407b45 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-Utils.java @@ -0,0 +1,24 @@ +--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java.orig 2008-08-02 16:49:39.000000000 -0400 ++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 2008-08-02 17:07:42.000000000 -0400 +@@ -13,6 +13,7 @@ + import java.net.URL; + import java.util.*; + import org.eclipse.core.runtime.*; ++import org.eclipse.osgi.service.environment.Constants; + import org.eclipse.osgi.service.resolver.BundleDescription; + import org.eclipse.osgi.util.NLS; + import org.eclipse.pde.internal.build.ant.AntScript; +@@ -433,7 +434,12 @@ + arguments.add("-sf"); //$NON-NLS-1$ + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ String os = System.getProperty("osgi.os", ""); //$NON-NLS-1$ //$NON-NLS-2$ ++ String osStr = "Linux"; //$NON-NLS-1$ ++ if (os.equals(Constants.OS_FREEBSD)) { ++ osStr = "FreeBSD"; //$NON-NLS-1$ ++ } ++ script.printExecTask("ln", dir, arguments, osStr); //$NON-NLS-1$ + arguments.clear(); + } + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-builder-ModelBuildScriptGenerator.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-builder-ModelBuildScriptGenerator.java new file mode 100644 index 000000000000..74408146bd04 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src-org-eclipse-pde-internal-build-builder-ModelBuildScriptGenerator.java @@ -0,0 +1,24 @@ +--- plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java.orig 2008-08-02 16:30:36.000000000 -0400 ++++ plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 2008-08-02 16:45:09.000000000 -0400 +@@ -12,6 +12,7 @@ + import java.io.*; + import java.util.*; + import org.eclipse.core.runtime.*; ++import org.eclipse.osgi.service.environment.Constants; + import org.eclipse.osgi.service.resolver.BundleDescription; + import org.eclipse.osgi.util.NLS; + import org.eclipse.pde.internal.build.*; +@@ -621,7 +622,12 @@ + for (int i = 0; i < links.length; i += 2) { + arguments.add(links[i]); + arguments.add(links[i + 1]); +- script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ ++ String os = System.getProperty("osgi.os", ""); //$NON-NLS-1$ //$NON-NLS-2$ ++ String osStr = "Linux"; //$NON-NLS-1$ ++ if (os.equals(Constants.OS_FREEBSD)) { ++ osStr = "FreeBSD"; //$NON-NLS-1$ ++ } ++ script.printExecTask("ln -s", dir, arguments, osStr); //$NON-NLS-1$ + arguments.clear(); + } + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src_ant-org-eclipse-pde-internal-build-tasks-JNLPGenerator.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src_ant-org-eclipse-pde-internal-build-tasks-JNLPGenerator.java new file mode 100644 index 000000000000..dbbc7e88843b --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-src_ant-org-eclipse-pde-internal-build-tasks-JNLPGenerator.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java.orig 2008-08-02 16:28:25.000000000 -0400 ++++ plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 2008-08-02 16:29:14.000000000 -0400 +@@ -307,6 +307,8 @@ + return "Mac"; //$NON-NLS-1$ + if ("linux".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "Linux"; //$NON-NLS-1$ ++ if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ ++ return "FreeBSD"; //$NON-NLS-1$ + if ("solaris".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "Solaris"; //$NON-NLS-1$ + if ("hpux".equalsIgnoreCase(os)) //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties new file mode 100644 index 000000000000..cefd018442a8 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-headless-build-build.properties @@ -0,0 +1,20 @@ +--- plugins/org.eclipse.pde.build/templates/headless-build/build.properties.orig 2008-08-02 16:11:10.000000000 -0400 ++++ plugins/org.eclipse.pde.build/templates/headless-build/build.properties 2008-08-02 16:12:29.000000000 -0400 +@@ -46,6 +46,8 @@ + # linux, gtk, x86 & \ + # linux, gtk, x86_64 & \ + # linux, motif, x86 & \ ++# freebsd, gtk, x86 & \ ++# freebsd, gtk, amd64 & \ + # solaris, motif, sparc & \ + # solaris, gtk, sparc & \ + # aix, motif, ppc & \ +@@ -66,6 +68,8 @@ + # linux, gtk, x86 - antZip& \ + # linux, gtk, x86_64 - antZip& \ + # linux, motif, x86 - antZip& \ ++# freebsd, gtk, x86 - antZip & \ ++# freebsd, gtk, amd64 - antZip & \ + # solaris, motif, sparc - antZip& \ + # solaris, gtk, sparc - antZip& \ + # aix, motif, ppc - antZip& \ diff --git a/java/eclipse/files/patch-plugins-pde-build-templates-packager-customTargets.xml b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml index 412bd99f51f0..b5cf834825b7 100644 --- a/java/eclipse/files/patch-plugins-pde-build-templates-packager-customTargets.xml +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml @@ -1,20 +1,28 @@ ---- plugins/org.eclipse.pde.build/templates/packager/customTargets.xml.orig 2007-10-24 06:49:06.000000000 +0900 -+++ plugins/org.eclipse.pde.build/templates/packager/customTargets.xml 2007-11-19 14:34:19.000000000 +0900 -@@ -18,6 +18,17 @@ +--- plugins/org.eclipse.pde.build/templates/packager/customTargets.xml.orig 2008-08-02 16:15:50.000000000 -0400 ++++ plugins/org.eclipse.pde.build/templates/packager/customTargets.xml 2008-08-02 16:17:23.000000000 -0400 +@@ -23,6 +23,12 @@ + <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/> </ant> </target> - ++ + <target name="assemble.freebsd.gtk.x86.xml"> + <ant antfile="${assembleScriptName}" > + <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86.zip"/> + </ant> + </target> + + <target name="assemble.linux.gtk.ppc.xml"> + <ant antfile="${assembleScriptName}" > +@@ -35,6 +41,12 @@ + <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86_64.zip"/> + </ant> + </target> ++ + <target name="assemble.freebsd.gtk.amd64.xml"> + <ant antfile="${assembleScriptName}" > + <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> + </ant> + </target> -+ - <target name="assemble.linux.gtk.x86.xml"> + + <target name="assemble.linux.motif.x86.xml"> <ant antfile="${assembleScriptName}" > - <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties new file mode 100644 index 000000000000..fcabc61d5b52 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packager.properties @@ -0,0 +1,20 @@ +--- plugins/org.eclipse.pde.build/templates/packager/packager.properties.orig 2008-08-02 16:13:37.000000000 -0400 ++++ plugins/org.eclipse.pde.build/templates/packager/packager.properties 2008-08-02 16:14:47.000000000 -0400 +@@ -16,6 +16,8 @@ + # linux, gtk, x86 & \ + # linux, gtk, x86_64 & \ + # linux, motif, x86 & \ ++# freebsd, gtk, x86 & \ ++# freebsd, gtk, amd64 & \ + # solaris, motif, sparc & \ + # solaris, gtk, sparc & \ + # aix, motif, ppc & \ +@@ -88,6 +90,8 @@ + # linux, gtk, x86 - antZip& \ + # linux, gtk, x86_64 - antZip& \ + # linux, motif, x86 - antZip& \ ++# freebsd, gtk, x86 - antZip& \ ++# freebsd, gtk, amd64 - antZip& \ + # solaris, motif, sparc - antZip& \ + # solaris, gtk, sparc - antZip& \ + # aix, motif, ppc - antZip& \ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties new file mode 100644 index 000000000000..b1d8a95f1207 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-packaging.properties @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.pde.build/templates/packager/packaging.properties.orig 2008-08-02 16:18:28.000000000 -0400 ++++ plugins/org.eclipse.pde.build/templates/packager/packaging.properties 2008-08-02 16:55:27.000000000 -0400 +@@ -21,6 +21,8 @@ + root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm + root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm + root.linux.gtk.ppc=eclipse ++root.freebsd.gtk.x86=eclipse,about_files/,about.html,icon.xpm ++root.freebsd.gtk.amd64=eclipse,about_files/,about.html,icon.xpm + root.macosx.carbon.ppc=eclipse,Eclipse.app/ + root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS + root.aix.motif.ppc=eclipse diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-exports-ProductExportOperation.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-exports-ProductExportOperation.java new file mode 100644 index 000000000000..e45ca967f51b --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-exports-ProductExportOperation.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java.orig 2008-08-02 16:56:58.000000000 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java 2008-08-02 17:00:16.000000000 -0400 +@@ -480,6 +480,8 @@ + images = getSolarisImages(info); + } else if (os.equals("linux")) { //$NON-NLS-1$ + images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); ++ } else if (os.equals("freebsd")) { //$NON-NLS-1$ ++ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); + } else if (os.equals("macosx")) { //$NON-NLS-1$ + images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-iproduct-IArgumentsInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-iproduct-IArgumentsInfo.java new file mode 100644 index 000000000000..fc26c50fbc4f --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-iproduct-IArgumentsInfo.java @@ -0,0 +1,25 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java.orig 2008-08-02 17:01:23.000000000 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java 2008-08-02 17:04:18.000000000 -0400 +@@ -14,12 +14,14 @@ + + public static final String P_PROG_ARGS = "programArgs"; //$NON-NLS-1$ + public static final String P_PROG_ARGS_LIN = "programArgsLin"; //$NON-NLS-1$ ++ public static final String P_PROG_ARGS_FRE = "programArgsFre"; //$NON-NLS-1$ + public static final String P_PROG_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ + public static final String P_PROG_ARGS_SOL = "programArgsSol"; //$NON-NLS-1$ + public static final String P_PROG_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ + + public static final String P_VM_ARGS = "vmArgs"; //$NON-NLS-1$ + public static final String P_VM_ARGS_LIN = "vmArgsLin"; //$NON-NLS-1$ ++ public static final String P_VM_ARGS_FRE = "vmArgsFre"; //$NON-NLS-1$ + public static final String P_VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ + public static final String P_VM_ARGS_SOL = "vmArgsSol"; //$NON-NLS-1$ + public static final String P_VM_ARGS_WIN = "vmArgsWin"; //$NON-NLS-1$ +@@ -29,6 +31,7 @@ + public static final int L_ARGS_MACOS = 2; + public static final int L_ARGS_SOLAR = 3; + public static final int L_ARGS_WIN32 = 4; ++ public static final int L_ARGS_FREEBSD = 5; + + void setProgramArguments(String args, int platform); + diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-iproduct-ILauncherInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-iproduct-ILauncherInfo.java new file mode 100644 index 000000000000..82494b70c880 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-iproduct-ILauncherInfo.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java.orig 2008-08-02 17:05:28.000000000 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.java 2008-08-02 17:05:54.000000000 -0400 +@@ -14,6 +14,8 @@ + + public static final String LINUX_ICON = "linuxIcon"; //$NON-NLS-1$ + ++ public static final String FREEBSD_ICON = "freebsdIcon"; //$NON-NLS-1$ ++ + public static final String MACOSX_ICON = "macosxIcon"; //$NON-NLS-1$ + + public static final String SOLARIS_LARGE = "solarisLarge"; //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-ArgumentsInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-ArgumentsInfo.java new file mode 100644 index 000000000000..217ed8755099 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-ArgumentsInfo.java @@ -0,0 +1,117 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java.orig 2008-08-02 21:24:52.884965179 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java 2008-08-02 21:24:20.894767822 -0400 +@@ -21,12 +21,14 @@ + private static final long serialVersionUID = 1L; + private String fProgramArgs = ""; //$NON-NLS-1$ + private String fProgramArgsLin = ""; //$NON-NLS-1$ ++ private String fProgramArgsFre = ""; //$NON-NLS-1$ + private String fProgramArgsMac = ""; //$NON-NLS-1$ + private String fProgramArgsSol = ""; //$NON-NLS-1$ + private String fProgramArgsWin = ""; //$NON-NLS-1$ + + private String fVMArgs = ""; //$NON-NLS-1$ + private String fVMArgsLin = ""; //$NON-NLS-1$ ++ private String fVMArgsFre = ""; //$NON-NLS-1$ + private String fVMArgsMac = ""; //$NON-NLS-1$ + private String fVMArgsSol = ""; //$NON-NLS-1$ + private String fVMArgsWin = ""; //$NON-NLS-1$ +@@ -52,6 +54,12 @@ + if (isEditable()) + firePropertyChanged(P_PROG_ARGS_LIN, old, fProgramArgsLin); + break; ++ case L_ARGS_FREEBSD : ++ old = fProgramArgsFre; ++ fProgramArgsFre = args; ++ if (isEditable()) ++ firePropertyChanged(P_PROG_ARGS_FRE, old, fProgramArgsFre); ++ break; + case L_ARGS_MACOS : + old = fProgramArgsMac; + fProgramArgsMac = args; +@@ -79,6 +87,8 @@ + return fProgramArgs; + case L_ARGS_LINUX : + return fProgramArgsLin; ++ case L_ARGS_FREEBSD : ++ return fProgramArgsFre; + case L_ARGS_MACOS : + return fProgramArgsMac; + case L_ARGS_SOLAR : +@@ -94,6 +104,8 @@ + return getCompleteArgs(getProgramArguments(L_ARGS_WIN32), fProgramArgs); + } else if (Platform.OS_LINUX.equals(os)) { + return getCompleteArgs(getProgramArguments(L_ARGS_LINUX), fProgramArgs); ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ return getCompleteArgs(getProgramArguments(L_ARGS_FREEBSD), fProgramArgs); + } else if (Platform.OS_MACOSX.equals(os)) { + return getCompleteArgs(getProgramArguments(L_ARGS_MACOS), fProgramArgs); + } else if (Platform.OS_SOLARIS.equals(os)) { +@@ -120,6 +132,12 @@ + if (isEditable()) + firePropertyChanged(P_VM_ARGS_LIN, old, fVMArgsLin); + break; ++ case L_ARGS_FREEBSD : ++ old = fVMArgsFre; ++ fVMArgsFre = args; ++ if (isEditable()) ++ firePropertyChanged(P_VM_ARGS_FRE, old, fVMArgsFre); ++ break; + case L_ARGS_MACOS : + old = fVMArgsMac; + fVMArgsMac = args; +@@ -147,6 +165,8 @@ + return fVMArgs; + case L_ARGS_LINUX : + return fVMArgsLin; ++ case L_ARGS_FREEBSD : ++ return fVMArgsFre; + case L_ARGS_MACOS : + return fVMArgsMac; + case L_ARGS_SOLAR : +@@ -162,6 +182,8 @@ + return getCompleteArgs(getVMArguments(L_ARGS_WIN32), fVMArgs); + } else if (Platform.OS_LINUX.equals(os)) { + return getCompleteArgs(getVMArguments(L_ARGS_LINUX), fVMArgs); ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ return getCompleteArgs(getVMArguments(L_ARGS_FREEBSD), fVMArgs); + } else if (Platform.OS_MACOSX.equals(os)) { + return getCompleteArgs(getVMArguments(L_ARGS_MACOS), fVMArgs); + } else if (Platform.OS_SOLARIS.equals(os)) { +@@ -187,6 +209,8 @@ + fProgramArgs = getText(child); + } else if (child.getNodeName().equals(P_PROG_ARGS_LIN)) { + fProgramArgsLin = getText(child); ++ } else if (child.getNodeName().equals(P_PROG_ARGS_FRE)) { ++ fProgramArgsFre = getText(child); + } else if (child.getNodeName().equals(P_PROG_ARGS_MAC)) { + fProgramArgsMac = getText(child); + } else if (child.getNodeName().equals(P_PROG_ARGS_SOL)) { +@@ -197,6 +221,8 @@ + fVMArgs = getText(child); + } else if (child.getNodeName().equals(P_VM_ARGS_LIN)) { + fVMArgsLin = getText(child); ++ } else if (child.getNodeName().equals(P_VM_ARGS_FRE)) { ++ fVMArgsFre = getText(child); + } else if (child.getNodeName().equals(P_VM_ARGS_MAC)) { + fVMArgsMac = getText(child); + } else if (child.getNodeName().equals(P_VM_ARGS_SOL)) { +@@ -225,6 +251,9 @@ + if (fProgramArgsLin.length() > 0) { + writer.println(indent + " " + "<" + P_PROG_ARGS_LIN + ">" + getWritableString(fProgramArgsLin) + "</" + P_PROG_ARGS_LIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } ++ if (fProgramArgsFre.length() > 0) { ++ writer.println(indent + " " + "<" + P_PROG_ARGS_FRE + ">" + getWritableString(fProgramArgsFre) + "</" + P_PROG_ARGS_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ ++ } + if (fProgramArgsMac.length() > 0) { + writer.println(indent + " " + "<" + P_PROG_ARGS_MAC + ">" + getWritableString(fProgramArgsMac) + "</" + P_PROG_ARGS_MAC + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } +@@ -240,6 +269,9 @@ + if (fVMArgsLin.length() > 0) { + writer.println(indent + " " + "<" + P_VM_ARGS_LIN + ">" + getWritableString(fVMArgsLin) + "</" + P_VM_ARGS_LIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } ++ if (fVMArgsFre.length() > 0) { ++ writer.println(indent + " " + "<" + P_VM_ARGS_FRE + ">" + getWritableString(fVMArgsFre) + "</" + P_VM_ARGS_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ ++ } + if (fVMArgsMac.length() > 0) { + writer.println(indent + " " + "<" + P_VM_ARGS_MAC + ">" + getWritableString(fVMArgsMac) + "</" + P_VM_ARGS_MAC + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-ConfigurationFileInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-ConfigurationFileInfo.java new file mode 100644 index 000000000000..9faed761c020 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-ConfigurationFileInfo.java @@ -0,0 +1,92 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java.orig 2008-08-02 17:18:07.000000000 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ConfigurationFileInfo.java 2008-08-02 17:32:35.000000000 -0400 +@@ -25,11 +25,13 @@ + private String fPath; + + private static final String LIN = Constants.OS_LINUX; ++ private static final String FRE = Constants.OS_FREEBSD; + private static final String MAC = Constants.OS_MACOSX; + private static final String SOL = Constants.OS_SOLARIS; + private static final String WIN = Constants.OS_WIN32; + + private String fLinPath, fLinUse; ++ private String fFrePath, fFreUse; + private String fMacPath, fMacUse; + private String fSolPath, fSolUse; + private String fWinPath, fWinUse; +@@ -70,6 +72,9 @@ + if (child.getNodeName().equals(LIN)) { + fLinPath = getText(child); + fLinUse = fLinPath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ ++ } else if (child.getNodeName().equals(FRE)) { ++ fFrePath = getText(child); ++ fFreUse = fFrePath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ + } else if (child.getNodeName().equals(MAC)) { + fMacPath = getText(child); + fMacUse = fMacPath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ +@@ -89,6 +94,10 @@ + fLinPath = fLinPath == null ? fPath : null; + fLinUse = "custom"; //$NON-NLS-1$ + } ++ if (fFreUse == null) { ++ fFrePath = fFreUse == null ? fPath : null; ++ fFreUse = "custom"; //$NON-NLS-1$ ++ } + if (fMacUse == null) { + fMacPath = fMacPath == null ? fPath : null; + fMacUse = "custom"; //$NON-NLS-1$ +@@ -139,6 +148,12 @@ + writer.println("</" + LIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + } + ++ if (fFrePath != null) { ++ writer.print(indent); ++ writer.print(" <" + FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ writer.print(getWritableString(fFrePath.trim())); ++ writer.println("</" + FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ } + if (fMacPath != null) { + writer.print(indent); + writer.print(" <" + MAC + ">"); //$NON-NLS-1$ //$NON-NLS-2$ +@@ -182,6 +197,11 @@ + fLinUse = use; + if (isEditable()) + firePropertyChanged(LIN, old, fLinUse); ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ String old = fFreUse; ++ fFreUse = use; ++ if (isEditable()) ++ firePropertyChanged(FRE, old, fFreUse); + } else if (Platform.OS_MACOSX.equals(os)) { + String old = fMacUse; + fMacUse = use; +@@ -203,6 +223,8 @@ + return fWinUse; + } else if (Platform.OS_LINUX.equals(os)) { + return fLinUse; ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ return fFreUse; + } else if (Platform.OS_MACOSX.equals(os)) { + return fMacUse; + } else if (Platform.OS_SOLARIS.equals(os)) { +@@ -229,6 +251,11 @@ + fLinPath = path; + if (isEditable()) + firePropertyChanged(LIN, old, fLinPath); ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ String old = fFrePath; ++ fFrePath = path; ++ if (isEditable()) ++ firePropertyChanged(FRE, old, fFrePath); + } else if (Platform.OS_MACOSX.equals(os)) { + String old = fMacPath; + fMacPath = path; +@@ -250,6 +277,8 @@ + return fWinPath; + } else if (Platform.OS_LINUX.equals(os)) { + return fLinPath; ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ return fFrePath; + } else if (Platform.OS_MACOSX.equals(os)) { + return fMacPath; + } else if (Platform.OS_SOLARIS.equals(os)) { diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-JREInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-JREInfo.java new file mode 100644 index 000000000000..92fc714091d3 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-JREInfo.java @@ -0,0 +1,60 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java.orig 2008-08-02 21:26:22.675516213 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java 2008-08-02 21:26:09.925437642 -0400 +@@ -23,12 +23,14 @@ + public class JREInfo extends ProductObject implements IJREInfo { + + private static final String JRE_LIN = "linux"; //$NON-NLS-1$ ++ private static final String JRE_FRE = "freebsd"; //$NON-NLS-1$ + private static final String JRE_MAC = "macos"; //$NON-NLS-1$ + private static final String JRE_SOL = "solaris"; //$NON-NLS-1$ + private static final String JRE_WIN = "windows"; //$NON-NLS-1$ + + private static final long serialVersionUID = 1L; + private IPath fJVMLin; ++ private IPath fJVMFre; + private IPath fJVMMac; + private IPath fJVMSol; + private IPath fJVMWin; +@@ -45,6 +47,8 @@ + return fJVMWin; + } else if (Platform.OS_LINUX.equals(os)) { + return fJVMLin; ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ return fJVMFre; + } else if (Platform.OS_MACOSX.equals(os)) { + return fJVMMac; + } else if (Platform.OS_SOLARIS.equals(os)) { +@@ -67,6 +71,11 @@ + fJVMLin = jreContainerPath; + if (isEditable()) + firePropertyChanged(JRE_LIN, old, fJVMLin); ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ IPath old = fJVMFre; ++ fJVMFre = jreContainerPath; ++ if (isEditable()) ++ firePropertyChanged(JRE_FRE, old, fJVMFre); + } else if (Platform.OS_MACOSX.equals(os)) { + IPath old = fJVMMac; + fJVMMac = jreContainerPath; +@@ -104,6 +113,8 @@ + if (child.getNodeType() == Node.ELEMENT_NODE) { + if (child.getNodeName().equals(JRE_LIN)) { + fJVMLin = getPath(child); ++ } else if (child.getNodeName().equals(JRE_FRE)) { ++ fJVMFre = getPath(child); + } else if (child.getNodeName().equals(JRE_MAC)) { + fJVMMac = getPath(child); + } else if (child.getNodeName().equals(JRE_SOL)) { +@@ -143,6 +154,12 @@ + writer.print(fJVMLin.toPortableString()); + writer.println("</" + JRE_LIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + } ++ if (fJVMFre != null) { ++ writer.print(indent); ++ writer.print(" <" + JRE_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ writer.print(fJVMFre.toPortableString()); ++ writer.println("</" + JRE_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ } + if (fJVMMac != null) { + writer.print(indent); + writer.print(" <" + JRE_MAC + ">"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-LauncherInfo.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-LauncherInfo.java new file mode 100644 index 000000000000..6d6f7d44e363 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.core-src-org-eclipse-pde-internal-core-product-LauncherInfo.java @@ -0,0 +1,41 @@ +--- plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java.orig 2008-08-02 17:14:03.000000000 -0400 ++++ plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java 2008-08-02 17:17:11.000000000 -0400 +@@ -76,6 +76,8 @@ + String name = child.getNodeName(); + if (name.equals("linux")) { //$NON-NLS-1$ + parseLinux((Element) child); ++ } else if (name.equals("freebsd")) { //$NON-NLS-1$ ++ parseFreeBSD((Element) child); + } else if (name.equals("macosx")) { //$NON-NLS-1$ + parseMac((Element) child); + } else if (name.equals("solaris")) { //$NON-NLS-1$ +@@ -124,6 +126,10 @@ + fIcons.put(LINUX_ICON, element.getAttribute("icon")); //$NON-NLS-1$ + } + ++ public void parseFreeBSD(Element element) { ++ fIcons.put(FREEBSD_ICON, element.getAttribute("icon")); //$NON-NLS-1$ ++ } ++ + public void write(String indent, PrintWriter writer) { + writer.print(indent + "<launcher"); //$NON-NLS-1$ + if (fLauncherName != null && fLauncherName.length() > 0) +@@ -131,6 +137,7 @@ + writer.println(">"); //$NON-NLS-1$ + + writeLinux(indent + " ", writer); //$NON-NLS-1$ ++ writeFreeBSD(indent + " ", writer); //$NON-NLS-1$ + writeMac(indent + " ", writer); //$NON-NLS-1$ + writeSolaris(indent + " ", writer); //$NON-NLS-1$ + writerWin(indent + " ", writer); //$NON-NLS-1$ +@@ -183,4 +190,10 @@ + writer.println(indent + "<linux icon=\"" + getWritableString(icon) + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ + } + ++ private void writeFreeBSD(String indent, PrintWriter writer) { ++ String icon = (String) fIcons.get(FREEBSD_ICON); ++ if (icon != null && icon.length() > 0) ++ writer.println(indent + "<freebsd icon=\"" + getWritableString(icon) + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-PDEUIMessages.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-PDEUIMessages.java new file mode 100644 index 000000000000..ea0615826511 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-PDEUIMessages.java @@ -0,0 +1,17 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java.orig 2008-08-02 21:41:30.561093849 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java 2008-08-02 21:42:30.381459007 -0400 +@@ -1246,6 +1246,7 @@ + public static String LauncherSection_48Low; + public static String LauncherSection_48High; + public static String LauncherSection_linuxLabel; ++ public static String LauncherSection_freebsdLabel; + public static String LauncherSection_large; + public static String LauncherSection_medium; + public static String LauncherSection_small; +@@ -3230,4 +3231,4 @@ + public static String PDECompilersConfigurationBlock_warning; + public static String PDECompilersConfigurationBlock_ignore; + +-} +\ No newline at end of file ++} diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-ArgumentsSection.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-ArgumentsSection.java new file mode 100644 index 000000000000..0007c7a3caa5 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-ArgumentsSection.java @@ -0,0 +1,10 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java.orig 2008-08-02 17:36:55.000000000 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java 2008-08-02 17:37:50.000000000 -0400 +@@ -35,6 +35,7 @@ + static { + TAB_LABELS[IArgumentsInfo.L_ARGS_ALL] = PDEUIMessages.ArgumentsSection_allPlatforms; + TAB_LABELS[IArgumentsInfo.L_ARGS_LINUX] = "linux"; //$NON-NLS-1$ ++ TAB_LABELS[IArgumentsInfo.L_ARGS_FREEBSD] = "freebsd"; //$NON-NLS-1$ + TAB_LABELS[IArgumentsInfo.L_ARGS_MACOS] = "macosx"; //$NON-NLS-1$ + TAB_LABELS[IArgumentsInfo.L_ARGS_SOLAR] = "solaris"; //$NON-NLS-1$ + TAB_LABELS[IArgumentsInfo.L_ARGS_WIN32] = "win32"; //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-ConfigurationSection.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-ConfigurationSection.java new file mode 100644 index 000000000000..7f979abbf206 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-ConfigurationSection.java @@ -0,0 +1,13 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java.orig 2008-08-02 17:38:50.000000000 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java 2008-08-02 17:39:46.000000000 -0400 +@@ -50,8 +50,8 @@ + private FormEntry fCustomEntry; + private boolean fBlockChanges; + +- private static final String[] TAB_LABELS = {"linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ +- private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; ++ private static final String[] TAB_LABELS = {"linux", "freebsd", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ ++ private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_FREEBSD, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; + + private CTabFolder fTabFolder; + private int fLastTab; diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-JRESection.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-JRESection.java new file mode 100644 index 000000000000..aea9feb1f0ff --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-JRESection.java @@ -0,0 +1,13 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java.orig 2008-08-02 21:34:49.378631553 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java 2008-08-02 21:36:12.049135765 -0400 +@@ -77,8 +77,8 @@ + private ComboViewerPart fEEsCombo; + private boolean fBlockChanges; + +- private static final String[] TAB_LABELS = {"linux", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ +- private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; ++ private static final String[] TAB_LABELS = {"linux", "freebsd", "macosx", "solaris", "win32"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ ++ private static final String[] TAB_OS = {Platform.OS_LINUX, Platform.OS_FREEBSD, Platform.OS_MACOSX, Platform.OS_SOLARIS, Platform.OS_WIN32}; + + private CTabFolder fTabFolder; + private int fLastTab; diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-LauncherSection.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-LauncherSection.java new file mode 100644 index 000000000000..04318c3914e5 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-editor-product-LauncherSection.java @@ -0,0 +1,79 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java.orig 2008-08-02 17:40:49.000000000 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/LauncherSection.java 2008-08-02 17:46:15.000000000 -0400 +@@ -61,6 +61,7 @@ + private Composite fNotebook; + private StackLayout fNotebookLayout; + private Composite fLinuxSection; ++ private Composite fFreeBSDSection; + private Composite fMacSection; + private Composite fSolarisSection; + private Composite fWin32Section; +@@ -156,6 +157,7 @@ + fNotebook.setLayout(fNotebookLayout); + + fLinuxSection = addLinuxSection(fNotebook, toolkit); ++ fFreeBSDSection = addFreeBSDSection(fNotebook, toolkit); + fMacSection = addMacSection(fNotebook, toolkit); + fSolarisSection = addSolarisSection(fNotebook, toolkit); + fWin32Section = addWin32Section(fNotebook, toolkit); +@@ -181,20 +183,24 @@ + + private void createTabs() { + addTab("linux"); //$NON-NLS-1$ ++ addTab("freebsd"); //$NON-NLS-1$ + addTab("macosx"); //$NON-NLS-1$ + addTab("solaris"); //$NON-NLS-1$ + addTab("win32"); //$NON-NLS-1$ + + String currentTarget = TargetPlatform.getOS(); + if ("win32".equals(currentTarget)) { //$NON-NLS-1$ +- fTabFolder.setSelection(3); ++ fTabFolder.setSelection(4); + fNotebookLayout.topControl = fWin32Section; + } else if ("macosx".equals(currentTarget)) { //$NON-NLS-1$ +- fTabFolder.setSelection(1); ++ fTabFolder.setSelection(2); + fNotebookLayout.topControl = fMacSection; + } else if ("solaris".equals(currentTarget)) { //$NON-NLS-1$ +- fTabFolder.setSelection(2); ++ fTabFolder.setSelection(3); + fNotebookLayout.topControl = fSolarisSection; ++ } else if ("freebsd".equals(currentTarget)) { //$NON-NLS-1$ ++ fTabFolder.setSelection(1); ++ fNotebookLayout.topControl = fFreeBSDSection; + } else { + fTabFolder.setSelection(0); + fNotebookLayout.topControl = fLinuxSection; +@@ -306,6 +312,14 @@ + return comp; + } + ++ private Composite addFreeBSDSection(Composite parent, FormToolkit toolkit) { ++ Composite comp = createComposite(parent, toolkit); ++ createLabel(comp, toolkit, PDEUIMessages.LauncherSection_freebsdLabel, 3); ++ fIcons.add(new IconEntry(comp, toolkit, PDEUIMessages.LauncherSection_icon, ILauncherInfo.FREEBSD_ICON)); ++ toolkit.paintBordersFor(comp); ++ return comp; ++ } ++ + private Composite addSolarisSection(Composite parent, FormToolkit toolkit) { + Composite comp = createComposite(parent, toolkit); + createLabel(comp, toolkit, PDEUIMessages.LauncherSection_solarisLabel, 3); +@@ -484,12 +498,15 @@ + fNotebookLayout.topControl = fLinuxSection; + break; + case 1 : +- fNotebookLayout.topControl = fMacSection; ++ fNotebookLayout.topControl = fFreeBSDSection; + break; + case 2 : +- fNotebookLayout.topControl = fSolarisSection; ++ fNotebookLayout.topControl = fMacSection; + break; + case 3 : ++ fNotebookLayout.topControl = fSolarisSection; ++ break; ++ case 4 : + fNotebookLayout.topControl = fWin32Section; + break; + } diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties new file mode 100644 index 000000000000..bd44b42486e3 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-pderesources.properties @@ -0,0 +1,10 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties.orig 2008-09-25 20:35:26.000000000 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties 2008-09-25 20:32:37.000000000 -0400 +@@ -574,6 +574,7 @@ + LauncherSection_48Low=48x48 (8-bit): + LauncherSection_48High=48x48 (32-bit): + LauncherSection_linuxLabel=A single XPM icon is required: ++LauncherSection_freebsdLabel=A single XPM icon is required: + LauncherSection_large=Large: + LauncherSection_medium=Medium: + LauncherSection_small=Small: diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-wizards-product-ProductIntroOperation.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-wizards-product-ProductIntroOperation.java new file mode 100644 index 000000000000..0922d86670cc --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui-src-org-eclipse-pde-internal-ui-wizards-product-ProductIntroOperation.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java.orig 2008-08-02 21:38:59.940166888 -0400 ++++ plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 2008-08-02 21:39:29.890351339 -0400 +@@ -127,7 +127,7 @@ + implementation.setName("implementation"); //$NON-NLS-1$ + implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$ + implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$ +- implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ ++ implementation.setAttribute("os", "win32,freebsd,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ + + presentation.add(implementation); + diff --git a/java/eclipse/files/patch-plugins-org.eclipse.pde.ui.templates-src-org-eclipse-pde-internal-ui-templates-rcp-IntroTemplate.java b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui.templates-src-org-eclipse-pde-internal-ui-templates-rcp-IntroTemplate.java new file mode 100644 index 000000000000..ec442e851a1a --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.ui.templates-src-org-eclipse-pde-internal-ui-templates-rcp-IntroTemplate.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java.orig 2008-08-02 21:48:19.733606277 -0400 ++++ plugins/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java 2008-08-02 21:49:05.223891216 -0400 +@@ -160,7 +160,7 @@ + presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$ + IPluginElement implementationElement = factory.createElement(presentationElement); + implementationElement.setName("implementation"); //$NON-NLS-1$ +- implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ ++ implementationElement.setAttribute("os", "win32,linux,freebsd,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ + if (getTargetVersion() == 3.0) + implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$ + diff --git a/java/eclipse/files/patch-plugins-org.eclipse.platform.doc.user-contexts_UserAssistance.xml b/java/eclipse/files/patch-plugins-org.eclipse.platform.doc.user-contexts_UserAssistance.xml new file mode 100644 index 000000000000..18e894d61da9 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.platform.doc.user-contexts_UserAssistance.xml @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.platform.doc.user/contexts_UserAssistance.xml.orig 2008-08-02 21:53:37.785558970 -0400 ++++ plugins/org.eclipse.platform.doc.user/contexts_UserAssistance.xml 2008-08-02 21:54:17.345801682 -0400 +@@ -17,7 +17,7 @@ + <!-- ===================== --> + + <context id="f1Shell"> +- <description>Context-sensitive help is provided for many interfaces, including views, wizards, fields, buttons, and menu items. To access this help, bring focus to the item by clicking it or using the tab key, and then press F1 (Shift-F1 on Linux, Help on Mac). Some infopops include links to topics within the online help where you can find more information about the item. This infopop opened because you requested help while an infopop was already open.</description> ++ <description>Context-sensitive help is provided for many interfaces, including views, wizards, fields, buttons, and menu items. To access this help, bring focus to the item by clicking it or using the tab key, and then press F1 (Shift-F1 on Linux and FreeBSD, Help on Mac). Some infopops include links to topics within the online help where you can find more information about the item. This infopop opened because you requested help while an infopop was already open.</description> + </context> + + <context id="prefPageHelp"> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml new file mode 100644 index 000000000000..8bf9db3433a3 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml @@ -0,0 +1,64 @@ +--- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig 2008-08-02 20:56:10.950055571 -0400 ++++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml 2008-08-02 20:58:39.830970324 -0400 +@@ -273,6 +273,9 @@ + <target name="build.cfiles" depends="build.jars"> + <!-- generate the C code from the (64 bit) SWT PI java classes --> + <!-- assumes the swt.jar has already been built --> ++ <!-- <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" />--> ++ <!-- assumes the swttools.jar has already been built --> ++ <echo message="Generating jni C files"/> + <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java> + <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java> + <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java> +@@ -287,21 +290,27 @@ + <!-- since this is the structure assumed by the native makefile and given that --> + <!-- this script needs to work outside of the Eclipse workspace without modifying --> + <!-- the content of the org.eclipse.swt project. --> +- <mkdir dir="${basedir}/src/bin/library"/> +- <copy todir="${basedir}/src/bin/library"> +- <fileset dir="${basedir}/src/Eclipse SWT/common/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT AWT/gtk/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT PI/common/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT Program/cde/library"/> +- <fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library"/> ++ <echo message="${build.result.folder}"/> ++ <mkdir dir="${basedir}/gtk/library"/> ++ <copy todir="${basedir}/gtk/library"> ++ <fileset dir="${basedir}/src/Eclipse SWT/common/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT AWT/gtk/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT Mozilla/common/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT OpenGL/glx/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT PI/common/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT PI/cairo/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT PI/gtk/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT PI/common/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT Program/cde/library/"/> ++ <fileset dir="${basedir}/src/Eclipse SWT Program/gnome/library/"/> + </copy> + </target> + ++ <target name="build.jnilibs" depends="build.nativeLibraries"/> ++ + <target name="build.nativeLibraries" depends="build.cfiles" description="Build 64 bit native libraries without changing the content of org.eclipse.swt"> ++ <echo message="Building Native Libraries"/> ++ <!-- + <property name="sourcedir" value="${basedir}/src/bin/library" /> + <property name="lib_destdir" value="${sourcedir}/../../../../${fragment}" /> + <tstamp/> +@@ -317,6 +326,12 @@ + <copy todir="${lib_destdir}"> + <fileset dir="${sourcedir}/" includes="*.so"/> + </copy> ++ --> ++ <exec dir="${build.result.folder}/gtk/library" executable="sh"> ++ <env key="OUTPUT_DIR" value="${build.result.folder}"/> ++ <arg line="${build.result.folder}/gtk/library/build.sh"/> ++ <arg line="install"/> ++ </exec> + </target> + + <target name="build.zips" depends="init"> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF new file mode 100644 index 000000000000..d7c5f8c8909e --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF.orig 2008-09-25 20:44:00.000000000 -0400 ++++ plugins/org.eclipse.swt.gtk.freebsd.amd64.source/META-INF/MANIFEST.MF 2008-09-25 20:46:29.000000000 -0400 +@@ -6,7 +6,6 @@ + Bundle-ManifestVersion: 2
+ Bundle-Localization: fragment
+ Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.amd64.source
+-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x8
+- 6_64))
++Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=amd64))
+ Bundle-Version: 3.4.1.v3449c
+
diff --git a/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml new file mode 100644 index 000000000000..9c33fa4685fd --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86-build.xml @@ -0,0 +1,30 @@ +--- plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2008-08-02 16:19:48.000000000 -0400 ++++ plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2008-08-02 16:20:07.000000000 -0400 +@@ -142,12 +142,13 @@ + </target> + + <target name="build.cfiles" depends="init"> +- <mkdir dir="${build.result.folder}/library"/> +- <copy todir="${build.result.folder}/library"> ++ <mkdir dir="${build.result.folder}/gtk/library"/> ++ <copy todir="${build.result.folder}/gtk/library"> + <fileset dir="${plugindir}/Eclipse SWT/common/library"/> + <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/> + <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/> + <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/> ++ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/> + <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/> + <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/> + <fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/> +@@ -156,9 +157,9 @@ + </target> + + <target name="build.jnilibs" depends="build.cfiles"> +- <exec dir="${build.result.folder}/library" executable="sh"> ++ <exec dir="${build.result.folder}/gtk/library" executable="sh"> + <env key="OUTPUT_DIR" value="${build.result.folder}"/> +- <arg line="${build.result.folder}/library/build.sh"/> ++ <arg line="${build.result.folder}/gtk/library/build.sh"/> + <arg line="install"/> + </exec> + </target> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.team.cvs.ssh-src-org-eclipse-team-internal-ccvs-ssh-KnownHosts.java b/java/eclipse/files/patch-plugins-org.eclipse.team.cvs.ssh-src-org-eclipse-team-internal-ccvs-ssh-KnownHosts.java new file mode 100644 index 000000000000..83d92e62c5a2 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.team.cvs.ssh-src-org-eclipse-team-internal-ccvs-ssh-KnownHosts.java @@ -0,0 +1,12 @@ +--- plugins/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/KnownHosts.java.orig 2008-08-02 23:18:54.457655000 -0400 ++++ plugins/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/KnownHosts.java 2008-08-02 23:20:58.798422053 -0400 +@@ -38,7 +38,8 @@ + } + + static String defaultFilename() { +- if (!Platform.getOS().equals(Platform.OS_LINUX)) return internalFilename(); ++ if (!Platform.getOS().equals(Platform.OS_LINUX) && !Platform.getOS().equals(Platform.OS_FREEBSD)) ++ return internalFilename(); + String HOME = System.getProperty("user.home"); //$NON-NLS-1$ + if (HOME==null) return internalFilename(); + return HOME+"/.ssh/known_hosts"; //$NON-NLS-1$ diff --git a/java/eclipse/files/patch-plugins-org.eclipse.update.configurator-component.xml b/java/eclipse/files/patch-plugins-org.eclipse.update.configurator-component.xml new file mode 100644 index 000000000000..670fc812961b --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.update.configurator-component.xml @@ -0,0 +1,6 @@ +--- plugins/org.eclipse.update.configurator/component.xml.orig 2008-08-03 22:58:47.947678048 -0400 ++++ plugins/org.eclipse.update.configurator/component.xml 2008-08-03 23:20:58.238181450 -0400 +@@ -1 +1 @@ +-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="Platform Install / Update"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.update.configurator" fragment="false"/><plugin id="org.eclipse.update.core" fragment="false"/><plugin id="org.eclipse.update.core.linux" fragment="true"/><plugin id="org.eclipse.update.core.win32" fragment="true"/><plugin id="org.eclipse.update.scheduler" fragment="false"/><plugin id="org.eclipse.update.ui" fragment="false"/><package name="org.eclipse.update.configurator"><type name="ConfiguratorUtils" implement="false" subclass="false" instantiate="false"/><type name="IPlatformConfiguration" instantiate="false"/><type name="IPlatformConfigurationFactory" instantiate="false"/></package><package name="org.eclipse.update.search"><type name="IUpdateSearchSite" instantiate="false"/><type name="UpdateSearchRequest"/><type name="IUpdateSearchFilter" instantiate="false"/><type name="IQueryUpdateSiteAdapter" instantiate="false"/><type name="IUpdateSearchResultCollectorFromMirror" instantiate="false"/><type name="VersionedIdentifiersFilter"/><type name="IUpdateSearchResultCollector" instantiate="false"/><type name="IUpdateSiteAdapter" instantiate="false"/><type name="BaseFilter"/><type name="EnvironmentFilter"/><type name="IUpdateSearchQuery" instantiate="false"/><type name="IUpdateSearchCategory" instantiate="false"/><type name="UpdateSearchScope"/><type name="BackLevelFilter"/></package><package name="org.eclipse.update.operations"><type name="IInstallFeatureOperation" instantiate="false"/><type name="IUninstallFeatureOperation" instantiate="false"/><type name="IConfigFeatureOperation" instantiate="false"/><type name="IToggleSiteOperation" instantiate="false"/><type name="IOperationFactory" instantiate="false"/><type name="OperationsManager" implement="false" subclass="false" instantiate="false"/><type name="IReplaceFeatureVersionOperation" instantiate="false"/><type name="IFeatureOperation" instantiate="false"/><type name="IOperation" instantiate="false"/><type name="IBatchOperation" instantiate="false"/><type name="IOperationListener" instantiate="false"/><type name="IRevertConfigurationOperation" instantiate="false"/><type name="IOperationValidator" instantiate="false"/><type name="IUnconfigFeatureOperation" instantiate="false"/><type name="IUpdateModelChangedListener" instantiate="false"/></package><package name="org.eclipse.update.core"><type name="Verifier"/><type name="IncludedFeatureReference"/><type name="IInstallHandlerEntry" instantiate="false"/><type name="IArchiveReference" instantiate="false"/><type name="INonPluginEntry" instantiate="false"/><type name="IImport" instantiate="false"/><type name="Site"/><type name="IVerificationResult" instantiate="false"/><type name="InstallHandlerEntry"/><type name="ISiteWithMirrors" instantiate="false"/><type name="JarEntryContentReference"/><type name="IUpdateConstants" instantiate="false"/><type name="BaseFeatureFactory" instantiate="false"/><type name="ISiteFactoryExtension" instantiate="false"/><type name="SiteManager" instantiate="false"/><type name="ICategory" instantiate="false"/><type name="ISite" instantiate="false"/><type name="IContentConsumer" instantiate="false"/><type name="ArchiveReference"/><type name="IVerifier" instantiate="false"/><type name="InstallMonitor"/><type name="IVerificationListener" instantiate="false"/><type name="ISiteFactory" instantiate="false"/><type name="JarContentReference"/><type name="Feature"/><type name="IFeatureFactory" instantiate="false"/><type name="IPlatformEnvironment" instantiate="false"/><type name="IInstallHandlerWithFilter" instantiate="false"/><type name="IPluginEntry" instantiate="false"/><type name="ContentReference"/><type name="URLEntry"/><type name="SiteFeatureReference"/><type name="IFeatureContentConsumer" instantiate="false"/><type name="IFeatureReference" instantiate="false"/><type name="Import"/><type name="ISiteContentProvider" instantiate="false"/><type name="IFeature" instantiate="false"/><type name="VersionedIdentifier" subclass="false"/><type name="FeatureReference"/><type name="IFeatureContentProvider" instantiate="false"/><type name="BaseInstallHandler"/><type name="ISiteFeatureReference" instantiate="false"/><type name="FeatureContentProvider"/><type name="SiteContentProvider"/><type name="BaseSiteFactory" instantiate="false"/><type name="IInstallHandler" instantiate="false"/><type name="SiteFeatureReferenceModel"/><type name="IIncludedFeatureReference" subclass="false" instantiate="false"/><type name="IURLEntry" instantiate="false"/><type name="NonPluginEntry"/><type name="Category"/><type name="PluginEntry"/><type name="Utilities" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.update.core.model"><type name="FeatureReferenceModel"/><type name="SiteModel"/><type name="PluginEntryModel"/><type name="ModelObject" instantiate="false"/><type name="SiteModelFactory"/><type name="FeatureModel"/><type name="InstallAbortedException"/><type name="NonPluginEntryModel"/><type name="InstallHandlerEntryModel"/><type name="DefaultSiteParser"/><type name="URLEntryModel"/><type name="FeatureModelFactory"/><type name="ContentEntryModel"/><type name="DefaultFeatureParser"/><type name="CategoryModel"/><type name="ImportModel"/><type name="IncludedFeatureReferenceModel"/><type name="InvalidSiteTypeException"/><type name="ArchiveReferenceModel"/></package><package name="org.eclipse.update.standalone"><type name="StandaloneUpdateApplication"/><type name="ScriptedCommand"/><type name="UpdateCommand"/><type name="UninstallCommand"/><type name="CmdLineArgs"/><type name="SearchCommand"/><type name="EnableCommand"/><type name="AddSiteCommand"/><type name="InstallCommand"/><type name="DisableCommand"/><type name="ListFeaturesCommand"/><type name="RemoveSiteCommand"/></package><package name="org.eclipse.update.configuration"><type name="IVolume" instantiate="false"/><type name="ILocalSystemInfoListener" instantiate="false"/><type name="IActivity" implement="false" subclass="false" instantiate="false"/><type name="IInstallConfigurationChangedListener" instantiate="false"/><type name="ILocalSite" instantiate="false"/><type name="ILocalSiteChangedListener" instantiate="false"/><type name="IConfiguredSite" instantiate="false"/><type name="IInstallDeltaHandler" instantiate="false"/><type name="IProblemHandler" instantiate="false"/><type name="IConfiguredSiteChangedListener" instantiate="false"/><type name="IInstallConfiguration" instantiate="false"/><type name="LocalSystemInfo" implement="false" subclass="false" instantiate="false"/><type name="ISessionDelta" instantiate="false"/></package><package name="org.eclipse.update.ui"><type name="UpdateJob"/><type name="UpdateManagerUI" implement="false" subclass="false" instantiate="false"/></package></component> +\ No newline at end of file ++<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="Platform Install / Update"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.update.configurator" fragment="false"/><plugin id="org.eclipse.update.core" fragment="false"/><plugin id="org.eclipse.update.core.linux" fragment="true"/><plugin id="org.eclipse.update.core.freebsd" fragment="true"/><plugin id="org.eclipse.update.core.win32" fragment="true"/><plugin id="org.eclipse.update.scheduler" fragment="false"/><plugin id="org.eclipse.update.ui" fragment="false"/><package name="org.eclipse.update.configurator"><type name="ConfiguratorUtils" implement="false" subclass="false" instantiate="false"/><type name="IPlatformConfiguration" instantiate="false"/><type name="IPlatformConfigurationFactory" instantiate="false"/></package><package name="org.eclipse.update.search"><type name="IUpdateSearchSite" instantiate="false"/><type name="UpdateSearchRequest"/><type name="IUpdateSearchFilter" instantiate="false"/><type name="IQueryUpdateSiteAdapter" instantiate="false"/><type name="IUpdateSearchResultCollectorFromMirror" instantiate="false"/><type name="VersionedIdentifiersFilter"/><type name="IUpdateSearchResultCollector" instantiate="false"/><type name="IUpdateSiteAdapter" instantiate="false"/><type name="BaseFilter"/><type name="EnvironmentFilter"/><type name="IUpdateSearchQuery" instantiate="false"/><type name="IUpdateSearchCategory" instantiate="false"/><type name="UpdateSearchScope"/><type name="BackLevelFilter"/></package><package name="org.eclipse.update.operations"><type name="IInstallFeatureOperation" instantiate="false"/><type name="IUninstallFeatureOperation" instantiate="false"/><type name="IConfigFeatureOperation" instantiate="false"/><type name="IToggleSiteOperation" instantiate="false"/><type name="IOperationFactory" instantiate="false"/><type name="OperationsManager" implement="false" subclass="false" instantiate="false"/><type name="IReplaceFeatureVersionOperation" instantiate="false"/><type name="IFeatureOperation" instantiate="false"/><type name="IOperation" instantiate="false"/><type name="IBatchOperation" instantiate="false"/><type name="IOperationListener" instantiate="false"/><type name="IRevertConfigurationOperation" instantiate="false"/><type name="IOperationValidator" instantiate="false"/><type name="IUnconfigFeatureOperation" instantiate="false"/><type name="IUpdateModelChangedListener" instantiate="false"/></package><package name="org.eclipse.update.core"><type name="Verifier"/><type name="IncludedFeatureReference"/><type name="IInstallHandlerEntry" instantiate="false"/><type name="IArchiveReference" instantiate="false"/><type name="INonPluginEntry" instantiate="false"/><type name="IImport" instantiate="false"/><type name="Site"/><type name="IVerificationResult" instantiate="false"/><type name="InstallHandlerEntry"/><type name="ISiteWithMirrors" instantiate="false"/><type name="JarEntryContentReference"/><type name="IUpdateConstants" instantiate="false"/><type name="BaseFeatureFactory" instantiate="false"/><type name="ISiteFactoryExtension" instantiate="false"/><type name="SiteManager" instantiate="false"/><type name="ICategory" instantiate="false"/><type name="ISite" instantiate="false"/><type name="IContentConsumer" instantiate="false"/><type name="ArchiveReference"/><type name="IVerifier" instantiate="false"/><type name="InstallMonitor"/><type name="IVerificationListener" instantiate="false"/><type name="ISiteFactory" instantiate="false"/><type name="JarContentReference"/><type name="Feature"/><type name="IFeatureFactory" instantiate="false"/><type name="IPlatformEnvironment" instantiate="false"/><type name="IInstallHandlerWithFilter" instantiate="false"/><type name="IPluginEntry" instantiate="false"/><type name="ContentReference"/><type name="URLEntry"/><type name="SiteFeatureReference"/><type name="IFeatureContentConsumer" instantiate="false"/><type name="IFeatureReference" instantiate="false"/><type name="Import"/><type name="ISiteContentProvider" instantiate="false"/><type name="IFeature" instantiate="false"/><type name="VersionedIdentifier" subclass="false"/><type name="FeatureReference"/><type name="IFeatureContentProvider" instantiate="false"/><type name="BaseInstallHandler"/><type name="ISiteFeatureReference" instantiate="false"/><type name="FeatureContentProvider"/><type name="SiteContentProvider"/><type name="BaseSiteFactory" instantiate="false"/><type name="IInstallHandler" instantiate="false"/><type name="SiteFeatureReferenceModel"/><type name="IIncludedFeatureReference" subclass="false" instantiate="false"/><type name="IURLEntry" instantiate="false"/><type name="NonPluginEntry"/><type name="Category"/><type name="PluginEntry"/><type name="Utilities" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.update.core.model"><type name="FeatureReferenceModel"/><type name="SiteModel"/><type name="PluginEntryModel"/><type name="ModelObject" instantiate="false"/><type name="SiteModelFactory"/><type name="FeatureModel"/><type name="InstallAbortedException"/><type name="NonPluginEntryModel"/><type name="InstallHandlerEntryModel"/><type name="DefaultSiteParser"/><type name="URLEntryModel"/><type name="FeatureModelFactory"/><type name="ContentEntryModel"/><type name="DefaultFeatureParser"/><type name="CategoryModel"/><type name="ImportModel"/><type name="IncludedFeatureReferenceModel"/><type name="InvalidSiteTypeException"/><type name="ArchiveReferenceModel"/></package><package name="org.eclipse.update.standalone"><type name="StandaloneUpdateApplication"/><type name="ScriptedCommand"/><type name="UpdateCommand"/><type name="UninstallCommand"/><type name="CmdLineArgs"/><type name="SearchCommand"/><type name="EnableCommand"/><type name="AddSiteCommand"/><type name="InstallCommand"/><type name="DisableCommand"/><type name="ListFeaturesCommand"/><type name="RemoveSiteCommand"/></package><package name="org.eclipse.update.configuration"><type name="IVolume" instantiate="false"/><type name="ILocalSystemInfoListener" instantiate="false"/><type name="IActivity" implement="false" subclass="false" instantiate="false"/><type name="IInstallConfigurationChangedListener" instantiate="false"/><type name="ILocalSite" instantiate="false"/><type name="ILocalSiteChangedListener" instantiate="false"/><type name="IConfiguredSite" instantiate="false"/><type name="IInstallDeltaHandler" instantiate="false"/><type name="IProblemHandler" instantiate="false"/><type name="IConfiguredSiteChangedListener" instantiate="false"/><type name="IInstallConfiguration" instantiate="false"/><type name="LocalSystemInfo" implement="false" subclass="false" instantiate="false"/><type name="ISessionDelta" instantiate="false"/></package><package name="org.eclipse.update.ui"><type name="UpdateJob"/><type name="UpdateManagerUI" implement="false" subclass="false" instantiate="false"/></package></component> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.update.core-plugins.properties b/java/eclipse/files/patch-plugins-org.eclipse.update.core-plugins.properties new file mode 100644 index 000000000000..d08165efbca0 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.update.core-plugins.properties @@ -0,0 +1,10 @@ +--- plugins/org.eclipse.update.core/plugin.properties.orig 2008-08-03 10:46:24.591010495 -0400 ++++ plugins/org.eclipse.update.core/plugin.properties 2008-08-03 10:46:47.971154061 -0400 +@@ -12,6 +12,7 @@ + providerName= Eclipse.org
+ fragmentNameWin= Install/Update Core for Windows
+ fragmentNameLinux= Install/Update Core for Linux
++fragmentNameFreeBSD= Install/Update Core for FreeBSD
+ featureTypes.name=Install/Update Concrete Feature Type Implementation Factory
+ siteTypes.name=Install/Update Concrete Site Type Implementation Factory
+ installHandlers.name=Install/Update Global Install Handlers
diff --git a/java/eclipse/files/patch-plugins-org.eclipse.update.core-src-org-eclipse-update-internal-core-UpdateManagerUtils.java b/java/eclipse/files/patch-plugins-org.eclipse.update.core-src-org-eclipse-update-internal-core-UpdateManagerUtils.java new file mode 100644 index 000000000000..7b6a5c719db4 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.update.core-src-org-eclipse-update-internal-core-UpdateManagerUtils.java @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java.orig 2008-08-03 10:44:20.960250999 -0400 ++++ plugins/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java 2008-08-03 10:45:13.560574224 -0400 +@@ -68,6 +68,8 @@ + .equals(Platform.getOS()) + || org.eclipse.osgi.service.environment.Constants.OS_LINUX + .equals(Platform.getOS()) ++ || org.eclipse.osgi.service.environment.Constants.OS_FREEBSD ++ .equals(Platform.getOS()) + || org.eclipse.osgi.service.environment.Constants.OS_SOLARIS + .equals(Platform.getOS()) + || org.eclipse.osgi.service.environment.Constants.OS_MACOSX diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c b/java/eclipse/files/patch-plugins-org.eclipse.update.core.freebsd-src-update.c index 59c6f1b9eeaa..dd50d8793df6 100644 --- a/java/eclipse/files/post-patch-plugins-org.eclipse.update.core.freebsd-src-update.c +++ b/java/eclipse/files/patch-plugins-org.eclipse.update.core.freebsd-src-update.c @@ -1,11 +1,12 @@ ---- plugins/org.eclipse.update.core.freebsd/src/update.c.orig 2007-09-01 18:09:27.000000000 +0900 -+++ plugins/org.eclipse.update.core.freebsd/src/update.c 2007-09-01 18:24:02.000000000 +0900 -@@ -12,7 +12,8 @@ +--- plugins/org.eclipse.update.core.freebsd/src/update.c.orig 2008-08-05 23:34:48.000000000 -0400 ++++ plugins/org.eclipse.update.core.freebsd/src/update.c 2008-08-05 23:35:29.000000000 -0400 +@@ -11,8 +11,9 @@ +
/* bug 82520 : need to include stdlib.h */
# include <stdlib.h>
++# include <sys/param.h>
# include <sys/types.h>
-# include <sys/statfs.h>
-+# include <sys/param.h>
+# include <sys/mount.h>
# include <update.h>
diff --git a/java/eclipse/files/patch-plugins-pde-build-build.xml b/java/eclipse/files/patch-plugins-pde-build-build.xml deleted file mode 100644 index dd4947056ba6..000000000000 --- a/java/eclipse/files/patch-plugins-pde-build-build.xml +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/org.eclipse.pde.build/build.xml.orig 2007-10-24 06:31:14.000000000 +0900 -+++ plugins/org.eclipse.pde.build/build.xml 2007-11-19 14:25:31.000000000 +0900 -@@ -128,6 +128,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> -@@ -231,6 +233,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> diff --git a/java/eclipse/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml b/java/eclipse/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml deleted file mode 100644 index 1df59c08ceef..000000000000 --- a/java/eclipse/files/patch-plugins-pde-build-scripts-productBuild-allElements.xml +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml.orig 2007-10-24 06:49:23.000000000 +0900 -+++ plugins/org.eclipse.pde.build/scripts/productBuild/allElements.xml 2007-11-19 14:28:29.000000000 +0900 -@@ -37,6 +37,17 @@ - </ant> - </target> - -+ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.x86"> -+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> -+ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86.zip"/> -+ </ant> -+ </target> -+ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64"> -+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> -+ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> -+ </ant> -+ </target> -+ - <target name="assemble.org.eclipse.pde.build.container.feature.linux.gtk.x86"> - <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> - <property name="archiveName" value="${archiveNamePrefix}-linux.gtk.x86.zip"/> diff --git a/java/eclipse/files/patch-plugins-pde-core-build.xml b/java/eclipse/files/patch-plugins-pde-core-build.xml deleted file mode 100644 index 59b7d5921568..000000000000 --- a/java/eclipse/files/patch-plugins-pde-core-build.xml +++ /dev/null @@ -1,42 +0,0 @@ ---- plugins/org.eclipse.pde.core/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.pde.core/build.xml 2007-11-19 14:38:35.000000000 +0900 -@@ -148,6 +148,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> -@@ -204,6 +208,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> -@@ -336,6 +342,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd644/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> -@@ -392,6 +402,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> diff --git a/java/eclipse/files/patch-plugins-platform-build.xml b/java/eclipse/files/patch-plugins-platform-build.xml deleted file mode 100644 index 3cbb53cd20bf..000000000000 --- a/java/eclipse/files/patch-plugins-platform-build.xml +++ /dev/null @@ -1,41 +0,0 @@ ---- plugins/org.eclipse.platform/build.xml.orig 2008-02-22 08:46:01.000000000 +0900 -+++ plugins/org.eclipse.platform/build.xml 2008-03-11 00:02:20.000000000 +0900 -@@ -169,12 +169,16 @@ - <pathelement path="../org.eclipse.ui.carbon/@dot"/> - <pathelement path="../org.eclipse.swt/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt_3.3.2.v3349d/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.amd64_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_64_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.win32.win32.x86_3.3.3.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.wpf.win32.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.wpf.win32.x86_3.3.2.v3349/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.linux.x86_3.3.2.v3349/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> -@@ -243,8 +247,12 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.solaris.sparc/@dot"/> -@@ -267,6 +275,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> diff --git a/java/eclipse/files/patch-plugins-swt-amd64-build.xml b/java/eclipse/files/patch-plugins-swt-amd64-build.xml deleted file mode 100644 index 7a763f3911cc..000000000000 --- a/java/eclipse/files/patch-plugins-swt-amd64-build.xml +++ /dev/null @@ -1,37 +0,0 @@ ---- plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml.orig 2007-11-19 13:18:37.000000000 +0900 -+++ plugins/org.eclipse.swt.gtk.freebsd.amd64/build.xml 2007-11-19 15:06:14.000000000 +0900 -@@ -44,14 +44,14 @@ - </target> - - <target name="build.update.jar" depends="init"> -- <delete dir="${temp.folder}"/> -+ <!-- <delete dir="${temp.folder}"/> - <mkdir dir="${temp.folder}"/> - <antcall target="build.jars"/> - <antcall target="gather.bin.parts"> - <param name="destination.temp.folder" value="${temp.folder}/"/> - </antcall> - <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/> -- <delete dir="${temp.folder}"/> -+ <delete dir="${temp.folder}"/> --> - </target> - - <target name="@dot" depends="init" unless="@dot" description="Create jar: @dot."> -@@ -232,6 +232,8 @@ - <target name="build.cfiles" depends="build.jars"> - <!-- generate the C code from the (64 bit) SWT PI java classes --> - <!-- assumes the swt.jar has already been built --> -+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="build.jars" /> -+ <!-- assumes the swttools.jar has already been built --> - <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.C"/><arg value="${basedir}/src/Eclipse SWT PI/common/library/"/><arg value="${build.result.folder}/swt.jar"/></java> - <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.gtk.OS"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java> - <java classname="org.eclipse.swt.tools.internal.JNIGeneratorApp" classpath="${toolsplugindir}/bin:${toolsplugindir}/swttools.jar:${basedir}/swt.jar"><arg value="org.eclipse.swt.internal.accessibility.gtk.ATK"/><arg value="${basedir}/src/Eclipse SWT PI/gtk/library/"/><arg value="${build.result.folder}/swt.jar"/></java> -@@ -345,6 +347,8 @@ - <delete file="${plugin.destination}/${full.name}.jar"/> - <delete file="${plugin.destination}/${full.name}.zip"/> - <delete dir="${temp.folder}"/> -+ <!-- delete swttools.jar so that it will be compiled in the build.jars target --> -+ <ant antfile="build.xml" dir="${toolsplugindir}" inheritAll="false" target="clean" /> - </target> - - <target name="refresh" depends="init" if="eclipse.running"> diff --git a/java/eclipse/files/patch-plugins-swt-tools-build.xml b/java/eclipse/files/patch-plugins-swt-tools-build.xml deleted file mode 100644 index b491024bcc7a..000000000000 --- a/java/eclipse/files/patch-plugins-swt-tools-build.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.swt.tools/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.swt.tools/build.xml 2007-11-19 15:08:07.000000000 +0900 -@@ -70,6 +70,8 @@ - <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.s390x/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> -+ <pathelement path="../org.eclipse.swt.gtk.freebsd.amd64/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.solaris.sparc/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.solaris.x86/@dot"/> - <pathelement path="../org.eclipse.swt.gtk.linux.ppc/@dot"/> diff --git a/java/eclipse/files/patch-plugins-team-core-build.xml b/java/eclipse/files/patch-plugins-team-core-build.xml deleted file mode 100644 index 1208921e539a..000000000000 --- a/java/eclipse/files/patch-plugins-team-core-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.team.core/build.xml.orig 2007-10-24 06:31:14.000000000 +0900 -+++ plugins/org.eclipse.team.core/build.xml 2007-11-19 15:10:19.000000000 +0900 -@@ -147,6 +147,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-team-cvs-core-build.xml b/java/eclipse/files/patch-plugins-team-cvs-core-build.xml deleted file mode 100644 index 8697c395740a..000000000000 --- a/java/eclipse/files/patch-plugins-team-cvs-core-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.team.cvs.core/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.team.cvs.core/build.xml 2007-11-19 15:12:15.000000000 +0900 -@@ -148,6 +148,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-team-cvs-ssh-build.xml b/java/eclipse/files/patch-plugins-team-cvs-ssh-build.xml deleted file mode 100644 index fef8a86d3259..000000000000 --- a/java/eclipse/files/patch-plugins-team-cvs-ssh-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- plugins/org.eclipse.team.cvs.ssh/build.xml.orig 2007-10-24 06:31:14.000000000 +0900 -+++ plugins/org.eclipse.team.cvs.ssh/build.xml 2007-11-19 15:13:49.000000000 +0900 -@@ -147,6 +147,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> diff --git a/java/eclipse/files/patch-plugins-ui-browser-plugin.xml b/java/eclipse/files/patch-plugins-ui-browser-plugin.xml deleted file mode 100644 index d8db8ba04807..000000000000 --- a/java/eclipse/files/patch-plugins-ui-browser-plugin.xml +++ /dev/null @@ -1,45 +0,0 @@ ---- plugins/org.eclipse.ui.browser/plugin.xml.orig 2007-10-24 06:48:42.000000000 +0900 -+++ plugins/org.eclipse.ui.browser/plugin.xml 2007-11-19 15:30:34.000000000 +0900 -@@ -74,11 +74,12 @@ - <browser - id="org.eclipse.ui.browser.mozilla" - name="%browserMozilla" -- os="linux,aix,hpux,solaris" -+ os="freebsd,linux,aix,hpux,solaris" - executable="mozilla" - factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory"> - <location>usr/bin/mozilla</location> - <location>usr/X11/bin/mozilla</location> -+ <location>usr/local/bin/mozilla</location> - </browser> - <browser - id="org.eclipse.ui.browser.netscape" -@@ -93,23 +94,25 @@ - <browser - id="org.eclipse.ui.browser.firefox" - name="%browserFirefox" -- os="linux,aix,hpux,solaris" -+ os="freebsd,linux,aix,hpux,solaris" - executable="firefox" - factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory"> - </browser> - <browser - id="org.eclipse.ui.browser.konqueror" - name="%browserKonqueror" -- os="linux,aix,hpux,solaris" -+ os="freebsd,linux,aix,hpux,solaris" - executable="konqueror"> - <location>opt/kde3/bin/konqueror</location> -+ <location>/usr/local/bin/konqueror</location> - </browser> - <browser - id="org.eclipse.ui.browser.galeon" - name="%browserGaleon" -- os="linux,aix,hpux,solaris" -+ os="freebsd,linux,aix,hpux,solaris" - executable="galeon"> - <location>opt/usr/gnome/bin/galeon</location> -+ <location>/usr/local/bin/galeon</location> - </browser> - - <!-- Windows --> diff --git a/java/eclipse/files/patch-plugins-ui-intro-universal-plugin.xml b/java/eclipse/files/patch-plugins-ui-intro-universal-plugin.xml deleted file mode 100644 index f4619e7aff75..000000000000 --- a/java/eclipse/files/patch-plugins-ui-intro-universal-plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.ui.intro.universal/plugin.xml.orig 2007-06-26 04:57:27.000000000 +0900 -+++ plugins/org.eclipse.ui.intro.universal/plugin.xml 2007-09-06 11:28:55.000000000 +0900 -@@ -35,7 +35,7 @@ - <implementation - style="$theme$/html/shared.css,themes/shared/html/shared.css" - kind="html" -- os="win32,linux,macosx"> -+ os="win32,freebsd,linux,macosx"> - </implementation> - <implementation - kind="swt"> diff --git a/java/eclipse/files/patch-plugins-ui-win32-build.xml b/java/eclipse/files/patch-plugins-ui-win32-build.xml deleted file mode 100644 index 9a1793e9fbfd..000000000000 --- a/java/eclipse/files/patch-plugins-ui-win32-build.xml +++ /dev/null @@ -1,22 +0,0 @@ ---- plugins/org.eclipse.ui.win32/build.xml.orig 2007-10-24 06:31:15.000000000 +0900 -+++ plugins/org.eclipse.ui.win32/build.xml 2007-11-19 16:15:45.000000000 +0900 -@@ -150,6 +150,10 @@ - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.hpux.PA_RISC_1.0.0.v20060603/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.ppc/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.ppc_1.0.100.v20070430/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.x86/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.x86_1.1.0.v20070416/@dot"/> -+ <pathelement path="../org.eclipse.core.filesystem.freebsd.amd64/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.freebsd.amd64_1.1.0.v20070510/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416/@dot"/> - <pathelement path="../org.eclipse.core.filesystem.linux.x86_64/@dot"/> -@@ -196,6 +200,8 @@ - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/bin/"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core_3.2.101.R33x_v20070911/@dot"/> -+ <pathelement path="../org.eclipse.update.core.freebsd/@dot"/> -+ <pathelement path="${build.result.folder}/../org.eclipse.update.core.freebsd_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.linux/@dot"/> - <pathelement path="${build.result.folder}/../org.eclipse.update.core.linux_3.2.0.v20070615/@dot"/> - <pathelement path="../org.eclipse.update.core.win32/@dot"/> diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-DirectoryDialog.java b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-DirectoryDialog.java new file mode 100644 index 000000000000..ef7629cf6cfc --- /dev/null +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-DirectoryDialog.java @@ -0,0 +1,20 @@ +--- gtk/org/eclipse/swt/widgets/DirectoryDialog.java.orig 2008-08-05 22:10:38.000000000 -0400 ++++ gtk/org/eclipse/swt/widgets/DirectoryDialog.java 2008-08-05 22:11:13.000000000 -0400 +@@ -145,15 +145,15 @@ + } + stringBuffer.append (filterPath); + byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true); ++ byte [] bufspc = new byte[1024]; + /* + * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6 + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ int /*long*/ ptr = OS.realpath (buffer, bufspc); + if (ptr != 0) { + OS.gtk_file_chooser_set_current_folder (handle, ptr); +- OS.g_free (ptr); + } + } + if (message.length () > 0) { diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java new file mode 100644 index 000000000000..fb23bb2968ce --- /dev/null +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java @@ -0,0 +1,51 @@ +--- gtk/org/eclipse/swt/widgets/FileDialog.java.orig 2008-08-03 13:33:18.285923896 -0400 ++++ gtk/org/eclipse/swt/widgets/FileDialog.java 2008-08-03 13:36:14.527006003 -0400 +@@ -474,42 +474,42 @@ + } + stringBuffer.append (fileName); + byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true); ++ byte [] bufspc = new byte[1024]; + /* + * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6 + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ int /*long*/ ptr = OS.realpath (buffer, bufspc); + if (ptr != 0) { + OS.gtk_file_chooser_set_filename (handle, ptr); +- OS.g_free (ptr); + } + } else { + byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true); ++ byte [] bufspc = new byte[1024]; + /* + * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6 + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ int /*long*/ ptr = OS.realpath (buffer, bufspc); + if (ptr != 0) { + OS.gtk_file_chooser_set_current_folder (handle, ptr); +- OS.g_free (ptr); + } + } + } else { + if (fileName.length () > 0) { + if (fileName.charAt (0) == SEPARATOR) { + byte [] buffer = Converter.wcsToMbcs (null, fileName, true); ++ byte [] bufspc = new byte[1024]; + /* + * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6 + * when setting a file name that is not a true canonical path. + * The fix is to use the canonical path. + */ +- int /*long*/ ptr = OS.realpath (buffer, null); ++ int /*long*/ ptr = OS.realpath (buffer, bufspc); + if (ptr != 0) { + OS.gtk_file_chooser_set_filename (handle, ptr); +- OS.g_free (ptr); + } + } + } diff --git a/java/eclipse/files/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_Mozilla-gtk-org-eclipse-swt-browser-MozillaDelegate.java index 86aeebc3b326..56d4b133a2b2 100644 --- a/java/eclipse/files/post-patch-plugins-swt-mozilla-gtk-swt-browser-MozillaDelegate.java +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_Mozilla-gtk-org-eclipse-swt-browser-MozillaDelegate.java @@ -1,6 +1,6 @@ ---- plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java.orig 2007-06-26 04:57:02.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java 2007-09-12 13:17:45.000000000 +0900 -@@ -26,14 +26,17 @@ +--- gtk/org/eclipse/swt/browser/MozillaDelegate.java.orig 2008-08-02 21:58:22.782311909 -0400 ++++ gtk/org/eclipse/swt/browser/MozillaDelegate.java 2008-08-02 22:00:13.312988015 -0400 +@@ -26,14 +26,16 @@ static final int STOP_PROPOGATE = 1; static boolean IsLinux; @@ -9,7 +9,6 @@ String osName = System.getProperty ("os.name").toLowerCase (); //$NON-NLS-1$ IsLinux = osName.startsWith ("linux"); //$NON-NLS-1$ + IsFreeBSD = osName.startsWith ("freebsd"); //$NON-NLS-1$ -+ } MozillaDelegate (Browser browser) { diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh new file mode 100644 index 000000000000..88b57e05c52a --- /dev/null +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh @@ -0,0 +1,109 @@ +--- gtk/library/build.sh.orig 2008-09-11 21:18:02.725614374 -0400 ++++ gtk/library/build.sh 2008-09-11 21:18:07.455632295 -0400 +@@ -50,6 +50,10 @@ + fi + fi + case $MODEL in ++ "amd64") ++ SWT_ARCH=x86_64 ++ AWT_ARCH=amd64 ++ ;; + "x86_64") + SWT_ARCH=x86_64 + AWT_ARCH=amd64 +@@ -65,7 +69,7 @@ + esac + + # For 64-bit CPUs, we have a switch +-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then ++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'amd64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then + SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 + export SWT_PTR_CFLAGS + if [ -d /lib64 ]; then +@@ -74,47 +78,44 @@ + fi + fi + +-if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then +- echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" +- MAKE_GNOME=make_gnome +-else +- echo "libgnome-2.0 and libgnomeui-2.0 not found:" +- echo " *** SWT Program support for GNOME will not be compiled." +-fi +- +-if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then +- echo "Cairo found, compiling SWT support for the cairo graphics library." +- MAKE_CAIRO=make_cairo +-else +- echo "Cairo not found:" +- echo " *** Advanced graphics support using cairo will not be compiled." ++if [ x${MAKE_GNOME} = "xmake_gnome" ]; then ++ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then ++ echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" ++ _MAKE_GNOME=make_gnome ++ else ++ echo "libgnome-2.0 and libgnomeui-2.0 not found:" ++ echo " *** SWT Program support for GNOME will not be compiled." ++ fi + fi + +-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then +- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` +- MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom` +- MOZILLA_LIBS=`pkg-config --libs firefox-xpcom` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla +- elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then +- MOZILLA_INCLUDES=`pkg-config --cflags libxul` +- MOZILLA_LIBS=`pkg-config --libs libxul` +- export MOZILLA_INCLUDES +- export MOZILLA_LIBS +- MAKE_MOZILLA=make_mozilla ++if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then ++ if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then ++ echo "Cairo found, compiling SWT support for the cairo graphics library." ++ _MAKE_CAIRO=make_cairo + else +- echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" +- echo " *** Mozilla embedding support will not be compiled." ++ echo "Cairo not found:" ++ echo " *** Advanced graphics support using cairo will not be compiled." + fi + fi + ++if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then ++ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then ++ case ${BROWSER} in ++ "firefox" | "mozilla" | "seamonkey" | "xulrunner") ++ MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}-xpcom` ++ MOZILLA_LIBS=`pkg-config --libs ${BROWSER}-xpcom` ++ export MOZILLA_INCLUDES ++ export MOZILLA_LIBS ++ _MAKE_MOZILLA=make_mozilla ++ ;; ++ *) ++ echo "None of the following libraries were found: Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM" ++ echo " *** Mozilla embedding support will not be compiled." ++ ;; ++ esac ++ fi ++fi ++ + # Find AWT if available + if [ -z "${AWT_LIB_PATH}" ]; then + if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then +@@ -142,5 +143,5 @@ + if [ "x${1}" = "xclean" ]; then + make -f $MAKEFILE clean + else +- make -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ++ make -f $MAKEFILE all $_MAKE_GNOME $_MAKE_CAIRO $MAKE_AWT $_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} + fi diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.xml b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.xml new file mode 100644 index 000000000000..281cae7600de --- /dev/null +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-build.xml @@ -0,0 +1,18 @@ +--- gtk/library/build.xml.orig 2008-08-02 16:07:35.000000000 -0400 ++++ gtk/library/build.xml 2008-08-02 16:08:12.000000000 -0400 +@@ -14,7 +14,7 @@ + <arg line="${basedir}/bin/library/build.sh"/> + <arg line="install"/> + </exec> +- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" /> ++ <eclipse.refreshLocal resource="org.eclipse.swt.${installWs}.${installOs}.${installArch}" depth="infinite" /> + </target> + + <!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)--> +@@ -52,4 +52,4 @@ + </exec> + </target> + +-</project> +\ No newline at end of file ++</project> diff --git a/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-make_freebsd.mak new file mode 100644 index 000000000000..beb3ec2b5dab --- /dev/null +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-library-make_freebsd.mak @@ -0,0 +1,72 @@ +--- gtk/library/make_freebsd.mak.orig 2008-08-02 21:59:10.233269779 -0400 ++++ gtk/library/make_freebsd.mak 2008-08-02 21:59:50.313515173 -0400 +@@ -46,7 +46,7 @@ + + # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) + GTKCFLAGS = `pkg-config --cflags gtk+-2.0` +-GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst ++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib -lXtst + + CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc + +@@ -59,7 +59,7 @@ + GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 + + GLXCFLAGS = +-GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm ++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm + + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS +@@ -74,11 +74,11 @@ + -Wno-non-virtual-dtor \ + -fPIC \ + -I. \ ++ -I$(LOCALBASE)/include \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/freebsd \ + ${SWT_PTR_CFLAGS} + MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic +-MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup + + SWT_OBJECTS = swt.o c.o c_stats.o callback.o + CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o +@@ -95,20 +95,21 @@ + CFLAGS = -O -Wall \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ +- -DLINUX -DGTK \ ++ -DFREEBSD -DGTK \ ++ -I$(LOCALBASE)/include \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/freebsd \ + -fPIC \ + ${SWT_PTR_CFLAGS} + LIBS = -shared -fPIC + +-ifndef NO_STRIP +- AWT_LIBS := $(AWT_LIBS) -s +- MOZILLALIBS := $(MOZILLALIBS) -s +- LIBS := $(LIBS) -s +-endif ++.ifndef NO_STRIP ++AWT_LIBS := $(AWT_LIBS) -s ++MOZILLALIBS := $(MOZILLALIBS) -s ++LIBS := $(LIBS) -s ++.endif + +-all: make_swt make_atk make_gnome make_glx ++all: make_swt make_atk $(MAKE_GNOME) make_glx $(MAKE_MOZILLA) $(MAKE_CAIRO) $(MAKE_AWT) + + # + # SWT libs +@@ -167,6 +168,9 @@ + $(AWT_LIB): $(AWT_OBJECTS) + $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) + ++swt_awt.o: swt_awt.c ++ $(CC) $(CFLAGS) -c swt_awt.c ++ + # + # Atk lib + # diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-org-eclipse-swt-internal-gtk-OS.java index da7fe1620e47..16ea80bfccb8 100644 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-swt-internal-gtk-OS.java +++ b/java/eclipse/files/post-patch-plugins-org.eclipse.swt-Eclipse_SWT_PI-gtk-org-eclipse-swt-internal-gtk-OS.java @@ -1,26 +1,25 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java.orig 2007-06-26 04:57:20.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2007-09-12 13:29:42.000000000 +0900 -@@ -23,18 +23,20 @@ +--- gtk/org/eclipse/swt/internal/gtk/OS.java.orig 2008-08-02 22:08:05.630890150 -0400 ++++ gtk/org/eclipse/swt/internal/gtk/OS.java 2008-08-02 22:10:32.931793757 -0400 +@@ -23,18 +23,19 @@ } /** OS Constants */ - public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX; -+ public static final boolean IsFreeBSD, IsAIX, IsSunOS, IsLinux, IsHPUX; ++ public static final boolean IsAIX, IsSunOS, IsLinux, IsFreeBSD, IsHPUX; static { /* Initialize the OS flags and locale constants */ String osName = System.getProperty ("os.name"); - boolean isAIX = false, isSunOS = false, isLinux = false, isHPUX = false; -+ boolean isFreeBSD = false, isAIX = false, isSunOS = false, isLinux = false, isHPUX = false ; -+ if (osName.equals ("FreeBSD")) isFreeBSD = true; ++ boolean isAIX = false, isSunOS = false, isLinux = false, isFreeBSD = false, isHPUX = false; if (osName.equals ("Linux")) isLinux = true; ++ if (osName.equals ("FreeBSD")) isFreeBSD = true; if (osName.equals ("AIX")) isAIX = true; if (osName.equals ("Solaris")) isSunOS = true; if (osName.equals ("SunOS")) isSunOS = true; if (osName.equals ("HP-UX")) isHPUX = true; - IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; -+ IsFreeBSD = isFreeBSD; IsAIX = isAIX; IsSunOS = isSunOS; -+ IsLinux = isLinux; IsHPUX = isHPUX; ++ IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsFreeBSD = isFreeBSD; IsHPUX = isHPUX; } /** Constants */ diff --git a/java/eclipse/files/post-patch-plugins-swt-PI-gtk-library-build.xml b/java/eclipse/files/post-patch-plugins-swt-PI-gtk-library-build.xml deleted file mode 100644 index 1f90a394f1cd..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-PI-gtk-library-build.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml.orig 2007-06-26 04:57:11.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml 2007-09-05 23:53:21.000000000 +0900 -@@ -14,7 +14,7 @@ - <arg line="${basedir}/bin/library/build.sh"/> - <arg line="install"/> - </exec> -- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" /> -+ <eclipse.refreshLocal resource="org.eclipse.swt.gtk.freebsd.x86" depth="infinite" /> - </target> - - <!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)--> diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh b/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh deleted file mode 100644 index 363430308afc..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-build.sh +++ /dev/null @@ -1,92 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2007-06-26 04:57:13.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2007-10-07 14:10:27.000000000 +0900 -@@ -10,6 +10,9 @@ - # IBM Corporation - initial API and implementation - # Kevin Cornell (Rational Software Corporation) - # Tom Tromey (Red Hat, Inc.) -+# -+# This is Eclipse SWT PI/gtk/library/build.xml -+# - #******************************************************************************* - - cd `dirname $0` -@@ -26,6 +29,7 @@ - if [ "${OS}" = "" ]; then - OS=`uname -s` - fi -+ - case $OS in - "SunOS") - SWT_OS=solaris -@@ -50,6 +54,10 @@ - fi - fi - case $MODEL in -+ "amd64") -+ SWT_ARCH=x86_64 -+ AWT_ARCH=amd64 -+ ;; - "x86_64") - SWT_ARCH=x86_64 - AWT_ARCH=amd64 -@@ -65,32 +73,37 @@ - esac - - # For 64-bit CPUs, we have a switch --if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then -+if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'amd64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 's390x' ]; then - SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 - export SWT_PTR_CFLAGS - if [ -d /lib64 ]; then -- XLIB64=-L/usr/X11R6/lib64 -+ XLIB64=-L/usr/local/lib64 - export XLIB64 - fi - fi - --if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then -- echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" -- MAKE_GNOME=make_gnome --else -- echo "libgnome-2.0 and libgnomeui-2.0 not found:" -- echo " *** SWT Program support for GNOME will not be compiled." -+if [ x${MAKE_GNOME} = "xmake_gnome" ]; then -+ if [ x`pkg-config --exists gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0 && echo YES` = "xYES" ]; then -+ echo "libgnomeui-2.0 found, compiling SWT program support using GNOME" -+ MAKE_GNOME=make_gnome -+ else -+ echo "libgnome-2.0 and libgnomeui-2.0 not found:" -+ echo " *** SWT Program support for GNOME will not be compiled." -+ fi - fi - --if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then -- echo "Cairo found, compiling SWT support for the cairo graphics library." -- MAKE_CAIRO=make_cairo --else -- echo "Cairo not found:" -- echo " *** Advanced graphics support using cairo will not be compiled." -+if [ x${MAKE_CAIRO} = "xmake_cairo" ]; then -+ if [ x`pkg-config --exists cairo && echo YES` = "xYES" ]; then -+ echo "Cairo found, compiling SWT support for the cairo graphics library." -+ MAKE_CAIRO=make_cairo -+ else -+ echo "Cairo not found:" -+ echo " *** Advanced graphics support using cairo will not be compiled." -+ fi - fi - --if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then -+if [ x${MAKE_MOZILLA} = "xmake_mozilla" ]; then -+ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then - MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom` - MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom` -@@ -107,6 +120,7 @@ - echo "Mozilla/XPCOM or Firefox/XPCOM libraries not found:" - echo " *** Mozilla embedding support will not be compiled." - fi -+ fi - fi - - # Find AWT if available diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-build.xml b/java/eclipse/files/post-patch-plugins-swt-gtk-build.xml deleted file mode 100644 index 0c30699caf3d..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-build.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml.orig 2007-06-26 04:57:11.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.xml 2007-08-23 22:58:43.000000000 +0900 -@@ -14,7 +14,7 @@ - <arg line="${basedir}/bin/library/build.sh"/> - <arg line="install"/> - </exec> -- <eclipse.refreshLocal resource="org.eclipse.swt.gtk.linux.x86" depth="infinite" /> -+ <eclipse.refreshLocal resource="org.eclipse.swt.gtk.freebsd.x86" depth="infinite" /> - </target> - - <!-- Build swt.so for PowerPC 32 bit GTK (no Mozilla)--> diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-library-os.c b/java/eclipse/files/post-patch-plugins-swt-gtk-library-os.c deleted file mode 100644 index a9841275e672..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-library-os.c +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c.orig 2007-06-26 04:57:29.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c 2007-09-16 16:44:43.000000000 +0900 -@@ -17397,11 +17397,16 @@ - jint rc = 0; - OS_NATIVE_ENTER(env, that, realpath_FUNC); - if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; -- if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ if (arg1) { -+ if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; -+ } else -+ lparg1 = malloc(PATH_MAX); - rc = (jint)realpath((const char *)lparg0, (char *)lparg1); - fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); -+ if (!arg1 && lparg1 && rc == 0) -+ free(lparg1); - OS_NATIVE_EXIT(env, that, realpath_FUNC); - return rc; - } diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak deleted file mode 100644 index d57dcd73014e..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak +++ /dev/null @@ -1,100 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig 2007-10-08 00:19:29.000000000 +0900 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak 2007-10-08 00:36:34.000000000 +0900 -@@ -46,7 +46,7 @@ - - # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) - GTKCFLAGS = `pkg-config --cflags gtk+-2.0` --GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst -+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst - - CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc - -@@ -59,10 +59,10 @@ - GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - - GLXCFLAGS = --GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm - - # Uncomment for Native Stats tool --#NATIVE_STATS = -DNATIVE_STATS -+NATIVE_STATS = -DNATIVE_STATS - - MOZILLACFLAGS = -O \ - -DSWT_VERSION=$(SWT_VERSION) \ -@@ -74,11 +74,15 @@ - -Wno-non-virtual-dtor \ - -fPIC \ - -I. \ -+ -I$(LOCALBASE)/include \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ -+ -I$(LOCALBASE)/include/xulrunner \ -+ -I$(LOCALBASE)/include/xulrunner/profdirserviceprovider \ -+ -I$(LOCALBASE)/include/xulrunner/string \ -+ -I$(LOCALBASE)/include/nspr \ - ${SWT_PTR_CFLAGS} - MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic --MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup - - SWT_OBJECTS = swt.o c.o c_stats.o callback.o - CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o -@@ -88,27 +92,28 @@ - ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o - GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o - MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o --XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o -+XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - - CFLAGS = -O -Wall \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ -- -DLINUX -DGTK \ -+ -DFREEBSD -DGTK \ -+ -I$(LOCALBASE)/include \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/freebsd \ - -fPIC \ - ${SWT_PTR_CFLAGS} - LIBS = -shared -fPIC - --ifndef NO_STRIP -- AWT_LIBS := $(AWT_LIBS) -s -- MOZILLALIBS := $(MOZILLALIBS) -s -- LIBS := $(LIBS) -s --endif -+.ifndef NO_STRIP -+AWT_LIBS := $(AWT_LIBS) -s -+MOZILLALIBS := $(MOZILLALIBS) -s -+LIBS := $(LIBS) -s -+.endif - --all: make_swt make_atk make_gnome make_glx -+all: make_swt make_atk $(MAKE_GNOME) make_glx $(MAKE_MOZILLA) $(MAKE_CAIRO) - - # - # SWT libs -@@ -210,7 +215,7 @@ - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp -- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp -+ $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp - - xpcom_structs.o: xpcom_structs.cpp - $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp -@@ -241,6 +246,12 @@ - xpcomxul_stats.o: xpcom_stats.cpp - $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp - -+xpcomxulglue.o: xpcomglue.cpp -+ $(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp -+ -+xpcomxulglue_stats.o: xpcomglue_stats.cpp -+ $(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp -+ - # - # XPCOMInit lib - # diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-swt-FileDialog.java b/java/eclipse/files/post-patch-plugins-swt-gtk-swt-FileDialog.java deleted file mode 100644 index 631f647124ef..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-swt-FileDialog.java +++ /dev/null @@ -1,36 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java.orig 2007-09-21 18:58:07.000000000 +0200 -+++ plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/FileDialog.java 2008-02-05 20:49:58.000000000 +0100 -@@ -378,29 +378,29 @@ - stringBuffer.append ('.'); - } - byte [] buffer = Converter.wcsToMbcs (null, stringBuffer.toString (), true); -+ byte [] bufspc = new byte[1024]; - /* - * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6 - * when setting a file name that is not a true canonical path. - * The fix is to use the canonical path. - */ -- int /*long*/ ptr = OS.realpath (buffer, null); -+ int /*long*/ ptr = OS.realpath (buffer, bufspc); - if (ptr != 0) { - OS.gtk_file_chooser_set_filename (handle, ptr); -- OS.g_free (ptr); - } - } else { - if (fileName.length () > 0) { - if (fileName.charAt (0) == SEPARATOR) { - byte [] buffer = Converter.wcsToMbcs (null, fileName, true); -+ byte [] bufspc = new byte[1024]; - /* - * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6 - * when setting a file name that is not a true canonical path. - * The fix is to use the canonical path. - */ -- int /*long*/ ptr = OS.realpath (buffer, null); -+ int /*long*/ ptr = OS.realpath (buffer, bufspc); - if (ptr != 0) { - OS.gtk_file_chooser_set_filename (handle, ptr); -- OS.g_free (ptr); - } - } - } diff --git a/java/eclipse/pkg-message b/java/eclipse/pkg-message new file mode 100644 index 000000000000..42fd5b316713 --- /dev/null +++ b/java/eclipse/pkg-message @@ -0,0 +1,3 @@ +If eclipse is reinstalled, you must run the 'setup-user' make +target as each user that is using eclipse. Failure to do so will result +in plugins installed by the users not being available at run-time. diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch index 8b43019dc5e7..33f4afa73bec 100644 --- a/java/eclipse/scripts/pre-patch +++ b/java/eclipse/scripts/pre-patch @@ -5,7 +5,7 @@ copy_file() { srcfile="$1" dstfile="$2" - + case $distfile in *.zip) #We may not want to push all files through sed echo "zip file" @@ -32,8 +32,8 @@ copy_dir() find "$dstdir" -name \*.so.\* -delete find "$dstdir" -type f -print0 | \ xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' - find "$dstdir" -name \*.bak -delete - fi + find "$dstdir" -name \*.bak -delete + fi } prepare_files() @@ -74,35 +74,31 @@ features/org.eclipse.equinox.executable/bin/gtk/linux features/org.eclipse.equinox.executable/bin/gtk/linux/x86 features/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 features/org.eclipse.equinox.executable/library/gtk/make_linux.mak +plugins/org.eclipse.core.filesystem/natives/unix/linux plugins/org.eclipse.core.filesystem.linux.x86 plugins/org.eclipse.core.filesystem.linux.x86_64 plugins/org.eclipse.core.filesystem.linux.x86/os/linux plugins/org.eclipse.core.filesystem.linux.x86_64/os/linux -plugins/org.eclipse.core.filesystem/natives/unix/linux -plugins/org.eclipse.jdt.source.linux.gtk.x86 -plugins/org.eclipse.jdt.source.linux.gtk.x86_64 -plugins/org.eclipse.pde.source.linux.gtk.x86 -plugins/org.eclipse.pde.source.linux.gtk.x86_64 -plugins/org.eclipse.platform.source.linux.gtk.x86 -plugins/org.eclipse.platform.source.linux.gtk.x86_64 -plugins/org.eclipse.rcp.source.linux.gtk.x86 -plugins/org.eclipse.rcp.source.linux.gtk.x86_64 -plugins/org.eclipse.swt.gtk.linux.x86 -plugins/org.eclipse.swt.gtk.linux.x86_64 -plugins/org.eclipse.update.core.linux -plugins/org.eclipse.update.core.linux/os/linux -plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86 -plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64 -plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties -plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties +plugins/org.eclipse.core.net.linux.x86 +plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 plugins/org.eclipse.equinox.launcher.gtk.linux.x86 +plugins/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64 plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties -plugins/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties -plugins/org.eclipse.cvs.source.linux.gtk.x86 -plugins/org.eclipse.cvs.source.linux.gtk.x86_64 +plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86 +plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86/launcher.gtk.linux.x86.properties +plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64 +plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.linux.x86_64/launcher.gtk.linux.x86_64.properties plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux.properties plugins/org.eclipse.jface/src/org/eclipse/jface/resource/jfacefonts_linux_gtk.properties +plugins/org.eclipse.swt.gtk.linux.x86 +plugins/org.eclipse.swt.gtk.linux.x86 +plugins/org.eclipse.swt.gtk.linux.x86.source +plugins/org.eclipse.swt.gtk.linux.x86_64 +plugins/org.eclipse.swt.gtk.linux.x86_64.source +plugins/org.eclipse.update.core.linux +plugins/org.eclipse.update.core.linux/os/linux +plugins/org.eclipse.update.core.linux.source " SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" |