From 34968d47619d56d1b9e0a7cc7e60e592d90d3bee Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 6 Jun 2009 20:58:22 +0000 Subject: . Update to 3.4.2, including: . We are now installing a real eclipse product. . Only the jar files for the platform are built, dramatically reducing the time necessary to build (thanks to the Fedora devs for the idea and the basic procedure). . Lot of small fixes to the build procedure to make future imports easier . Some of the bundles are pre-extracted during install to improve launching time. . JDK 1.6 is required to build but any jre (1.5 or 1.6) can be used in Preferences->Java->Installed JREs. JDK 1.4 is unfortunately not supported at this time. . Switch to x86_64 architecture name instead of amd64 to be more in-line with mainline eclipse. Note that after this update you will need to reinstall any plugins you've installed with the built in Update Manager. This is a one time thing. Submitted by: sepotvin@ (maintainer) --- java/eclipse/files/build.properties.in | 4 + java/eclipse/files/packager-packager.properties.in | 96 +++++++++++++ java/eclipse/files/packager-packaging.map.in | 1 + java/eclipse/files/packager-packaging.properties | 41 ++++++ java/eclipse/files/packager-sdk.product.in | 38 +++++ .../files/patch-assemble.org.eclipse.sdk.all.xml | 2 +- ...assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml | 21 +++ java/eclipse/files/patch-build | 2 +- java/eclipse/files/patch-build.properties | 10 -- java/eclipse/files/patch-build.xml | 88 ++++++++---- .../files/patch-features-org.eclipse.cvs-build.xml | 8 +- ...patch-features-org.eclipse.cvs.source-build.xml | 4 +- ...ures-org.eclipse.equinox.executable-feature.xml | 4 +- ...eclipse.equinox.executable-library-gtk-build.sh | 17 +-- ...ipse.equinox.executable-target.build.properties | 10 +- ...org.eclipse.equinox.executable-target.build.xml | 12 +- ...atures-org.eclipse.equinox.p2.user.ui-build.xml | 4 +- ...org.eclipse.equinox.p2.user.ui.source-build.xml | 4 +- .../patch-features-org.eclipse.help-build.xml | 4 +- ...atch-features-org.eclipse.help.source-build.xml | 4 +- .../files/patch-features-org.eclipse.jdt-build.xml | 8 +- ...patch-features-org.eclipse.jdt.source-build.xml | 4 +- .../files/patch-features-org.eclipse.pde-build.xml | 4 +- .../patch-features-org.eclipse.pde.p2-build.xml | 4 +- ...ch-features-org.eclipse.pde.p2.source-build.xml | 4 +- ...patch-features-org.eclipse.pde.source-build.xml | 4 +- ...-features-org.eclipse.platform-build.properties | 12 +- .../patch-features-org.eclipse.platform-build.xml | 55 ++++---- ...patch-features-org.eclipse.platform-feature.xml | 24 +++- ...-features-org.eclipse.platform.source-build.xml | 4 +- ...eatures-org.eclipse.platform.source-feature.xml | 12 +- ...patch-features-org.eclipse.rcp-build.properties | 10 +- .../files/patch-features-org.eclipse.rcp-build.xml | 62 ++++----- .../patch-features-org.eclipse.rcp-feature.xml | 8 +- ...patch-features-org.eclipse.rcp.source-build.xml | 8 +- ...tch-features-org.eclipse.rcp.source-feature.xml | 26 ++-- ...patch-features-org.eclipse.sdk-build.properties | 2 +- .../files/patch-features-org.eclipse.sdk-build.xml | 8 +- .../files/patch-package.org.eclipse.sdk.all.xml | 2 +- ...lipse.ant.ui-buildfiles-buildRemoteExtraJAR.xml | 4 +- ...se.core.net-natives-unix-GetProxyGnome-makefile | 11 ++ ....core.net-natives-unix-GetProxyGnome-objects.mk | 8 ++ ...e.core.net-natives-unix-GetProxyGnome-subdir.mk | 11 ++ ...g.eclipse.core.net-natives-unix-getproxygnome.c | 11 ++ ...se.core.net.freebsd.x86_64-META-INF-MANIFEST.MF | 14 ++ ...s-org.eclipse.core.net.freebsd.x86_64-build.xml | 153 +++++++++++++++++++++ ...time-src-org-eclipse-core-runtime-Platform.java | 13 +- ...cher-src-org-eclipse-equinox-launcher-Main.java | 10 -- ...frameworkadmin-equinox-EquinoxBundlesState.java | 12 -- .../files/patch-plugins-org.eclipse.osgi-build.xml | 25 ---- ...daptor-org-eclipse-osgi-util-TextProcessor.java | 2 +- ...e-internal-adaptor-EclipseEnvironementInfo.java | 28 +--- ...eclipse-osgi-service-environment-Constants.java | 9 -- .../patch-plugins-org.eclipse.pde.build-build.xml | 23 ++++ ....pde.build-scripts-productBuild-allElements.xml | 4 +- ...build-templates-headless-build-build.properties | 4 +- ....pde.build-templates-packager-customTargets.xml | 4 +- ...de.build-templates-packager-packager.properties | 4 +- ...e.build-templates-packager-packaging.properties | 2 +- ...ins-org.eclipse.swt.gtk.freebsd.amd64-build.xml | 64 --------- ...t.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF | 11 -- ...ugins-org.eclipse.swt.gtk.freebsd.x86-build.xml | 32 ++--- ...ns-org.eclipse.swt.gtk.freebsd.x86_64-build.xml | 50 +++++++ .../patch-plugins-org.eclipse.swt.tools-build.xml | 14 ++ ...s-org.eclipse.update.core.freebsd-src-build.xml | 16 +++ .../files/post-patch-packager-customTargets.xml | 11 ++ ...eclipse.swt-Eclipse_SWT_PI-gtk-library-build.sh | 75 +++++----- 67 files changed, 818 insertions(+), 442 deletions(-) create mode 100644 java/eclipse/files/build.properties.in create mode 100644 java/eclipse/files/packager-packager.properties.in create mode 100644 java/eclipse/files/packager-packaging.map.in create mode 100644 java/eclipse/files/packager-packaging.properties create mode 100644 java/eclipse/files/packager-sdk.product.in create mode 100644 java/eclipse/files/patch-assemble.org.eclipse.sdk.freebsd.gtk.x86_64.xml delete mode 100644 java/eclipse/files/patch-build.properties create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-makefile create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-objects.mk create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-GetProxyGnome-subdir.mk create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.core.net-natives-unix-getproxygnome.c create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-META-INF-MANIFEST.MF create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.core.net.freebsd.x86_64-build.xml delete mode 100644 java/eclipse/files/patch-plugins-org.eclipse.frameworkadmin.equinox-src-org-eclipse-equinox-internal-frameworkadmin-equinox-EquinoxBundlesState.java delete mode 100644 java/eclipse/files/patch-plugins-org.eclipse.osgi-build.xml create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.pde.build-build.xml delete mode 100644 java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64-build.xml delete mode 100644 java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.amd64.source-META-INF-MANIFEST.MF create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.swt.gtk.freebsd.x86_64-build.xml create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.swt.tools-build.xml create mode 100644 java/eclipse/files/patch-plugins-org.eclipse.update.core.freebsd-src-build.xml create mode 100644 java/eclipse/files/post-patch-packager-customTargets.xml (limited to 'java/eclipse/files') 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 @@ + + + + + + + + + + -showsplash +org.eclipse.platform + -Xdock:icon=../Resources/Eclipse.icns +-XstartOnFirstThread +-Xms40m +-Xmx256m +-XX:MaxPermSize=256m +-Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + 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 @@ + -+ ++ 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 @@ + + + ++ + + + +@@ -660,6 +661,10 @@ + + + ++ ++ ++ ++ + + + 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 @@ - -+ ++ @@ -18,50 +18,88 @@ + + + -+ -+ -+ -+ ++ ++ ++ ++ + -@@ -71,6 +81,25 @@ +@@ -71,6 +81,29 @@ -+ -+ -+ ++ ++ ++ + -+ -+ -+ -+ -+ ++ ++ ++ ++ + -+ -+ -+ -+ ++ ++ ++ + -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ + + -@@ -277,6 +306,8 @@ +@@ -123,19 +156,19 @@ + + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + +- ++ + + + +@@ -256,7 +289,7 @@ + + + +- ++ + + + +@@ -277,6 +310,8 @@ + -+ ++ -@@ -284,7 +315,10 @@ +@@ -284,7 +319,10 @@ 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 @@ -+ -+ -+ ++ ++ ++ + + + @@ -35,7 +35,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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"/> " @@ -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 @@ -+ -+ -+ -+ ++ ++ ++ ++ + + -+ ++ + @@ -35,7 +35,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ -+ -+ -+ ++ ++ ++ + + + @@ -35,7 +35,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ + + -+ ++ + @@ -16,7 +16,7 @@ + -+ ++ 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 @@ - - +--- 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 @@ + + -+ -+ ++ ++ + + + -@@ -67,6 +72,11 @@ +@@ -42,6 +47,11 @@ @@ -24,7 +24,7 @@ -@@ -147,6 +157,11 @@ +@@ -167,11 +177,26 @@ @@ -36,28 +36,31 @@ -@@ -157,6 +172,11 @@ - - + + + + + ++ ++ ++ ++ ++ + -@@ -390,7 +410,7 @@ +@@ -390,7 +415,7 @@ -- -+ +- ++ -@@ -517,6 +537,28 @@ +@@ -517,6 +542,27 @@ @@ -81,22 +84,21 @@ + + + -+ + -@@ -558,6 +600,28 @@ +@@ -558,6 +604,27 @@ -+ -+ -+ -+ ++ ++ ++ ++ + + -+ ++ + + + @@ -109,18 +111,17 @@ + + + -+ -+ ++ + -@@ -769,6 +833,8 @@ +@@ -769,6 +836,8 @@ + -+ ++ 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"/> + ++ ++ + + + + + -+ ++ + @@ -28,7 +28,7 @@ + -+ ++ 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 @@ - + - -+ + ++ - + 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 @@ @@ -12,50 +12,50 @@ -@@ -72,6 +77,11 @@ - - + -+ -+ ++ ++ + + + -@@ -112,11 +122,21 @@ +@@ -252,6 +262,11 @@ -+ -+ ++ ++ + + + - - + + + +@@ -267,6 +282,11 @@ -+ -+ ++ ++ + + + - - - + + + @@ -363,7 +383,7 @@ -- -+ +- ++ -@@ -472,6 +492,25 @@ +@@ -472,6 +492,24 @@ @@ -76,22 +76,21 @@ + + + -+ + -@@ -506,6 +545,25 @@ +@@ -506,6 +544,24 @@ -+ -+ -+ -+ ++ ++ ++ ++ + + -+ ++ + + + @@ -101,18 +100,17 @@ + + + -+ -+ ++ + -@@ -684,6 +742,8 @@ +@@ -684,6 +740,8 @@ + -+ ++ 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"/> + + -+ -+ ++ ++ + + + @@ -23,7 +23,7 @@ + + -+ ++ + @@ -33,7 +33,7 @@ + -+ ++ 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 @@ - - - -+ -+ - +--- 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 @@ + + + ++ + + + - + + ++ + + + 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 @@ + + + -+ -+ -+ ++ ++ ++ + + + @@ -28,7 +28,7 @@ + -+ ++ 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 @@ + -+ ++ 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 @@ - + + -+ ++ - + + -+ ++ 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 + #include + +-#ifdef __linux__ ++#if defined(__linux__) || defined (__FreeBSD__) + #include + #else + #include 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 @@ + +- ++ + + + + + +- ++ + + + +@@ -44,7 +44,7 @@ + + + +- ++ + + + +@@ -57,18 +57,18 @@ + + + +- ++ + + + + + + +- ++ + + + +- ++ + + + +@@ -110,10 +110,8 @@ + + + +- +- +- +- ++ ++ + + + +@@ -157,7 +155,7 @@ + + + +- ++ + + + +@@ -168,13 +166,13 @@ + + + +- +- ++ ++ + + + + +- ++ + + + +@@ -183,17 +181,17 @@ + + + +- ++ + + + + + + +- +- ++ ++ + +- ++ + + + +@@ -215,28 +213,28 @@ + + + +- +- ++ ++ + + + + + + +- ++ + + +- +- ++ ++ + + + + +- ++ + + + +- ++ + + + +@@ -252,7 +250,7 @@ + + + +- ++ + + + 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. *

