diff options
Diffstat (limited to 'java')
70 files changed, 971 insertions, 507 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 2e4eb88de13f..90b35804b516 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -6,52 +6,38 @@ # PORTNAME= eclipse -PORTVERSION= 3.4.1 +PORTVERSION= ${ECLIPSE_RELEASE:C/(.*)\.[A-Z][0-9]{8}-[0-9]{4}/\1/} CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200809111700 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-${ECLIPSE_TIMESTAMP} DISTNAME= eclipse-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse -MAINTAINER= freebsd-eclipse@FreeBSD.org +MAINTAINER= sepotvin@FreeBSD.org COMMENT= An open extensible IDE for anything and nothing in particular BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch - -ECLIPSE= ${PORTNAME} ONLY_FOR_ARCHS= i386 amd64 USE_GMAKE= yes USE_ZIP= yes USE_GL= glu - -PATCH= ${LOCALBASE}/bin/gpatch - -.if !defined(WITHOUT_MOZILLA) -USE_GECKO= firefox xulrunner seamonkey -.endif - USE_JAVA= yes JAVA_VERSION= 1.6 JAVA_OS= native -NO_WRKSUBDIR= yes - -PORTDESTDIR= ${PREFIX}/${ECLIPSE} - -ECLIPSE_OS= freebsd - -ECLIPSE_WS= gtk +.if !defined(WITHOUT_MOZILLA) +USE_GECKO= libxul firefox xulrunner seamonkey +.endif +USE_GNOME= gtk20 pkgconfig desktopfileutils gconf2 .if defined(WITHOUT_GNOMEVFS) MAKE_GNOME= -USE_GNOME= gtk20 pkgconfig desktopfileutils .else MAKE_GNOME= make_gnome -USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils +USE_GNOME+= gnomevfs2 libgnome libgnomeui .endif .if defined(WITHOUT_CAIRO) @@ -61,12 +47,28 @@ LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo MAKE_CAIRO= make_cairo .endif +PORTDESTDIR= ${PREFIX}/${PORTNAME} +NO_WRKSUBDIR= yes + +ECLIPSE_RELEASE=3.4.2.M20090211-1700 +ECLIPSE_VERSION=${ECLIPSE_RELEASE}-${PORTREVISION} +ECLIPSE_BUILDID=${ECLIPSE_VERSION:C/.*\.([MIS][0-9]{8}-[0-9]{4}-[0-9]+)/\1/} +ECLIPSE_BUILDTYPE=${ECLIPSE_BUILDID:C/(.).*/\1/} +ECLIPSE_TIMESTAMP=${ECLIPSE_BUILDID:C/.([0-9]{8})-([0-9]{4})-[0-9]+/\1\2/} +ECLIPSE_PDE_BUILD_VERSION=3.4.1.R34x_v20081217 +ECLIPSE_LAUNCHER_VERSION=1.0.101.R34x_v20081125 + .include <bsd.port.pre.mk> .if ${OSVERSION} >= 800000 JAVA_VENDOR= bsdjava .endif +.if ${OSVERSION} < 800086 +PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch +PATCH= ${LOCALBASE}/bin/gpatch +.endif + .if !defined(WITHOUT_MOZILLA) MAKE_MOZILLA= make_mozilla BROWSER= ${GECKO} @@ -75,13 +77,16 @@ BROWSER= MAKE_MOZILLA= .endif +ECLIPSE_OS= freebsd +ECLIPSE_WS= gtk .if (${ARCH} == "amd64") -ECLIPSE_ARCH= amd64 +ECLIPSE_ARCH= x86_64 ECLIPSE_SWT= gtk64 .else ECLIPSE_ARCH= x86 ECLIPSE_SWT= gtk .endif +ECLIPSE_ARCH_ALL= x86 x86_64 MAKE_ENV+= BROWSER=${BROWSER} \ ECLIPSE_ARCH=${ECLIPSE_ARCH} \ @@ -93,14 +98,15 @@ MAKE_ENV+= BROWSER=${BROWSER} \ MAKE_CAIRO=${MAKE_CAIRO} \ MACHINE_ARCH=${MACHINE_ARCH} -PLIST_FILES= bin/${ECLIPSE} share/applications/${ECLIPSE}.desktop +PLIST_FILES= bin/${PORTNAME} share/applications/${PORTNAME}.desktop 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} +JAVA_BOOTCLASSES=${JAVA_HOME}/jre/lib/rt.jar;${JAVA_HOME}/jre/lib/jce.jar;${JAVA_HOME}/jre/lib/jsse.jar +ECLIPSE_LAUNCHER=${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_${ECLIPSE_LAUNCHER_VERSION}.jar +ECLIPSE_PDE_BUILD=${WRKSRC}/eclipse/plugins/org.eclipse.pde.build_${ECLIPSE_PDE_BUILD_VERSION} post-patch: @${PATCH} ${PATCH_DIST_ARGS} -d "${SWTBASE}" -i ${FILESDIR}/post-patch-plugins-org.eclipse.swt-Eclipse_SWT-gtk-org-eclipse-swt-widgets-FileDialog.java @@ -110,37 +116,110 @@ post-patch: @${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 + @${MKDIR} ${WRKSRC}/packager + @${CP} ${WRKSRC}/plugins/org.eclipse.pde.build/templates/packager/customTargets.xml ${WRKSRC}/packager/ + @${PATCH} ${PATCH_DIST_ARGS} -d "${WRKSRC}" -i ${FILESDIR}/post-patch-packager-customTargets.xml + @${SED} -e "s+%%JAVA_BOOTCLASSES%%+${JAVA_BOOTCLASSES}+g" ${FILESDIR}/build.properties.in > ${WRKSRC}/build.properties + @${SED} \ + -e "s/%%ECLIPSE_ARCH%%/${ECLIPSE_ARCH}/g" \ + -e "s/%%ECLIPSE_BUILDID%%/${ECLIPSE_BUILDID}/g" \ + -e "s/%%ECLIPSE_BUILDTYPE%%/${ECLIPSE_BUILDTYPE}/g" \ + -e "s/%%ECLIPSE_TIMESTAMP%%/${ECLIPSE_TIMESTAMP}/g" \ + ${FILESDIR}/packager-packager.properties.in > ${WRKSRC}/packager/packager.properties + @${REINPLACE_CMD} -E \ + -e "/buildId/ s/(.*)/\1-${PORTREVISION}/" \ + -e "/buildLabel/ s/(.*)/\1-${PORTREVISION}/" \ + ${WRKSRC}/label.properties + @${SED} \ + -e "s/%%ECLIPSE_ARCH%%/${ECLIPSE_ARCH}/g" \ + -e "s+%%WRKSRC%%+${WRKSRC}+g" \ + ${FILESDIR}/packager-packaging.map.in > ${WRKSRC}/packager/packaging.map + @${SED} \ + -e "s/%%ECLIPSE_VERSION%%/${ECLIPSE_VERSION}/g" \ + ${FILESDIR}/packager-sdk.product.in > ${WRKSRC}/packager/sdk.product + @${CP} ${FILESDIR}/packager-packaging.properties ${WRKSRC}/packager/packaging.properties + @${RM} ${WRKSRC}/plugins/org.eclipse.platform/launchersrc.zip + @(cd ${WRKSRC}/features/org.eclipse.equinox.executable; ${LOCALBASE}/bin/zip -q -9 -r ${WRKSRC}/plugins/org.eclipse.platform/launchersrc.zip library) +# @${REINPLACE_CMD} -e "s/win32\.win32\.x86/${ECLIPSE_WS}.${ECLIPSE_OS}.${ECLIPSE_ARCH}/" ${WRKSRC}/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt +# @${REINPLACE_CMD} -e "s/win32\.win32\.x86/${ECLIPSE_WS}.${ECLIPSE_OS}.${ECLIPSE_ARCH}/" ${WRKSRC}/plugins/org.eclipse.pde.doc.user/pdeOptions.txt +# @${REINPLACE_CMD} \ +# -e "/[. ]ole/I n" \ +# -e "s/win32/${ECLIPSE_WS}/" \ +# ${WRKSRC}/plugins/org.eclipse.platform.doc.isv/platformOptions.txt + @${FIND} ${WRKSRC} -type f -name \*.xml -exec ${REINPLACE_CMD} -E "s/output=\".*(txt|log).*\"//g" "{}" \; + @${FIND} ${WRKSRC} -name \*.so -delete + @${FIND} ${WRKSRC}/features/org.eclipse.equinox.executable -type f -name eclipse -delete + @(cd ${WRKSRC}/features; \ + for f in */build.xml; do \ + for platform in win32 macosx carbon cocoa hpux solaris aix qnx motif linux; do \ + ${REINPLACE_CMD} -E \ + -e "/<ant antfile=\"build\.xml\" dir=.*$${platform}.*target=\"/,/<\/ant>/ d" \ + -e "/idReplacer/ s/org.eclipse\.([a-z0-9A-Z_]+\.)+$${platform}(\.[a-z0-9A-Z_]+)*:0\.0\.0,([0-9]+\.?){3}[a-z0-9A-Z_-]*,//g" \ + $${f}; \ + done; \ + for arch in `echo ${ECLIPSE_ARCH_ALL} | ${SED} -e "s/${ECLIPSE_ARCH}//"`; do \ + ${REINPLACE_CMD} -E \ + -e "/<ant antfile=\"build\.xml\" dir=.*$${arch}\" target=\"/,/<\/ant>/ d" \ + -e "/idReplacer/ s/org.eclipse\.([a-z0-9A-Z_]+\.)+$${arch}:0\.0\.0,([0-9]+\.?){3}[a-z0-9A-Z_-]*,//g" \ + $${f}; \ + done; \ + done; \ + for f in *.source/feature.xml; do \ + for platform in win32 macosx carbon cocoa hpux solaris aix qnx motif linux; do \ + ${REINPLACE_CMD} -E -e "/<plugin id=\"org\.eclipse\..*$${platform}.*\/>/ d" $${f}; \ + done; \ + done; \ + ) + @(cd ${WRKSRC}/plugins; \ + for f in */build.xml; do \ + ${REINPLACE_CMD} -E \ + -e "/<pathelement.*\/>/ s/org\.eclipse\.core\.filesystem\.linux\.${ECLIPSE_ARCH}/org.eclipse.core.filesystem.${ECLIPSE_OS}.${ECLIPSE_ARCH}/" \ + -e "/<pathelement.*\/>/ s/org\.eclipse\.core\.net\.linux\.x86/org.eclipse.core.net.${ECLIPSE_OS}.${ECLIPSE_ARCH}/" \ + -e "/<pathelement.*\/>/ s/org\.eclipse\.equinox\.launcher\.${ECLIPSE_WS}\.linux\.${ECLIPSE_ARCH}/org.eclipse.equinox.launcher.${ECLIPSE_WS}.${ECLIPSE_OS}.${ECLIPSE_ARCH}/" \ + -e "/<pathelement.*\/>/ s/org\.eclipse\.swt\.${ECLIPSE_WS}\.linux\.${ECLIPSE_ARCH}/org.eclipse.swt.${ECLIPSE_WS}.${ECLIPSE_OS}.${ECLIPSE_ARCH}/" \ + -e "/<pathelement.*\/>/ s/org\.eclipse\.update\.core\.linux/org.eclipse.update.core.${ECLIPSE_OS}/" \ + $${f}; \ + for platform in win32 macosx carbon cocoa hpux solaris aix qnx motif linux; do \ + ${REINPLACE_CMD} -E -e "/<pathelement.*$${platform}.*\/>/ d" $${f}; \ + done; \ + done; \ + ) + @${RM} \ + ${WRKSRC}/plugins/org.eclipse.swt/extra_jars/exceptions.jar \ + ${WRKSRC}/plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar \ + ${WRKSRC}/plugins/org.eclipse.osgi/osgi/osgi.core.jar \ + ${WRKSRC}/plugins/org.eclipse.osgi/supplement/osgi/osgi.jar + @${FIND} ${WRKSRC} -name "*.bak" -delete 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 \ + -jar ${ECLIPSE_LAUNCHER} \ -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 + -application org.eclipse.ant.core.antRunner \ + -consoleLog \ + -nosplash \ + -buildfile ${ECLIPSE_PDE_BUILD}/scripts/package.xml \ + -DpackagingInfo=${WRKSRC}/packager \ + -quiet do-install: + @${RM} -rf ${PORTDESTDIR}/configuration @${MKDIR} ${PORTDESTDIR} + @${RM} -rf ${WRKSRC}/eclipse/configuration/.settings @${JAVA} \ - -Declipse.p2.data.area="file:${PORTDESTDIR}/p2" \ - -jar ${WRKSRC}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar \ + -Declipse.p2.data.area=file:${PORTDESTDIR}/p2 \ + -jar ${ECLIPSE_LAUNCHER} \ -data ${WRKSRC}/workspace \ -application org.eclipse.equinox.p2.director.app.application \ + -consoleLog \ + -nosplash \ -flavor tooling \ - -metadataRepository "file:${WRKSRC}/eclipse/metadata" \ - -artifactRepository "file:${WRKSRC}/eclipse/metadata" \ - -installIU "${ECLIPSE_IU}" \ - -version "${ECLIPSE_IU_VERSION}" \ + -metadataRepository file:${WRKSRC}/packager/repo \ + -artifactRepository file:${WRKSRC}/packager/repo \ + -installIU org.eclipse.sdk.ide \ + -version ${ECLIPSE_VERSION} \ -p2.os ${ECLIPSE_OS} \ -p2.ws ${ECLIPSE_WS} \ -p2.arch ${ECLIPSE_ARCH} \ @@ -149,8 +228,8 @@ do-install: -destination "${PORTDESTDIR}" \ -bundlepool "${PORTDESTDIR}" \ -roaming - (cd ${WRKSRC}/eclipse; \ - ${CP} -R about.html epl-v10.html icon.xpm notice.html readme ${PORTDESTDIR}) + @${RM} -rf ${PORTDESTDIR}/p2/org.eclipse.equinox.p2.core/cache + @${RM} -f ${PORTDESTDIR}/p2/org.eclipse.equinox.p2.director/rollback/content.xml @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ -e "s+%%PREFIX%%+${PREFIX}+g" \ @@ -169,23 +248,23 @@ do-install: -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/${PORTNAME} + @${PREFIX}/bin/${PORTNAME} -initialize -consoleLog @${SED} \ -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \ - -e "s+%%ECLIPSE%%+${ECLIPSE}+g" \ + -e "s+%%ECLIPSE%%+${PORTNAME}+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_DATA} ${WRKSRC}/eclipse.desktop.tmp ${PREFIX}/share/applications/${PORTNAME}.desktop @-update-desktop-database - @(cd ${PREFIX}; ${FIND} -s ${ECLIPSE} -not -type d) >> ${TMPPLIST} + @(cd ${PREFIX}; ${FIND} -s ${PORTNAME} -not -type d) >> ${TMPPLIST} @echo '@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true' >> ${TMPPLIST} - @(cd ${PREFIX}; ${FIND} -s -d ${ECLIPSE} -type d) | ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST} + @(cd ${PREFIX}; ${FIND} -s -d ${PORTNAME} -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 {} \; - + @${FIND} ${HOME}/.eclipse -exec ${TOUCH} {} \; + .include <bsd.port.post.mk> diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index c52b329858c0..2022cdcd70ee 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,3 +1,3 @@ -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 +MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.2.zip) = bfbbf287cf57108b5eb6974be188c24f +SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.4.2.zip) = 0c0df3b317a0c5745dfb7d5714ea3754b1f2d23f08c1f59713c812dd0bfa79d7 +SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.4.2.zip) = 105843305 diff --git a/java/eclipse/files/build.properties.in b/java/eclipse/files/build.properties.in new file mode 100644 index 000000000000..c1cb39be9812 --- /dev/null +++ b/java/eclipse/files/build.properties.in @@ -0,0 +1,4 @@ +CDC-1.0/Foundation-1.0=%%JAVA_BOOTCLASSES%% +J2SE-1.4=%%JAVA_BOOTCLASSES%% +J2SE-1.5=%%JAVA_BOOTCLASSES%% +JavaSE-1.6=%%JAVA_BOOTCLASSES%% diff --git a/java/eclipse/files/packager-packager.properties.in b/java/eclipse/files/packager-packager.properties.in new file mode 100644 index 000000000000..b9615b4fa655 --- /dev/null +++ b/java/eclipse/files/packager-packager.properties.in @@ -0,0 +1,96 @@ +############################################################################### +# Copyright (c) 2005, 2006 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### + +repo = ${packagingInfo}/repo +p2.repo.name = FreeBSD Eclipse Repository +product = ${packagingInfo}/sdk.product +generate.p2.metadata=true +p2.metadata.repo = file:${repo} +p2.artifact.repo = file:${repo} +p2.flavor = tooling +p2.publish.artifacts=true +p2.metadata.repo.name=${p2.repo.name} +p2.artifact.repo.name=${p2.repo.name} + +generateVersionsList=true + +################## CONTENT ########################## +# A comma separated list of feature ids that will be part of the archive. +# This list must completely cover the features you want and all their dependencies. +featureList = org.eclipse.sdk + +# A comma seperated list of the components from which the features listed +# in featureList can be found. This is used to optimize the set of zips downloaded. +# The values given here should match those found at the end of the lines in the map file +# Specify * if you don't know +#componentFilter=full,root,root-launcher,root-sdk +componentFilter=* + +# The zip content types to fetch. Like the componentFilter, this filters the set of +# available zips and allows the packager to optimize the set of zips downloaded. +#contentFilter=runtime +contentFilter=sdk + +# The platform configuration (e.g., os, ws, arch) being packaged. *,*,* can be +# specified when the config is completely platform independent. Only one configuration +# can be specified at a time. +config = freebsd,gtk,%%ECLIPSE_ARCH%% + +archivesFormat = freebsd, gtk, %%ECLIPSE_ARCH%%-tar + +################ FOLDERS ############################ +#The directory used as a base for the all process +baseDirectory = ${packagingInfo} + +# The place in which all the scripts will be contained +workingDirectory = ${baseDirectory}/workingPlace +buildDirectory = ${workingDirectory} + +# The folder in which all the zips will be downloaded +downloadDirectory = ${baseDirectory}/toPackage + +# The folder where all the operations are being done +tempDirectory = ${baseDirectory}/temp + +# The place in which the zips are located +sourceFolder = ${downloadDirectory} + +################# SOURCES ########################### +# A comma separated list of the path where features and plugins are located. +# Locations can either be relative or absolute. +# An entry must point to one level above the "features" and "plugins" directory +#featurePaths = eclipse +#baseLocation=${tempDirectory}/${featurePaths} +target = ${tempDirectory}/eclipse + +################## MISC ########################## +# This controls the build id in the default name of the archive +timestamp=%%ECLIPSE_BUILDTIMESTAMP%% +buildType=%%ECLIPSE_BUILDTYPE%% +buildId=%%ECLIPSE_BUILDID%% +buildLabel=%%ECLIPSE_BUILDID%% + +archiveNamePrefix=eclipse + +# extra arguments to be passed to zip / unzip (-y is usually used on unix for zip) / tar +zipargs=-y -q +unzipArgs=-qq + +# the prefix in the archive +archivePrefix=eclipse + +# the folder in which the files that will be added to the archive will be placed +collectingFolder=eclipse + + +############### PACKAGING.PROPERTIES ############################# +# a relative path to the file containing the properties for element to package +packagingProperties = packaging.properties diff --git a/java/eclipse/files/packager-packaging.map.in b/java/eclipse/files/packager-packaging.map.in new file mode 100644 index 000000000000..68fc3e285888 --- /dev/null +++ b/java/eclipse/files/packager-packaging.map.in @@ -0,0 +1 @@ +freebsd-gtk-%%ECLIPSE_ARCH%%-sdk.tar.gz=file:%%WRKSRC%%/result/ | | | sdk | eclipse diff --git a/java/eclipse/files/packager-packaging.properties b/java/eclipse/files/packager-packaging.properties new file mode 100644 index 000000000000..473db1fc75b4 --- /dev/null +++ b/java/eclipse/files/packager-packaging.properties @@ -0,0 +1,41 @@ +############################################################################### +# Copyright (c) 2005, 2006 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +# The chmod and links must indicate a path relative to the root directory. + +# List the files and folders to be copied into the root of eclipse for all platform +# configurations +root=epl-v10.html, notice.html, configuration/, .eclipseproduct, eclipse.ini, readme/, icon.xpm +root.permissions.755=eclipse,*.so* +root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse +root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse +root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse +root.win32.win32.x86=eclipse.exe,eclipsec.exe +root.win32.win32.x86_64=eclipse.exe,eclipsec.exe +root.win32.wpf.x86=eclipse.exe,eclipsec.exe +root.linux.motif.x86=eclipse,libcairo-swt.so,libXm.so.2,about_files/,about.html +root.linux.gtk.x86=eclipse,libcairo-swt.so,about_files/,about.html +root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html +root.linux.gtk.ppc=eclipse +root.hpux.motif.ia64_32=eclipse +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.macosx.carbon.x86=eclipse,Eclipse.app/ +root.macosx.carbon.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.cocoa.ppc=eclipse,Eclipse.app/ +root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.cocoa.x86=eclipse,Eclipse.app/ +root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.macosx.cocoa.x86_64=eclipse,Eclipse.app/ +root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS +root.aix.motif.ppc=eclipse +root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm +root.freebsd.gtk.x86=eclipse,about_files/,about.html +root.freebsd.gtk.x86_64=eclipse,about_files/,about.html diff --git a/java/eclipse/files/packager-sdk.product.in b/java/eclipse/files/packager-sdk.product.in new file mode 100644 index 000000000000..0ee8c288f764 --- /dev/null +++ b/java/eclipse/files/packager-sdk.product.in @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.4"?> + +<product name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="%%ECLIPSE_VERSION%%" useFeatures="true"> + + <configIni use="default"> + </configIni> + + <launcherArgs> + <programArgsMac>-showsplash +org.eclipse.platform</programArgsMac> + <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns +-XstartOnFirstThread +-Xms40m +-Xmx256m +-XX:MaxPermSize=256m +-Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> + </launcherArgs> + + <launcher name="eclipse"> + <solaris/> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + </plugins> + + <features> + <feature id="org.eclipse.sdk" version="0.0.0"/> + <feature id="org.eclipse.equinox.p2.user.ui" version="1.0.0.qualifier"/> + </features> + +</product> diff --git a/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml b/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml index 487675b8d363..658bd848e2d8 100644 --- a/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml +++ b/java/eclipse/files/patch-assemble.org.eclipse.sdk.all.xml @@ -5,7 +5,7 @@ <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="freebsd.gtk.x86_64" 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-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml b/java/eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml new file mode 100644 index 000000000000..448df1ce0bc4 --- /dev/null +++ b/java/eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml @@ -0,0 +1,21 @@ +--- assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml.orig 2009-02-27 22:18:02.441809104 -0500 ++++ assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml 2009-02-27 22:26:15.528848937 -0500 +@@ -147,6 +147,7 @@ + <customGather dir="plugins/org.eclipse.core.filebuffers" projectName="org.eclipse.core.filebuffers_3.4.0.v20080603-2000" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> + <customGather dir="plugins/org.eclipse.core.filesystem" projectName="org.eclipse.core.filesystem_1.2.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> + <customGather dir="plugins/org.eclipse.core.net" projectName="org.eclipse.core.net_1.1.0.I20080604" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> ++ <customGather dir="plugins/org.eclipse.core.net.freebsd.x86_64" projectName="org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> + <customGather dir="plugins/org.eclipse.core.resources" projectName="org.eclipse.core.resources_3.4.2.R34x_v20090126" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> + <customGather dir="plugins/org.eclipse.core.resources.compatibility" projectName="org.eclipse.core.resources.compatibility_3.4.0.v20080604-1400" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> + <customGather dir="plugins/org.eclipse.osgi.util" projectName="org.eclipse.osgi.util_3.1.300.v20080303" propertyName="destination.temp.folder" propertyValue="${eclipse.plugins}" subFolder="" /> +@@ -660,6 +661,10 @@ + </antcall> + <antcall target="jarUp"> + <param name="source" value="${eclipse.plugins}"/> ++ <param name="elementName" value="org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521"/> ++ </antcall> ++ <antcall target="jarUp"> ++ <param name="source" value="${eclipse.plugins}"/> + <param name="elementName" value="org.eclipse.core.resources_3.4.2.R34x_v20090126"/> + </antcall> + <antcall target="jarUp"> diff --git a/java/eclipse/files/patch-build b/java/eclipse/files/patch-build index f054d26a3e4a..9869086ff7c2 100644 --- a/java/eclipse/files/patch-build +++ b/java/eclipse/files/patch-build @@ -5,7 +5,7 @@ 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" = "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" ] ++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-x86_64" ] then ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -propertyfile build.properties diff --git a/java/eclipse/files/patch-build.properties b/java/eclipse/files/patch-build.properties deleted file mode 100644 index 08bad60f8be6..000000000000 --- a/java/eclipse/files/patch-build.properties +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 50a29ce0b1ac..5b3fd1aea492 100644 --- a/java/eclipse/files/patch-build.xml +++ b/java/eclipse/files/patch-build.xml @@ -1,11 +1,11 @@ ---- build.xml.orig 2008-09-29 19:16:32.000000000 -0400 -+++ build.xml 2008-09-29 19:19:37.000000000 -0400 +--- build.xml.orig 2009-02-11 17:38:21.000000000 -0500 ++++ build.xml 2009-04-17 16:02:56.601305019 -0400 @@ -1,7 +1,7 @@ <project name="Eclipse SDK Source Build" default="run" basedir="."> <!-- default target that runs complete build --> - <target name="run" depends="fetch,insertBuildId,compile,install" /> -+ <target name="run" depends="fetch,insertBuildId,compilelibs,compile,install" /> ++ <target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" /> <!-- all features required to build eclipse sdk and javadoc --> <target name="allElements"> @@ -18,50 +18,88 @@ + <mkdir dir="${freebsd.gtk.x86.rootfiles}" /> + <copy tofile="${freebsd.gtk.x86.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86/about.html" /> + -+ <!--copy freebsd gtk amd64 about_files to in temp location where it will be copied into root of eclipse at assembly time--> -+ <property name="freebsd.gtk.amd64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.amd64" /> -+ <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 freebsd gtk x86_64 about_files to in temp location where it will be copied into root of eclipse at assembly time--> ++ <property name="freebsd.gtk.x86_64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86_64" /> ++ <mkdir dir="${freebsd.gtk.x86_64.rootfiles}" /> ++ <copy tofile="${freebsd.gtk.x86_64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86_64/about.html" /> + <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 @@ +@@ -71,6 +81,29 @@ <record name="compilelog.txt" action="stop" /> </target> -+ <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"/> ++ <target name="compilelibs" depends="init,clean,compile" if="libsconfig"> ++ <!-- Build SWT native libraries --> ++ <ant dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" antfile="build.xml" target="build.nativeLibraries" /> + -+ <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> ++ <!-- Build native launcher --> ++ <exec dir="${buildDirectory}/features/org.eclipse.equinox.executable/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> ++ <!-- Build native liblocalfile library --> ++ <exec dir="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}" executable="make" failonerror="true" /> ++ <copy file="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.${installOs}.${installArch}/os/${installOs}/${installArch}" /> + -+ <echo message="Compiling native update library..."/> -+ <ant dir="plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" /> ++ <!-- Build native update library --> ++ <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" /> ++ ++ <!-- Build native libproxygnome library --> ++ <exec dir="plugins/org.eclipse.core.net/natives/unix/GetProxyGnome" executable="gmake" failonerror="true"> ++ <arg line="clean all" /> ++ </exec> ++ <copy file="plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/libproxygnome.so" todir="plugins/org.eclipse.core.net.${installOs}.${installArch}" /> + </target> + <!--create an installable eclipse runtime--> <target name="install" depends="init"> <echo message="Assembling..." /> -@@ -277,6 +306,8 @@ +@@ -123,19 +156,19 @@ + </path> + <regexpmapper from="(org\.eclipse\.equinox\.launcher)(_)(.*)\.jar" to="\0" /> + </pathconvert> +- <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.isv" output="platform.doc.isv.txt"> ++ <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.isv" > + <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner build.update.jar -Dplugin.destination=${plugin.destination}" /> + </java> +- <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.user" output="platform.doc.user.txt"> ++ <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.user" > + <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner build.update.jar -Dplugin.destination=${plugin.destination}" /> + </java> +- <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv" output="jdt.doc.isv.txt"> ++ <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv" > + <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner build.update.jar -Dplugin.destination=${plugin.destination}" /> + </java> +- <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.user" output="jdt.doc.user.txt"> ++ <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.user" > + <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner build.update.jar -Dplugin.destination=${plugin.destination}" /> + </java> +- <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.pde.doc.user" output="pde.doc.user.txt"> ++ <java fork="true" jar="${buildDirectory}/eclipse/plugins/${launcher}" dir="${buildDirectory}/plugins/org.eclipse.pde.doc.user" > + <arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner build.update.jar -Dplugin.destination=${plugin.destination}" /> + </java> + +@@ -256,7 +289,7 @@ + </condition> + </fail> + +- <property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" /> ++ <property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1 -nowarn" /> + <property name="javacSource" value="1.6" /> + <property name="javacTarget" value="1.6" /> + <property name="javacDebugInfo" value="true" /> +@@ -277,6 +310,8 @@ <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-motif-x86" /> <equals arg1="${installOs}-${installWs}-${installArch}" arg2="linux-gtk-s390" /> <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="freebsd-gtk-x86_64" /> <equals arg1="${installOs}-${installWs}-${installArch}" arg2="solaris-gtk-x86" /> <equals arg1="${installOs}-${installWs}-${installArch}" arg2="hpux-motif-PA_RISC" /> </or> -@@ -284,7 +315,10 @@ +@@ -284,7 +319,10 @@ <!--used to add doc plug-ins to result after initial assembly--> <condition property="archive.format" value="tar"> diff --git a/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml b/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml index 368cdf8fbb5e..525b4352c767 100644 --- a/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.cvs-build.xml @@ -19,9 +19,9 @@ </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"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles"> + <include name="**"/> + </fileset> @@ -35,7 +35,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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.cvs.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.cvs.source-build.xml index 77fa433272da..47e318cbe873 100644 --- a/java/eclipse/files/patch-features-org.eclipse.cvs.source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.cvs.source-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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.executable-feature.xml b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml index df4ef06d246f..d6c02a2d815b 100644 --- a/java/eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-feature.xml @@ -21,10 +21,10 @@ fragment="true"/> <plugin -+ id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" ++ id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64" + os="freebsd" + ws="gtk" -+ arch="amd64" ++ arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" diff --git a/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh index a86cc3eb059b..f31c8df2eae8 100644 --- a/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh +++ b/java/eclipse/files/patch-features-org.eclipse.equinox.executable-library-gtk-build.sh @@ -1,5 +1,5 @@ ---- 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 +--- features/org.eclipse.equinox.executable/library/gtk/build.sh.orig 2009-02-15 20:00:26.335076358 -0500 ++++ features/org.eclipse.equinox.executable/library/gtk/build.sh 2009-02-15 19:58:28.194586994 -0500 @@ -53,6 +53,7 @@ "Linux") makefile="make_linux.mak" @@ -8,7 +8,7 @@ case $MODEL in "x86_64") defaultOSArch="x86_64" -@@ -94,9 +95,31 @@ +@@ -94,9 +95,28 @@ ;; esac ;; @@ -17,16 +17,13 @@ + defaultOS="freebsd" + MAKE=gmake + javaHome="$JAVA_HOME" ++ defaultJava=DEFAULT_JAVA_EXEC + case $MODEL in + "amd64") -+ defaultOSArch="amd64" -+ defaultJava=DEFAULT_JAVA_EXEC -+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ defaultOSArch="x86_64" + ;; + i?86) + defaultOSArch="x86" -+ defaultJava=DEFAULT_JAVA_EXEC -+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + ;; + *) + echo "*** Unknown MODEL <${MODEL}>" @@ -40,7 +37,7 @@ 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 @@ +@@ -154,7 +174,7 @@ JAVA_HOME=$javaHome DEFAULT_JAVA=$defaultJava @@ -49,7 +46,7 @@ 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 @@ +@@ -162,13 +182,13 @@ # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then 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 index 772048790797..d4108ae6d458 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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 @@ +--- features/org.eclipse.equinox.executable/target.build.properties.orig 2009-02-15 19:26:32.101660938 -0500 ++++ features/org.eclipse.equinox.executable/target.build.properties 2009-02-15 20:02:53.388184225 -0500 +@@ -46,4 +46,7 @@ root.qnx.photon.x86=bin/photon/qnx/x86 root.linux.motif.x86=bin/motif/linux/x86,motif_root @@ -9,6 +9,4 @@ +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} ++root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root 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 index e0d78cc01f73..592a561762a6 100644 --- 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 @@ -19,13 +19,13 @@ <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="**" /> ++ <target name="rootFilesfreebsd_gtk_x86_64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/bin/gtk/freebsd/x86_64" 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_64/${collectingFolder}" includes="${launcherName}" /> + </target> <target name="rootFileslinux_gtk_ia64"> <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> @@ -35,7 +35,7 @@ <antcall target="rootFileslinux_gtk_ia64"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index 5e93d3b5135e..2c5cd5b944c8 100644 --- 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 @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index d16869524f5d..e907b1cdae69 100644 --- 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 @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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.help-build.xml b/java/eclipse/files/patch-features-org.eclipse.help-build.xml index df3c989e911b..21b7e912245f 100644 --- a/java/eclipse/files/patch-features-org.eclipse.help-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.help-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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.help.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml index d722c0718b5a..a0fa9f87a491 100644 --- a/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.help.source-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index 447e0b66b8df..e44d18f0f0e9 100644 --- a/java/eclipse/files/patch-features-org.eclipse.jdt-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.jdt-build.xml @@ -19,9 +19,9 @@ </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"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles"> + <include name="**"/> + </fileset> @@ -35,7 +35,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index 3f453f4810e9..9def8ef671c2 100644 --- a/java/eclipse/files/patch-features-org.eclipse.jdt.source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.jdt.source-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index 67dc317a101b..ee8ed9bb0f4c 100644 --- a/java/eclipse/files/patch-features-org.eclipse.pde-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.pde-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390"/> <antcall target="rootFileslinux_gtk_s390x"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <antcall target="rootFileslinux_motif_x86"/> <antcall target="rootFilessolaris_gtk_sparc"/> <antcall target="rootFilessolaris_gtk_x86"/> diff --git a/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml b/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml index 3c4963db4d86..72d2dd04f917 100644 --- a/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.pde.p2-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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.p2.source-build.xml b/java/eclipse/files/patch-features-org.eclipse.pde.p2.source-build.xml index 23a079f9b078..0004c0399c79 100644 --- 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 @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index f28cd366f576..7728054091c4 100644 --- a/java/eclipse/files/patch-features-org.eclipse.pde.source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.pde.source-build.xml @@ -6,7 +6,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -16,7 +16,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index 687760aa685f..05906ea2e9f9 100644 --- a/java/eclipse/files/patch-features-org.eclipse.platform-build.properties +++ b/java/eclipse/files/patch-features-org.eclipse.platform-build.properties @@ -1,18 +1,16 @@ ---- 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 @@ +--- features/org.eclipse.platform/build.properties.orig 2009-02-15 19:26:44.521712369 -0500 ++++ features/org.eclipse.platform/build.properties 2009-02-15 20:08:31.509583453 -0500 +@@ -49,6 +49,9 @@ #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* ++root.freebsd.gtk.x86_64=about_files/freebsd.gtk.x86_64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64,gtk + # 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 @@ +@@ -62,4 +65,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* diff --git a/java/eclipse/files/patch-features-org.eclipse.platform-build.xml b/java/eclipse/files/patch-features-org.eclipse.platform-build.xml index f441d4f4550c..41b83c54467c 100644 --- a/java/eclipse/files/patch-features-org.eclipse.platform-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.platform-build.xml @@ -1,18 +1,18 @@ ---- 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"/> +--- features/org.eclipse.platform/build.xml.orig 2009-02-27 22:28:15.809350510 -0500 ++++ features/org.eclipse.platform/build.xml 2009-02-27 22:35:15.291081568 -0500 +@@ -32,6 +32,11 @@ + <property name="os" value="hpux"/> + <property name="ws" value="motif"/> </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.x86_64" target="${target}"> ++ <property name="arch" value="x86_64"/> + <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 @@ +@@ -42,6 +47,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> </ant> @@ -24,7 +24,7 @@ <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 @@ +@@ -167,11 +177,26 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> </ant> @@ -36,28 +36,31 @@ <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"/> + <property name="ws" value="win32"/> </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.core.net.freebsd.x86_64" target="${target}"> ++ <property name="arch" value="x86_64"/> ++ <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 @@ +@@ -390,7 +415,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,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.4.2.R342_v20090122-9I96EiWElHi8lheoJKJIvhM3JfVsYbRrgVIWL/feature.xml" selfVersion="3.4.2.R342_v20090122-9I96EiWElHi8lheoJKJIvhM3JfVsYbRrgVIWL" featureIds="org.eclipse.help:0.0.0,1.0.2.R342_v20090122-7r7xEKaEJBZu5oGhP3u6nOmbM9VK,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.2.r34x_v20090120-7d-7tEQcCaaYSBeNOClOn02267," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.1.r34x_20090121,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.2.R34x_v20090126,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.1.v20090106_r342,org.eclipse.debug.ui:0.0.0,3.4.2.v20090110_r342,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.2.r342_v20081028-0800,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.platform:0.0.0,3.3.101.v200902111700,org.eclipse.platform.doc.user:0.0.0,3.4.2.r342_v20081031-0800,org.eclipse.search:0.0.0,3.4.1.r341_v20080813-0800,org.eclipse.team.core:0.0.0,3.4.2.r34x_20080115,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.2.r342_v20081119-0800,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.1.v20090128_r342,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.102.M20090127-1700,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.1.M20081112-0800,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.2.M20090127-1700,org.eclipse.ui.ide.application:0.0.0,1.0.1.M20090204-0800,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.202.R34x_v20081128,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.101.R34x_v20081128,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.1.R34x_v20081024,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.2.M20090127-1700,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.2.R342_v20090122-9I96EiWElHi8lheoJKJIvhM3JfVsYbRrgVIWL/feature.xml" selfVersion="3.4.2.R342_v20090122-9I96EiWElHi8lheoJKJIvhM3JfVsYbRrgVIWL" featureIds="org.eclipse.help:0.0.0,1.0.2.R342_v20090122-7r7xEKaEJBZu5oGhP3u6nOmbM9VK,org.eclipse.equinox.p2.user.ui:0.0.0,1.0.2.r34x_v20090120-7d-7tEQcCaaYSBeNOClOn02267," pluginIds="com.jcraft.jsch:0.0.0,0.1.37.v200803061811,org.eclipse.compare:0.0.0,3.4.1.r34x_20090121,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.net.freebsd.x86_64:0.0.0,1.0.0.I20080521,org.eclipse.core.resources:0.0.0,3.4.2.R34x_v20090126,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.1.v20090106_r342,org.eclipse.debug.ui:0.0.0,3.4.2.v20090110_r342,org.eclipse.help.appserver:0.0.0,3.1.300.v20080507,org.eclipse.ltk.core.refactoring:0.0.0,3.4.2.r342_v20081028-0800,org.eclipse.ltk.ui.refactoring:0.0.0,3.4.1.r341_v20080716-0800,org.eclipse.platform:0.0.0,3.3.101.v200902111700,org.eclipse.platform.doc.user:0.0.0,3.4.2.r342_v20081031-0800,org.eclipse.search:0.0.0,3.4.1.r341_v20080813-0800,org.eclipse.team.core:0.0.0,3.4.2.r34x_20080115,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.2.r342_v20081119-0800,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.1.v20090128_r342,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.102.M20090127-1700,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.1.M20081112-0800,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.2.M20090127-1700,org.eclipse.ui.ide.application:0.0.0,1.0.1.M20090204-0800,org.eclipse.ui.win32:0.0.0,3.2.100.v20080408-0800,org.eclipse.update.core:0.0.0,3.2.202.R34x_v20081128,org.eclipse.update.scheduler:0.0.0,3.2.100.v20080404,org.eclipse.update.ui:0.0.0,3.2.101.R34x_v20081128,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.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.1.R34x_v20081024,org.eclipse.update.core.freebsd:0.0.0,3.2.1.R34x_v20081024,org.eclipse.update.core.win32:0.0.0,3.2.100.v20080107,org.eclipse.ui.views.properties.tabbed:0.0.0,3.4.2.M20090127-1700,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 @@ +@@ -517,6 +542,27 @@ <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> @@ -81,22 +84,21 @@ + </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 @@ +@@ -558,6 +604,27 @@ <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"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.x86_64"> + <include name="**"/> + </fileset> -+ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64"> + <include name="**"/> + </fileset> + <fileset dir="${basedir}/gtk"> @@ -109,18 +111,17 @@ + <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*" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}" includes="eclipse" /> + </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 @@ +@@ -769,6 +836,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="rootFilesfreebsd_gtk_x86_64"/> <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-feature.xml b/java/eclipse/files/patch-features-org.eclipse.platform-feature.xml index 9b4f09d7485d..94486690185b 100644 --- a/java/eclipse/files/patch-features-org.eclipse.platform-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.platform-feature.xml @@ -1,6 +1,6 @@ ---- 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 @@ +--- features/org.eclipse.platform/feature.xml.orig 2009-02-15 19:26:44.531713361 -0500 ++++ features/org.eclipse.platform/feature.xml 2009-02-15 20:22:35.033072891 -0500 +@@ -96,6 +96,26 @@ unpack="false"/> <plugin @@ -14,10 +14,20 @@ + unpack="false"/> + + <plugin ++ id="org.eclipse.core.net.freebsd.x86_64" ++ os="freebsd" ++ arch="x86_64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin id="org.eclipse.core.resources" download-size="0" install-size="0" -@@ -406,6 +416,26 @@ +@@ -406,6 +426,26 @@ unpack="false"/> <plugin @@ -31,9 +41,9 @@ + unpack="false"/> + + <plugin -+ id="org.eclipse.core.filesystem.freebsd.amd64" ++ id="org.eclipse.core.filesystem.freebsd.x86_64" + os="freebsd" -+ arch="amd64" ++ arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" @@ -44,7 +54,7 @@ id="org.eclipse.core.filesystem.solaris.sparc" os="solaris" arch="sparc" -@@ -494,6 +524,15 @@ +@@ -494,6 +534,15 @@ unpack="false"/> <plugin 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 index e757e3c5111e..8ab36d7044c1 100644 --- a/java/eclipse/files/patch-features-org.eclipse.platform.source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.platform.source-build.xml @@ -18,7 +18,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -28,7 +28,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtl_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index d1b022b59f3a..556e9def2913 100644 --- a/java/eclipse/files/patch-features-org.eclipse.platform.source-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.platform.source-feature.xml @@ -1,10 +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 +--- features/org.eclipse.platform.source/feature.xml.orig 2009-02-27 22:37:06.124041343 -0500 ++++ features/org.eclipse.platform.source/feature.xml 2009-02-27 22:40:47.584956627 -0500 @@ -67,6 +67,7 @@ - <plugin id="org.eclipse.update.ui.source" version="3.2.100.v20080318" unpack="false"/> + <plugin id="org.eclipse.update.ui.source" version="3.2.101.R34x_v20081128" 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.linux.source" version="3.2.1.R34x_v20081024" os="linux" unpack="false"/> ++ <plugin id="org.eclipse.update.core.freebsd.source" version="3.2.1.R34x_v20081024" 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.ui.views.properties.tabbed.source" version="3.4.2.M20090127-1700" 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 index cfca5ed4fd1c..c1dde29d5417 100644 --- a/java/eclipse/files/patch-features-org.eclipse.rcp-build.properties +++ b/java/eclipse/files/patch-features-org.eclipse.rcp-build.properties @@ -1,13 +1,11 @@ ---- 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 @@ +--- features/org.eclipse.rcp/build.properties.orig 2009-02-15 19:26:44.191710651 -0500 ++++ features/org.eclipse.rcp/build.properties 2009-02-15 20:26:06.036446225 -0500 +@@ -42,6 +42,9 @@ 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.freebsd.gtk.x86_64=../../features/org.eclipse.platform/about_files/freebsd.gtk.x86_64,../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 + root.macosx.carbon.ppc=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse diff --git a/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml b/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml index b1602cff84de..f986efffa7ec 100644 --- a/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.rcp-build.xml @@ -1,6 +1,6 @@ ---- 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 @@ +--- features/org.eclipse.rcp/build.xml.orig 2009-02-27 22:41:48.377707940 -0500 ++++ features/org.eclipse.rcp/build.xml 2009-02-27 22:50:02.562252624 -0500 +@@ -72,11 +72,21 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> </ant> @@ -12,50 +12,50 @@ <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"/> + <property name="ws" value="carbon"/> </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.amd64" target="${target}"> -+ <property name="arch" value="amd64"/> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64" target="${target}"> ++ <property name="arch" value="x86_64"/> + <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 @@ +@@ -252,6 +262,11 @@ <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"/> ++ <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"/> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.s390x" target="${target}"> + <property name="arch" value="s390x"/> + <property name="os" value="linux"/> +@@ -267,6 +282,11 @@ <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"/> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86_64" target="${target}"> ++ <property name="arch" value="x86_64"/> + <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"/> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}"> + <property name="arch" value="sparc"/> + <property name="os" value="solaris"/> @@ -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,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.4.200.R342_v20090122-989JESTEbig-SVaL8UJHcYBr4A63/feature.xml" selfVersion="3.4.200.R342_v20090122-989JESTEbig-SVaL8UJHcYBr4A63" 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.1.R34x_v20081128,org.eclipse.core.expressions:0.0.0,3.4.1.r342_v20081203-0800,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.3.R34x_v20081215-1030,org.eclipse.help:0.0.0,3.3.102.v20081014_34x,org.eclipse.swt:0.0.0,3.4.2.v3452b,org.eclipse.jface:0.0.0,3.4.2.M20090107-0800,org.eclipse.jface.databinding:0.0.0,1.2.1.M20080827-0800a,org.eclipse.ui:0.0.0,3.4.2.M20090204-0800,org.eclipse.ui.workbench:0.0.0,3.4.2.M20090127-1700,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.v3452b,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.1.v3452b,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.1.v3452b,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.1.v3452b,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.1.v3452b,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.R3_4_1,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.R3_4_1,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.1.v3452b,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.v3452b,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.1.v3452b,org.eclipse.swt.carbon.macosx:0.0.0,3.4.1.v3452b,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.1.v3452b,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.1.R3_4_1_b,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.1.v3452b,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.1.v3452b,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.v3452b,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.1.v3452b,org.eclipse.rcp:0.0.0,3.4.1.R342_v20090205,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_v20081125,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.2.R34x_v20081125,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.200.R342_v20090122-989JESTEbig-SVaL8UJHcYBr4A63/feature.xml" selfVersion="3.4.200.R342_v20090122-989JESTEbig-SVaL8UJHcYBr4A63" 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.1.R34x_v20081128,org.eclipse.core.expressions:0.0.0,3.4.1.r342_v20081203-0800,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.3.R34x_v20081215-1030,org.eclipse.help:0.0.0,3.3.102.v20081014_34x,org.eclipse.swt:0.0.0,3.4.2.v3452b,org.eclipse.jface:0.0.0,3.4.2.M20090107-0800,org.eclipse.jface.databinding:0.0.0,1.2.1.M20080827-0800a,org.eclipse.ui:0.0.0,3.4.2.M20090204-0800,org.eclipse.ui.workbench:0.0.0,3.4.2.M20090127-1700,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.v3452b,org.eclipse.swt.win32.win32.x86_64:0.0.0,3.4.1.v3452b,org.eclipse.swt.wpf.win32.x86:0.0.0,3.4.1.v3452b,org.eclipse.swt.win32.win32.ia64:0.0.0,3.4.1.v3452b,org.eclipse.swt.gtk.linux.x86:0.0.0,3.4.1.v3452b,org.eclipse.swt.gtk.freebsd.x86:0.0.0,3.4.1.v3452b,org.eclipse.swt.gtk.linux.s390:0.0.0,3.4.0.R3_4_1,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.4.0.R3_4_1,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.4.1.v3452b,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.v3452b,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.4.1.v3452b,org.eclipse.swt.gtk.freebsd.x86_64:0.0.0,3.4.1.v3452b,org.eclipse.swt.carbon.macosx:0.0.0,3.4.1.v3452b,org.eclipse.swt.motif.aix.ppc:0.0.0,3.4.1.v3452b,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.4.1.R3_4_1_b,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.4.1.v3452b,org.eclipse.swt.motif.linux.x86:0.0.0,3.4.1.v3452b,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.v3452b,org.eclipse.swt.photon.qnx.x86:0.0.0,3.4.1.v3452b,org.eclipse.rcp:0.0.0,3.4.1.R342_v20090205,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_v20081125,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.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.2.R34x_v20081125,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 @@ +@@ -472,6 +492,24 @@ <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> @@ -76,22 +76,21 @@ + </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 @@ +@@ -506,6 +544,24 @@ <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"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86_64"> + <include name="**"/> + </fileset> -+ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64"> + <include name="**"/> + </fileset> + <fileset dir="${basedir}/rootfiles"> @@ -101,18 +100,17 @@ + <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*" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}" includes="eclipse" /> + </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 @@ +@@ -684,6 +740,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="rootFilesfreebsd_gtk_x86_64"/> <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-feature.xml b/java/eclipse/files/patch-features-org.eclipse.rcp-feature.xml index b91aeb55ff02..53daf770a3f2 100644 --- a/java/eclipse/files/patch-features-org.eclipse.rcp-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.rcp-feature.xml @@ -22,10 +22,10 @@ unpack="false"/> <plugin -+ id="org.eclipse.swt.gtk.freebsd.amd64" ++ id="org.eclipse.swt.gtk.freebsd.x86_64" + os="freebsd" + ws="gtk" -+ arch="amd64" ++ arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" @@ -57,10 +57,10 @@ fragment="true"/> <plugin -+ id="org.eclipse.equinox.launcher.gtk.freebsd.amd64" ++ id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64" + os="freebsd" + ws="gtk" -+ arch="amd64" ++ arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" 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 index 379f6a3305aa..a764c1065d61 100644 --- a/java/eclipse/files/patch-features-org.eclipse.rcp.source-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.rcp.source-build.xml @@ -9,8 +9,8 @@ + <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"/> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86_64.source" target="${target}"> ++ <property name="arch" value="x86_64"/> + <property name="os" value="freebsd"/> + <property name="ws" value="gtk"/> + </ant> @@ -23,7 +23,7 @@ </target> + <target name="rootFilesfreebsd_gtk_x86"> + </target> -+ <target name="rootFilesfreebsd_gtk_amd64"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> + </target> <target name="rootFilessolaris_gtk_sparc"> </target> @@ -33,7 +33,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <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 index 21762a8d7c98..af53b35a3ce7 100644 --- a/java/eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml +++ b/java/eclipse/files/patch-features-org.eclipse.rcp.source-feature.xml @@ -1,11 +1,17 @@ ---- 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"/> +--- features/org.eclipse.rcp.source/feature.xml.orig 2009-02-27 22:56:15.920186550 -0500 ++++ features/org.eclipse.rcp.source/feature.xml 2009-02-28 07:23:17.820532682 -0500 +@@ -33,12 +33,14 @@ + <plugin id="org.eclipse.swt.wpf.win32.x86.source" version="3.4.1.v3452b" os="win32" arch="x86" ws="wpf" unpack="false"/> + <plugin id="org.eclipse.swt.win32.win32.ia64.source" version="3.4.1.v3452b" os="win32" arch="ia64" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.x86.source" version="3.4.1.v3452b" os="linux" arch="x86" ws="gtk" unpack="false"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.x86.source" version="3.4.1.v3452b" os="freebsd" arch="x86" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.s390.source" version="3.4.0.R3_4_1" os="linux" arch="s390" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.s390x.source" version="3.4.0.R3_4_1" os="linux" arch="s390x" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.solaris.sparc.source" version="3.4.1.v3452b" 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"/> + <plugin id="org.eclipse.swt.gtk.linux.ppc.source" version="3.4.1.v3452b" os="linux" arch="ppc" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.gtk.linux.x86_64.source" version="3.4.1.v3452b" os="linux" arch="x86_64" ws="gtk" unpack="false"/> ++ <plugin id="org.eclipse.swt.gtk.freebsd.x86_64.source" version="3.4.1.v3452b" os="freebsd" arch="x86_64" ws="gtk" unpack="false"/> + <plugin id="org.eclipse.swt.carbon.macosx.source" version="3.4.1.v3452b" os="macosx" ws="carbon" unpack="false"/> + <plugin id="org.eclipse.swt.motif.aix.ppc.source" version="3.4.1.v3452b" os="aix" arch="ppc" ws="motif" unpack="false"/> + <plugin id="org.eclipse.swt.motif.hpux.PA_RISC.source" version="3.4.1.R3_4_1_b" os="hpux" arch="PA_RISC" ws="motif" 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 index 6dacd35b82aa..773d1a09f20b 100644 --- a/java/eclipse/files/patch-features-org.eclipse.sdk-build.properties +++ b/java/eclipse/files/patch-features-org.eclipse.sdk-build.properties @@ -5,4 +5,4 @@ root.linux.motif.x86=motif root.macosx.carbon.ppc=macosx.carbon +root.freebsd.gtk.x86=gtk -+root.freebsd.gtk.amd64=gtk ++root.freebsd.gtk.x86_64=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 index f574f111cf14..fc88a8812389 100644 --- a/java/eclipse/files/patch-features-org.eclipse.sdk-build.xml +++ b/java/eclipse/files/patch-features-org.eclipse.sdk-build.xml @@ -12,9 +12,9 @@ + </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"> ++ <target name="rootFilesfreebsd_gtk_x86_64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86_64/${collectingFolder}/" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/gtk"> + <include name="**"/> + </fileset> @@ -28,7 +28,7 @@ <antcall target="rootFileslinux_gtk_s390x"/> <antcall target="rootFileslinux_motif_x86"/> + <antcall target="rootFilesfreebsd_gtk_x86"/> -+ <antcall target="rootFilesfreebsd_gtk_amd64"/> ++ <antcall target="rootFilesfreebsd_gtk_x86_64"/> <antcall target="rootFilessolaris_gtk_sparc"/> <antcall target="rootFilessolaris_gtk_x86"/> <antcall target="rootFilessolaris_motif_sparc"/> diff --git a/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml b/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml index 70cb774b5bc4..21da1976c4f1 100644 --- a/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml +++ b/java/eclipse/files/patch-package.org.eclipse.sdk.all.xml @@ -5,7 +5,7 @@ <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="freebsd.gtk.x86_64" 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-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml b/java/eclipse/files/patch-plugins-org.eclipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml index 137cca053b18..a0154e20f7b6 100644 --- 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 @@ -7,14 +7,14 @@ - <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="gtk.freebsd.x86_64.jar" value="${eclipse.home}/plugins/org.eclipse.swt.gtk.freebsd.x86_64${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="${gtk.freebsd.x86_64.jar}" property="swt.jar" value="${gtk.freebsd.x86_64.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/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile new file mode 100644 index 000000000000..c97208378094 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile.orig 2009-02-15 13:44:59.076375045 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/makefile 2009-02-15 19:33:42.687935173 -0500 +@@ -28,7 +28,7 @@ + libproxygnome.so: $(OBJS) $(USER_OBJS) + @echo 'Building target: $@' + @echo 'Invoking: GCC C Linker' +- gcc -m32 -shared -o"libproxygnome.so" $(OBJS) $(USER_OBJS) $(LIBS) ++ @gcc -shared -o"libproxygnome.so" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk new file mode 100644 index 000000000000..fc2c8f5a89c6 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk @@ -0,0 +1,8 @@ +--- plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk.orig 2009-02-15 19:17:00.008787963 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/objects.mk 2009-02-15 19:17:13.588843249 -0500 +@@ -4,4 +4,4 @@ + + USER_OBJS := + +-LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 ++LIBS := -L${LOCALBASE}/lib -lgconf-2 -lORBit-2 -lgthread-2.0 -lgobject-2.0 -lglib-2.0 diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk new file mode 100644 index 000000000000..f7b81204b1ae --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk.orig 2009-02-15 13:45:15.836444551 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/GetProxyGnome/subdir.mk 2009-02-15 19:33:53.177979019 -0500 +@@ -17,7 +17,7 @@ + %.o: ../%.c + @echo 'Building file: $<' + @echo 'Invoking: GCC C Compiler' +- gcc -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include/ -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" ++ @gcc -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd -I${LOCALBASE}/include/gconf/2 -I${LOCALBASE}/include/orbit-2.0 -I${LOCALBASE}/include/glib-2.0 -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c new file mode 100644 index 000000000000..e75e2e274081 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c @@ -0,0 +1,11 @@ +--- plugins/org.eclipse.core.net/natives/unix/getproxygnome.c.orig 2009-02-15 19:43:28.612859430 -0500 ++++ plugins/org.eclipse.core.net/natives/unix/getproxygnome.c 2009-02-15 19:43:50.402949790 -0500 +@@ -16,7 +16,7 @@ + #include <gconf/gconf-value.h> + #include <gconf/gconf-client.h> + +-#ifdef __linux__ ++#if defined(__linux__) || defined (__FreeBSD__) + #include <string.h> + #else + #include <strings.h> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF b/java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF new file mode 100644 index 000000000000..8ffc8480ce66 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF @@ -0,0 +1,14 @@ +--- plugins/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2009-02-16 20:06:52.424901811 -0500 ++++ plugins/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2009-02-16 20:07:30.240058207 -0500 +@@ -3,8 +3,9 @@ + Bundle-Name: %fragmentName + Bundle-Vendor: %providerName + Bundle-Localization: fragment +-Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true ++Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=tr ++ ue + Bundle-Version: 1.0.0.qualifier + Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" +-Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) ++Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) + Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml new file mode 100644 index 000000000000..522936f27afb --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml @@ -0,0 +1,153 @@ +--- plugins/org.eclipse.core.net.freebsd.x86_64/build.xml.orig 2009-02-28 07:33:49.376334935 -0500 ++++ plugins/org.eclipse.core.net.freebsd.x86_64/build.xml 2009-02-28 07:39:12.017669239 -0500 +@@ -1,11 +1,11 @@ + <?xml version="1.0" encoding="UTF-8"?> +-<project name="org.eclipse.core.net.freebsd.x86" default="build.jars" basedir="."> ++<project name="org.eclipse.core.net.freebsd.x86_64" default="build.jars" basedir="."> + + <property name="basews" value="${ws}"/> + <property name="baseos" value="${os}"/> + <property name="basearch" value="${arch}"/> + <property name="basenl" value="${nl}"/> +- <property name="bundleId" value="org.eclipse.core.net.freebsd.x86"/> ++ <property name="bundleId" value="org.eclipse.core.net.freebsd.x86_64"/> + <property name="bundleVersion" value="1.0.0.I20080521"/> + + <!-- Compiler settings. --> +@@ -44,7 +44,7 @@ + <isset property="buildTempFolder"/> + </condition> + <property name="pluginTemp" value="${basedir}"/> +-<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" > ++<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" > + <isset property="buildTempFolder"/> + </condition> + <property name="build.result.folder" value="${basedir}"/> +@@ -57,18 +57,18 @@ + + </target> + +- <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.net.freebsd.x86 for an update site."> ++ <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.net.freebsd.x86_64 for an update site."> + <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> +- <jar destfile="${plugin.destination}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521.jar" basedir="${temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" filesetmanifest="merge"/> ++ <jar destfile="${plugin.destination}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521.jar" basedir="${temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" filesetmanifest="merge"/> + <delete dir="${temp.folder}"/> + </target> + +- <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.core.net.freebsd.x86 @dot."> ++ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.core.net.freebsd.x86_64 @dot."> + <delete dir="${temp.folder}/@dot.bin"/> + <mkdir dir="${temp.folder}/@dot.bin"/> + <path id="@dot.classpath"> +@@ -110,10 +110,8 @@ + <pathelement path="${build.result.folder}/../org.eclipse.equinox.preferences_3.2.201.R34x_v20080709/@dot"/> + <pathelement path="../org.eclipse.swt/@dot"/> + <pathelement path="${build.result.folder}/../org.eclipse.swt_3.4.2.v3452b/@dot"/> +- <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> +- <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_3.4.1.v3452b/@dot"/> +- <pathelement path="../org.eclipse.swt.motif.freebsd.x86/@dot"/> +- <pathelement path="${build.result.folder}/../org.eclipse.swt.motif.freebsd.x86_3.4.1.v3452b/@dot"/> ++ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86_64/@dot"/> ++ <pathelement path="${build.result.folder}/../org.eclipse.swt.gtk.freebsd.x86_64_3.4.2.v3452b/@dot"/> + </path> + <!-- compile the source code --> + <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" > +@@ -157,7 +155,7 @@ + </copy> + </target> + +- <target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.net.freebsd.x86."> ++ <target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.net.freebsd.x86_64."> + <available property="@dot" file="${build.result.folder}/@dot"/> + <antcall target="@dot"/> + </target> +@@ -168,13 +166,13 @@ + </target> + + <target name="gather.bin.parts" depends="init" if="destination.temp.folder"> +- <mkdir dir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521"/> +- <copy todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" failonerror="true" overwrite="false"> ++ <mkdir dir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521"/> ++ <copy todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" failonerror="true" overwrite="false"> + <fileset dir="${build.result.folder}/@dot"> + <include name="**"/> + </fileset> + </copy> +- <copy todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" failonerror="true" overwrite="false"> ++ <copy todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" failonerror="true" overwrite="false"> + <fileset dir="${basedir}"> + <include name="fragment.properties"/> + <include name="META-INF/"/> +@@ -183,17 +181,17 @@ + <include name="libproxygnome.so"/> + </fileset> + </copy> +- <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" version="1.0.0.I20080521"/> ++ <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" version="1.0.0.I20080521"/> + </target> + + <target name="build.zips" depends="init"> + </target> + + <target name="gather.sources" depends="init" if="destination.temp.folder"> +- <mkdir dir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521"/> +- <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" failonerror="false" overwrite="false"/> ++ <mkdir dir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521"/> ++ <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" failonerror="false" overwrite="false"/> + <antcall target="copy.src.includes"> +- <param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521"/> ++ <param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521"/> + </antcall> + </target> + +@@ -215,28 +213,28 @@ + </target> + + <target name="gather.logs" depends="init" if="destination.temp.folder"> +- <mkdir dir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521"/> +- <copy todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521" failonerror="false" overwrite="false"> ++ <mkdir dir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521"/> ++ <copy todir="${destination.temp.folder}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521" failonerror="false" overwrite="false"> + <fileset dir="${temp.folder}"> + <include name="@dot.bin${logExtension}"/> + </fileset> + </copy> + </target> + +- <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.net.freebsd.x86 of all the zips, jars and logs created."> ++ <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.net.freebsd.x86_64 of all the zips, jars and logs created."> + <delete dir="${build.result.folder}/@dot"/> + <delete file="${build.result.folder}/src.zip"/> +- <delete file="${plugin.destination}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521.jar"/> +- <delete file="${plugin.destination}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521.zip"/> ++ <delete file="${plugin.destination}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521.jar"/> ++ <delete file="${plugin.destination}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521.zip"/> + <delete dir="${temp.folder}"/> + </target> + + <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder."> +- <eclipse.convertPath fileSystemPath="/builds/M/src/plugins/org.eclipse.core.net.freebsd.x86" property="resourcePath"/> ++ <eclipse.convertPath fileSystemPath="/builds/M/src/plugins/org.eclipse.core.net.freebsd.x86_64" property="resourcePath"/> + <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/> + </target> + +- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.net.freebsd.x86."> ++ <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.net.freebsd.x86_64."> + <delete dir="${temp.folder}"/> + <mkdir dir="${temp.folder}"/> + <antcall target="build.jars"/> +@@ -252,7 +250,7 @@ + <include name="**/*.bin${logExtension}"/> + </fileset> + </delete> +- <zip destfile="${plugin.destination}/org.eclipse.core.net.freebsd.x86_1.0.0.I20080521.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/> ++ <zip destfile="${plugin.destination}/org.eclipse.core.net.freebsd.x86_64_1.0.0.I20080521.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/> + <delete dir="${temp.folder}"/> + </target> + 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 index 931136fbcea0..4c655e181858 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java.orig 2009-02-15 19:26:27.391641089 -0500 ++++ plugins/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 2009-02-15 20:39:45.324834833 -0500 @@ -204,6 +204,17 @@ public static final String OS_LINUX = "linux";//$NON-NLS-1$ @@ -18,12 +18,3 @@ * 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.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 index 98ecab5ea2e1..94a13bcbe134 100644 --- 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 @@ -18,13 +18,3 @@ 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.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 deleted file mode 100644 index 5dc9bf398dfd..000000000000 --- a/java/eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java +++ /dev/null @@ -1,12 +0,0 @@ ---- 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.osgi-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.osgi-build.xml deleted file mode 100644 index bd7ceded4109..000000000000 --- a/java/eclipse/files/patch-plugins-org.eclipse.osgi-build.xml +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 index 4a48310aef0a..277f69eb8ab0 100644 --- 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 @@ -5,7 +5,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$ ++ if (osName.startsWith("windows") || osName.startsWith("linux") || osName.startsWith("freebsd")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 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 index 31981c41dccc..fd7410d1f4bf 100644 --- 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 @@ -1,5 +1,5 @@ ---- ./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 +--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java.orig 2009-02-15 19:25:53.501501141 -0500 ++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseEnvironmentInfo.java 2009-02-15 20:52:03.177887665 -0500 @@ -33,6 +33,7 @@ // this internally to be Solaris. private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ @@ -8,27 +8,7 @@ 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 @@ +@@ -189,6 +190,8 @@ return Constants.WS_WIN32; if (os.equals(Constants.OS_LINUX)) return Constants.WS_GTK; @@ -37,7 +17,7 @@ if (os.equals(Constants.OS_MACOSX)) return Constants.WS_CARBON; if (os.equals(Constants.OS_HPUX)) -@@ -212,6 +209,8 @@ +@@ -212,6 +215,8 @@ return Constants.OS_SOLARIS; if (osName.equalsIgnoreCase(INTERNAL_OS_LINUX)) return Constants.OS_LINUX; 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 index ce1a083678f9..5b2a56d673fd 100644 --- 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 @@ -13,12 +13,3 @@ * 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-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml new file mode 100644 index 000000000000..38cd6997075e --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml @@ -0,0 +1,23 @@ +--- plugins/org.eclipse.pde.build/build.xml.orig 2009-02-15 14:54:04.518255168 -0500 ++++ plugins/org.eclipse.pde.build/build.xml 2009-02-15 14:53:17.438264370 -0500 +@@ -26,14 +26,14 @@ + </fileset> + </path> + <property name="bootclasspath" refid="path_bootclasspath"/> +-<condition property="bundleBootClasspath" value="${J2SE-1.4}" > +- <isset property="J2SE-1.4"/> ++<condition property="bundleBootClasspath" value="${J2SE-1.5}" > ++ <isset property="J2SE-1.5"/> + </condition> +-<condition property="bundleJavacSource" value="1.3" > +- <isset property="J2SE-1.4"/> ++<condition property="bundleJavacSource" value="1.5" > ++ <isset property="J2SE-1.5"/> + </condition> +-<condition property="bundleJavacTarget" value="1.2" > +- <isset property="J2SE-1.4"/> ++<condition property="bundleJavacTarget" value="1.5" > ++ <isset property="J2SE-1.5"/> + </condition> + <property name="bundleJavacSource" value="${javacSource}"/> + <property name="bundleJavacTarget" value="${javacTarget}"/> 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 index 2816426fb485..f23fd5ee01db 100644 --- 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 @@ -11,9 +11,9 @@ + </ant> + </target> + -+ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.amd64"> ++ <target name="assemble.org.eclipse.pde.build.container.feature.freebsd.gtk.x86_64"> + <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> -+ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> ++ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86_64.zip"/> + </ant> + </target> 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 index cefd018442a8..8363368c57f1 100644 --- 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 @@ -5,7 +5,7 @@ # linux, gtk, x86_64 & \ # linux, motif, x86 & \ +# freebsd, gtk, x86 & \ -+# freebsd, gtk, amd64 & \ ++# freebsd, gtk, x86_64 & \ # solaris, motif, sparc & \ # solaris, gtk, sparc & \ # aix, motif, ppc & \ @@ -14,7 +14,7 @@ # linux, gtk, x86_64 - antZip& \ # linux, motif, x86 - antZip& \ +# freebsd, gtk, x86 - antZip & \ -+# freebsd, gtk, amd64 - antZip & \ ++# freebsd, gtk, x86_64 - 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-customTargets.xml b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml index b5cf834825b7..d0d7e2e8cda3 100644 --- a/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml +++ b/java/eclipse/files/patch-plugins-org.eclipse.pde.build-templates-packager-customTargets.xml @@ -18,9 +18,9 @@ </ant> </target> + -+ <target name="assemble.freebsd.gtk.amd64.xml"> ++ <target name="assemble.freebsd.gtk.x86_64.xml"> + <ant antfile="${assembleScriptName}" > -+ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.amd64.zip"/> ++ <property name="archiveName" value="${archiveNamePrefix}-freebsd.gtk.x86_64.zip"/> + </ant> + </target> 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 index fcabc61d5b52..9006055964cc 100644 --- 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 @@ -5,7 +5,7 @@ # linux, gtk, x86_64 & \ # linux, motif, x86 & \ +# freebsd, gtk, x86 & \ -+# freebsd, gtk, amd64 & \ ++# freebsd, gtk, x86_64 & \ # solaris, motif, sparc & \ # solaris, gtk, sparc & \ # aix, motif, ppc & \ @@ -14,7 +14,7 @@ # linux, gtk, x86_64 - antZip& \ # linux, motif, x86 - antZip& \ +# freebsd, gtk, x86 - antZip& \ -+# freebsd, gtk, amd64 - antZip& \ ++# freebsd, gtk, x86_64 - 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 index b1d8a95f1207..ab4b89c91fef 100644 --- 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 @@ -5,7 +5,7 @@ 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.freebsd.gtk.x86_64=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.swt.gtk.freebsd.amd64-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml deleted file mode 100644 index 8bf9db3433a3..000000000000 --- a/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml +++ /dev/null @@ -1,64 +0,0 @@ ---- 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 deleted file mode 100644 index d7c5f8c8909e..000000000000 --- a/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 index 9c33fa4685fd..ea06bfb55a03 100644 --- 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 @@ -1,30 +1,18 @@ ---- 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"/> +--- plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2009-02-15 09:49:28.812369523 -0500 ++++ plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2009-02-15 09:59:58.545568057 -0500 +@@ -149,13 +149,14 @@ <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/common/library"/> <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/> <fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/> -@@ -156,9 +157,9 @@ + <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/> + </copy> </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"> +- <target name="build.jnilibs" depends="build.cfiles"> ++ <target name="build.nativeLibraries" depends="build.cfiles"> + <exec dir="${build.result.folder}/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> + <arg line="${build.result.folder}/library/build.sh"/> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml new file mode 100644 index 000000000000..e0a77d29fd86 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml @@ -0,0 +1,50 @@ +--- plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2009-02-15 09:36:21.377637363 -0500 ++++ plugins/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2009-02-15 10:02:04.923231253 -0500 +@@ -272,7 +272,12 @@ + + <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 --> ++ <!-- We can't assume that swttools.jar as already been built, so force a rebuild --> ++ <ant dir="${toolsplugindir}" inheritAll="false"> ++ <target name="clean" /> ++ <target name="build.jars" /> ++ </ant> ++ + <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> +@@ -294,6 +299,7 @@ + <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/common/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"/> +@@ -302,21 +308,11 @@ + </target> + + <target name="build.nativeLibraries" depends="build.cfiles" description="Build 64 bit native libraries without changing the content of org.eclipse.swt"> +- <property name="sourcedir" value="${basedir}/src/bin/library" /> +- <property name="lib_destdir" value="${sourcedir}/../../../../${fragment}" /> +- <tstamp/> +- <exec dir="${sourcedir}" executable="sh"> +- <arg line="./build.sh"/> +- <arg line="clean"/> ++ <exec dir="${build.result.folder}/src/bin/library" executable="sh"> ++ <env key="OUTPUT_DIR" value="${build.result.folder}"/> ++ <arg line="${build.result.folder}/src/bin/library/build.sh"/> ++ <arg line="install"/> + </exec> +- <mkdir dir="${lib_destdir}" /> +- <exec dir="${sourcedir}" executable="sh"> +- <arg line="./build.sh"/> +- <arg line="all"/> +- </exec> +- <copy todir="${lib_destdir}"> +- <fileset dir="${sourcedir}/" includes="*.so"/> +- </copy> + </target> + + <target name="build.zips" depends="init"> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml new file mode 100644 index 000000000000..db503ef34a6d --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml @@ -0,0 +1,14 @@ +--- plugins/org.eclipse.swt.tools/build.xml.orig 2009-02-28 07:40:51.918083398 -0500 ++++ plugins/org.eclipse.swt.tools/build.xml 2009-02-28 07:44:55.059088190 -0500 +@@ -66,9 +66,11 @@ + <pathelement path="../org.eclipse.swt/@dot"/> + <pathelement path="../org.eclipse.swt.motif.solaris.sparc/@dot"/> + <pathelement path="../org.eclipse.swt.gtk.linux.x86_64/@dot"/> ++ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86_64/@dot"/> + <pathelement path="../org.eclipse.swt.win32.win32.x86/@dot"/> + <pathelement path="../org.eclipse.swt.gtk.linux.s390x/@dot"/> + <pathelement path="../org.eclipse.swt.gtk.linux.x86/@dot"/> ++ <pathelement path="../org.eclipse.swt.gtk.freebsd.x86/@dot"/> + <pathelement path="../org.eclipse.swt.gtk.solaris.sparc/@dot"/> + <pathelement path="../org.eclipse.swt.photon.qnx.x86/@dot"/> + <pathelement path="../org.eclipse.swt.gtk.linux.s390/@dot"/> diff --git a/java/eclipse/files/patch-plugins-org.eclipse.update.core.freebsd-src-build.xml b/java/eclipse/files/patch-plugins-org.eclipse.update.core.freebsd-src-build.xml new file mode 100644 index 000000000000..c4c177ebc416 --- /dev/null +++ b/java/eclipse/files/patch-plugins-org.eclipse.update.core.freebsd-src-build.xml @@ -0,0 +1,16 @@ +--- plugins/org.eclipse.update.core.freebsd/src/build.xml.orig 2009-04-17 16:09:39.450704199 -0400 ++++ plugins/org.eclipse.update.core.freebsd/src/build.xml 2009-04-17 16:10:00.209609388 -0400 +@@ -43,13 +43,9 @@ + + <!-- This target build the library --> + <target name="build"> +- <echo message="Building ${library-file}"/> +- + <property name="header-path" value="${jdk-path}/../include"/> + <property name="header-freebsd-path" value="${header-path}/freebsd" /> + +- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-freebsd-path} -fPIC ${library-file}"/> +- + <apply executable="gcc" dest="${eclipse-home}/" parallel="false"> + <arg value="-o"/> + <arg value="${library-file}"/> diff --git a/java/eclipse/files/post-patch-packager-customTargets.xml b/java/eclipse/files/post-patch-packager-customTargets.xml new file mode 100644 index 000000000000..723667884048 --- /dev/null +++ b/java/eclipse/files/post-patch-packager-customTargets.xml @@ -0,0 +1,11 @@ +--- packager/customTargets.xml.orig 2009-02-23 20:09:35.539631847 -0500 ++++ packager/customTargets.xml 2009-02-22 10:21:35.186241128 -0500 +@@ -5,7 +5,7 @@ + <!-- This goal of this target is to get the packaging map files of the things you care for + The files must be fetched into the downloadDirectory folder --> + <target name="getMapFiles" unless="localMaps"> +- <get src="${packagerMapURL}" dest="${downloadDirectory}/initial.map" usetimestamp="true"/> ++ <copy tofile="${downloadDirectory}/initial.map" file="${packagingInfo}/packaging.map"/> + </target> + + <target name="init"> 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 index 88b57e05c52a..b35d5482989b 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- gtk/library/build.sh.orig 2009-02-15 12:44:50.966087957 -0500 ++++ gtk/library/build.sh 2009-02-15 12:45:01.414490300 -0500 @@ -50,6 +50,10 @@ fi fi @@ -20,32 +20,28 @@ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 export SWT_PTR_CFLAGS if [ -d /lib64 ]; then -@@ -74,47 +78,44 @@ +@@ -74,45 +78,43 @@ 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" ++if [ x${MAKE_GNOME} = "xmake_gnome" -a 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 -- ++ INTERNAL_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." ++if [ x${MAKE_CAIRO} = "xmake_cairo" -a 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 ++ INTERNAL_MAKE_CAIRO=make_cairo + else + echo "Cairo not found:" + echo " *** Advanced graphics support using cairo will not be compiled." fi -if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then @@ -67,43 +63,38 @@ - 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 +- 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 +- fi ++if [ x${MAKE_MOZILLA} = "xmake_mozilla" -a -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 ++ INTERNAL_MAKE_MOZILLA=make_mozilla ++ ;; ++ "libxul") ++ MOZILLA_INCLUDES=`pkg-config --cflags ${BROWSER}` ++ MOZILLA_LIBS=`pkg-config --libs ${BROWSER}` ++ export MOZILLA_INCLUDES ++ export MOZILLA_LIBS ++ INTERNAL_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 -+ + fi + # Find AWT if available - if [ -z "${AWT_LIB_PATH}" ]; then - if [ -d ${JAVA_HOME}/jre/lib/${AWT_ARCH} ]; then -@@ -142,5 +143,5 @@ +@@ -142,5 +144,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} ++ make -f $MAKEFILE all $INTERNAL_MAKE_GNOME $INTERNAL_MAKE_CAIRO $MAKE_AWT $INTERNAL_MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} fi diff --git a/java/eclipse/scripts/pre-patch b/java/eclipse/scripts/pre-patch index 33f4afa73bec..d983bd845159 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" @@ -13,7 +13,7 @@ copy_file() ;; *) rm -f $dstfile - cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g' > "$dstfile" + cat "$srcfile" | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g' > "$dstfile" ;; esac } @@ -31,9 +31,10 @@ copy_dir() find "$dstdir" -name \*.so -delete 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 + xargs -0 sed -i '.bak' 's/linux/freebsd/g; s/Linux/FreeBSD/g' + find "$dstdir" -name \*.bak -delete + find -d "$dstdir" -type d -name "linux" -exec rm -rf {} \; + fi } prepare_files() @@ -43,7 +44,7 @@ prepare_files() # Copy the files and rename/change them appropriately for src in $COPY_LIST do - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` + dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'` echo Copying $src into $dst if [ -d ${WRKSRC}/$src ] then @@ -55,14 +56,20 @@ prepare_files() # Files with spaces in their path... src="${SWTGTK}/make_linux.mak" - dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g; s/x86_64/amd64/g'` + dst=`echo $src | sed 's/linux/freebsd/g; s/Linux/FreeBSD/g'` echo Copying $src into $dst copy_file "${WRKSRC}/$src" "${WRKSRC}/$dst" + # New x86_64 fragment + src="plugins/org.eclipse.core.net.freebsd.x86" + dst="plugins/org.eclipse.core.net.freebsd.x86_64" + echo Copying $src into $dst + copy_dir "${WRKSRC}/$src" "${WRKSRC}/$dst" + find ${WRKSRC} -name \*.so -delete find ${WRKSRC} -name \*.so.\* -delete } -#features/org.eclipse.platform.launchers/library/gtk/make_linux.mak + COPY_LIST=" assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml @@ -104,4 +111,6 @@ plugins/org.eclipse.update.core.linux.source SWTGTK="plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" prepare_files + + exit 0 |