-@@ -329,7 +340,7 @@ - * @deprecated use ARCH_X86_64 instead. Note the values - * has been changed to be the value of the ARCH_X86_64 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 @@ - - - -- -+ -+ -+ -+ -+ -+ -+ - - - -@@ -37,6 +43,7 @@ - - - -+ - - - 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 ARCH_X86_64 instead. Note the values - * has been changed to be the value of the ARCH_X86_64 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 @@ + + + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ + + + 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 @@ + + + -+ ++ + -+ ++ + + 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 @@ + -+ ++ + -+ ++ + + 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 @@ - - - -+ -+ -+ - - - -@@ -287,21 +290,27 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -+ -+ - -+ -+ -+ -+ -+ -+ -+ - - - 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 @@ - - - -- -- -+ -+ - - +--- 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 @@ -+ ++ -@@ -156,9 +157,9 @@ + + - -- -+ +- ++ + -- -+ - - - + 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 @@ + + + +- ++ ++ ++ ++ ++ ++ + + + +@@ -294,6 +299,7 @@ + + + ++ + + + +@@ -302,21 +308,11 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ + +- +- +- +- +- +- +- +- + + + 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 @@ + + + ++ + + + ++ + + + 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 @@ + + + +- +- + + + +- +- + + + 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 @@ + + +- ++ + + + 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 -- cgit v1.2.3