diff options
| -rw-r--r-- | java/eclipse/Makefile | 12 | ||||
| -rw-r--r-- | java/eclipse/distinfo | 6 | ||||
| -rw-r--r-- | java/eclipse/files/patch-features-platform-build.xml | 10 | ||||
| -rw-r--r-- | java/eclipse/files/patch-features-platform-source-build.xml | 10 | ||||
| -rw-r--r-- | java/eclipse/files/patch-features-platform-source-feature.xml | 10 | ||||
| -rw-r--r-- | java/eclipse/files/patch-features-rcp-build.xml | 10 | ||||
| -rw-r--r-- | java/eclipse/files/patch-features-rcp-source-build.xml | 10 | ||||
| -rw-r--r-- | java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h | 97 |
8 files changed, 33 insertions, 132 deletions
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 9e1cddafce9c..a68efa5a25db 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -6,15 +6,14 @@ # PORTNAME= eclipse -PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTVERSION= 3.2.2 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR= R-${PORTVERSION}-200609210945 +MASTER_SITE_SUBDIR= R-${PORTVERSION}-200702121330 DISTNAME= ${PORTNAME}-sourceBuild-srcIncluded-${PORTVERSION} DIST_SUBDIR= eclipse -MAINTAINER= dsledge@appriss.com +MAINTAINER= freebsd-eclipse@freebsd.org COMMENT= An open extensible IDE for anything and nothing in particular BUILD_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \ @@ -55,8 +54,8 @@ USE_GNOME= gtk20 gnomevfs2 libgnome libgnomeui pkgconfig desktopfileutils .if defined(WITHOUT_CAIRO) MAKE_CAIRO= .else -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -MAKE_CAIRO= make_cairo +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +MAKE_CAIRO= make_cairo .endif .include <bsd.port.pre.mk> @@ -97,7 +96,6 @@ SWTMOZ=${WRKSRC}/plugins/org.eclipse.swt/Eclipse SWT Mozilla post-patch: @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/build.sh" ${FILESDIR}/post-patch-plugins-swt-gtk-build.sh @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/make_freebsd.mak" ${FILESDIR}/post-patch-plugins-swt-gtk-make_freebsd.mak - @${PATCH} ${PATCH_DIST_ARGS} "${SWTGTK}/os_custom.h" ${FILESDIR}/post-patch-plugins-swt-gtk-os_custom.h @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/gtk/org/eclipse/swt/browser/Browser.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-Browser.java @${PATCH} ${PATCH_DIST_ARGS} "${SWTMOZ}/common/org/eclipse/swt/internal/mozilla/XPCOM.java" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.java @${PATCH} ${PATCH_DIST_ARGS} "${WRKSRC}/plugins/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.mozilla.XPCOM.properties" ${FILESDIR}/post-patch-plugins-swt-mozilla-XPCOM.properties diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index c3c451174f3d..a57e1fd30919 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,3 +1,3 @@ -MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 0fe89e9c7cf07a56c4fe8e2d7f5a394b -SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7 -SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.1.zip) = 82433420 +MD5 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 5d1b9f6a146ffc59191e513083a6ec86 +SHA256 (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 84759dc6085e68b31228ce2b226778494481be38681dc8ca5b0e2f226bf963a7 +SIZE (eclipse/eclipse-sourceBuild-srcIncluded-3.2.2.zip) = 82487328 diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml index 592bb451b083..ed322d0e4976 100644 --- a/java/eclipse/files/patch-features-platform-build.xml +++ b/java/eclipse/files/patch-features-platform-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.platform/build.xml.orig Thu Sep 21 10:55:42 2006 -+++ features/org.eclipse.platform/build.xml Tue Oct 3 14:33:47 2006 +--- features/org.eclipse.platform/build.xml.orig Tue Apr 3 16:32:56 2007 ++++ features/org.eclipse.platform/build.xml Tue Apr 3 17:10:16 2007 @@ -27,6 +27,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> @@ -30,11 +30,11 @@ <property name="arch" value="PA_RISC"/> <property name="os" value="hpux"/> @@ -391,7 +406,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform_3.2.1.r321_v20060921-MGDh_08KUYM-Bvn" failonerror="true" overwrite="false"> + <copy todir="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.1.r321_v20060921-MGDh_08KUYM-Bvn/feature.xml" selfVersion="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn" featureIds="org.eclipse.rcp,3.2.1.r321_v20060801-clWbqCmjexIWDqg," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.1.R32x_v20060914,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.1.v20060823,org.eclipse.help.webapp,3.2.1.R321_v20060803,org.eclipse.help.base,3.2.1.R321_v20060822,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.1.r321_v20060726,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.1.M20060711,org.eclipse.team.cvs.core,3.2.1.M200608161750,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.1.M20060831,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.1.r321_v20060810,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.1.R321_v20060810,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.1.v20092006,org.eclipse.update.scheduler,3.2.1.v20092006,org.eclipse.update.ui,3.2.1.v20092006,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.1.v20092006,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.1.r321_v20060921-MGDh_08KUYM-Bvn/feature.xml" selfVersion="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn" featureIds="org.eclipse.rcp,3.2.1.r321_v20060801-clWbqCmjexIWDqg," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.1.R32x_v20060914,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.1.v20060823,org.eclipse.help.webapp,3.2.1.R321_v20060803,org.eclipse.help.base,3.2.1.R321_v20060822,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.1.r321_v20060726,org.eclipse.platform,3.2.0.v20060601,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.1.M20060711,org.eclipse.team.cvs.core,3.2.1.M200608161750,org.eclipse.team.cvs.ssh,3.2.0.I200606011710,org.eclipse.team.cvs.ssh2,3.2.0.I200606051140,org.eclipse.team.cvs.ui,3.2.1.M20060831,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.1.r321_v20060810,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.1.R321_v20060810,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.1.v20092006,org.eclipse.update.scheduler,3.2.1.v20092006,org.eclipse.update.ui,3.2.1.v20092006,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.freebsd.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.freebsd.amd64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.freebsd,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.1.v20092006,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml" selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml" selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.freebsd.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.freebsd.amd64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.freebsd,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml index 4191aab66551..c3db0f4aa642 100644 --- a/java/eclipse/files/patch-features-platform-source-build.xml +++ b/java/eclipse/files/patch-features-platform-source-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.platform.source/build.xml.orig Thu Sep 21 10:55:43 2006 -+++ features/org.eclipse.platform.source/build.xml Tue Oct 3 14:44:24 2006 +--- features/org.eclipse.platform.source/build.xml.orig Mon Feb 12 12:45:20 2007 ++++ features/org.eclipse.platform.source/build.xml Tue Apr 3 17:15:03 2007 @@ -27,6 +27,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> @@ -25,11 +25,11 @@ <property name="arch" value="PA_RISC"/> <property name="os" value="hpux"/> @@ -131,7 +141,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform.source_3.2.1.r321_v20060921-MGDh_08KUYM-Bvn" failonerror="true" overwrite="false"> + <copy todir="${feature.base}/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.2.1.r321_v20060921-MGDh_08KUYM-Bvn/feature.xml" selfVersion="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn" featureIds="org.eclipse.rcp.source,3.2.1.r321_v20060801-clWbqCmjexIWDqg," pluginIds="org.eclipse.platform.doc.isv,3.2.1.r321_v2006030,org.eclipse.platform.source,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.hpux.motif.ia64_32,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.ia64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.qnx.photon.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.ppc,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.hpux.motif.PA_RISC,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.x86_64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.ppc64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.macosx.carbon.ppc,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.win32.win32.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.motif.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.2.1.r321_v20060921-MGDh_08KUYM-Bvn/feature.xml" selfVersion="3.2.1.r321_v20060921-MGDh_08KUYM-Bvn" featureIds="org.eclipse.rcp.source,3.2.1.r321_v20060801-clWbqCmjexIWDqg," pluginIds="org.eclipse.platform.doc.isv,3.2.1.r321_v2006030,org.eclipse.platform.source,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.hpux.motif.ia64_32,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.ia64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.qnx.photon.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.ppc,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.hpux.motif.PA_RISC,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.x86_64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.freebsd.gtk.amd64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.ppc64,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.macosx.carbon.ppc,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.gtk.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.freebsd.gtk.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.win32.win32.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,org.eclipse.platform.source.linux.motif.x86,3.2.1.r321_v20060921-MGDh_08KUYM-Bvn,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml" selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="org.eclipse.platform.doc.isv,3.2.2.R32x_v20070115,org.eclipse.platform.source,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.ia64_32,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ia64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.qnx.photon.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.PA_RISC,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86_64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.macosx.carbon.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.win32.win32.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.motif.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml" selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="org.eclipse.platform.doc.isv,3.2.2.R32x_v20070115,org.eclipse.platform.source,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.ia64_32,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ia64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.freebsd.gtk.amd64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.qnx.photon.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.hpux.motif.PA_RISC,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86_64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.freebsd.gtk.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.ppc64,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.macosx.carbon.ppc,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.gtk.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.win32.win32.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,org.eclipse.platform.source.linux.motif.x86,3.2.2.r322_v20070119-CXMbUe9K_WF26uA,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> diff --git a/java/eclipse/files/patch-features-platform-source-feature.xml b/java/eclipse/files/patch-features-platform-source-feature.xml index 953e33efd7d8..1541b1e8234d 100644 --- a/java/eclipse/files/patch-features-platform-source-feature.xml +++ b/java/eclipse/files/patch-features-platform-source-feature.xml @@ -1,9 +1,9 @@ --- features/org.eclipse.platform.source/feature.xml.orig Sat Jul 29 21:49:46 2006 +++ features/org.eclipse.platform.source/feature.xml Sat Jul 29 21:52:58 2006 @@ -28,4 +28,6 @@ - <plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.0.v20060609m-BBt47n6hlEUsvBO"/> - <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.0.v20060609m-BBt47n6hlEUsvBO"/> - <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.0.v20060609m-BBt47n6hlEUsvBO"/> -+ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.2.0.v20060609m-BBt47n6hlEUsvBO"/> -+ <plugin ws="gtk" os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.amd64" version="3.2.0.v20060609m-BBt47n6hlEUsvBO"/> + <plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/> + <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/> + <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/> ++ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/> ++ <plugin ws="gtk" os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.amd64" version="3.2.2.r322_v20070119-CXMbUe9K_WF26uA"/> </feature> diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml index f76a76f03d53..8f6673f62e3c 100644 --- a/java/eclipse/files/patch-features-rcp-build.xml +++ b/java/eclipse/files/patch-features-rcp-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.rcp/build.xml.orig Thu Sep 21 10:55:42 2006 -+++ features/org.eclipse.rcp/build.xml Tue Oct 3 14:51:03 2006 +--- features/org.eclipse.rcp/build.xml.orig Mon Feb 12 12:45:21 2007 ++++ features/org.eclipse.rcp/build.xml Tue Apr 3 17:17:52 2007 @@ -77,6 +77,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> @@ -25,11 +25,11 @@ <target name="all.features" depends="init"> </target> @@ -225,7 +235,7 @@ - <copy todir="${feature.base}/features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg" failonerror="true" overwrite="false"> + <copy todir="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/feature.xml" selfVersion="3.2.1.r321_v20060801-clWbqCmjexIWDqg" featureIds="" pluginIds="com.ibm.icu,3.4.5,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.1.r321_v20060721,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.1.R32x_v20060919,org.eclipse.help,3.2.1.R321_v20060920,org.eclipse.swt,3.2.1.v3235e,org.eclipse.jface,3.2.1.M20060908-1000,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20060913-0800,org.eclipse.ui.workbench,3.2.1.M20060906-0800,org.eclipse.update.configurator,3.2.1.v20092006,org.eclipse.swt.win32.win32.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.solaris.sparc,3.2.1.v3235,org.eclipse.swt.gtk.solaris.x86,3.2.0.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86_64,3.2.1.v3235,org.eclipse.swt.carbon.macosx,3.2.1.v3235,org.eclipse.swt.motif.aix.ppc,3.2.1.v3235,org.eclipse.swt.motif.hpux.PA_RISC,3.2.1.v3235,org.eclipse.swt.motif.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.ia64,3.2.0.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.1.v3235,org.eclipse.swt.photon.qnx.x86,3.2.1.v3235,org.eclipse.swt.motif.hpux.ia64_32,3.2.1,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/feature.xml" selfVersion="3.2.1.r321_v20060801-clWbqCmjexIWDqg" featureIds="" pluginIds="com.ibm.icu,3.4.5,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.1.r321_v20060721,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.1.R32x_v20060919,org.eclipse.help,3.2.1.R321_v20060920,org.eclipse.swt,3.2.1.v3235e,org.eclipse.jface,3.2.1.M20060908-1000,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20060913-0800,org.eclipse.ui.workbench,3.2.1.M20060906-0800,org.eclipse.update.configurator,3.2.1.v20092006,org.eclipse.swt.win32.win32.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.freebsd.x86,3.2.1.v3235,org.eclipse.swt.gtk.solaris.sparc,3.2.1.v3235,org.eclipse.swt.gtk.solaris.x86,3.2.0.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86_64,3.2.1.v3235,org.eclipse.swt.gtk.freebsd.amd64,3.2.1.v3235,org.eclipse.swt.carbon.macosx,3.2.1.v3235,org.eclipse.swt.motif.aix.ppc,3.2.1.v3235,org.eclipse.swt.motif.hpux.PA_RISC,3.2.1.v3235,org.eclipse.swt.motif.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.ia64,3.2.0.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.1.v3235,org.eclipse.swt.photon.qnx.x86,3.2.1.v3235,org.eclipse.swt.motif.hpux.ia64_32,3.2.1,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml" selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu,3.4.5.20061213,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.2.r322_v20070109a,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.2.R32x_v20070118,org.eclipse.help,3.2.2.R322_v20061213,org.eclipse.swt,3.2.2.v3236b,org.eclipse.jface,3.2.2.M20061214-1200,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20061108,org.eclipse.ui.workbench,3.2.2.M20070119-0800,org.eclipse.update.configurator,3.2.2.R32x_v20070111,org.eclipse.swt.win32.win32.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.solaris.sparc,3.2.2.v3236,org.eclipse.swt.gtk.solaris.x86,3.2.2.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86_64,3.2.2.v3236,org.eclipse.swt.carbon.macosx,3.2.2.v3236,org.eclipse.swt.motif.aix.ppc,3.2.2.v3236,org.eclipse.swt.motif.hpux.PA_RISC,3.2.2.v3236,org.eclipse.swt.motif.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ia64,3.2.2.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.2.v3236,org.eclipse.swt.photon.qnx.x86,3.2.1.v3236,org.eclipse.swt.motif.hpux.ia64_32,3.2.2.R3_2_maintenance,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml" selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu,3.4.5.20061213,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.2.r322_v20070109a,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.2.R32x_v20070118,org.eclipse.help,3.2.2.R322_v20061213,org.eclipse.swt,3.2.2.v3236b,org.eclipse.jface,3.2.2.M20061214-1200,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20061108,org.eclipse.ui.workbench,3.2.2.M20070119-0800,org.eclipse.update.configurator,3.2.2.R32x_v20070111,org.eclipse.swt.win32.win32.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.freebsd.x86,3.2.2.v3236,org.eclipse.swt.gtk.solaris.sparc,3.2.2.v3236,org.eclipse.swt.gtk.solaris.x86,3.2.2.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.2.v3236,org.eclipse.swt.gtk.linux.x86_64,3.2.2.v3236,org.eclipse.swt.gtk.freebsd.amd64,3.2.2.v3236,org.eclipse.swt.carbon.macosx,3.2.2.v3236,org.eclipse.swt.motif.aix.ppc,3.2.2.v3236,org.eclipse.swt.motif.hpux.PA_RISC,3.2.2.v3236,org.eclipse.swt.motif.linux.x86,3.2.2.v3236,org.eclipse.swt.gtk.linux.ia64,3.2.2.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.2.v3236,org.eclipse.swt.photon.qnx.x86,3.2.1.v3236,org.eclipse.swt.motif.hpux.ia64_32,3.2.2.R3_2_maintenance,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml index a063f9c62697..c91d5effdeb2 100644 --- a/java/eclipse/files/patch-features-rcp-source-build.xml +++ b/java/eclipse/files/patch-features-rcp-source-build.xml @@ -1,5 +1,5 @@ ---- features/org.eclipse.rcp.source/build.xml.orig Thu Sep 21 10:55:42 2006 -+++ features/org.eclipse.rcp.source/build.xml Tue Oct 3 14:56:42 2006 +--- features/org.eclipse.rcp.source/build.xml.orig Mon Feb 12 12:45:21 2007 ++++ features/org.eclipse.rcp.source/build.xml Tue Apr 3 17:20:15 2007 @@ -37,6 +37,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> @@ -25,11 +25,11 @@ <property name="arch" value="PA_RISC"/> <property name="os" value="hpux"/> @@ -140,7 +150,7 @@ - <copy todir="${feature.base}/features/org.eclipse.rcp.source_3.2.1.r321_v20060801-clWbqCmjexIWDqg" failonerror="true" overwrite="false"> + <copy todir="${feature.base}/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.2.1.r321_v20060801-clWbqCmjexIWDqg/feature.xml" selfVersion="3.2.1.r321_v20060801-clWbqCmjexIWDqg" featureIds="" pluginIds="com.ibm.icu.source,3.4.5,org.eclipse.rcp.source,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.hpux.motif.ia64_32,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.ia64,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.qnx.photon.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.ppc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.x86_64,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.solaris.gtk.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.solaris.gtk.sparc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.macosx.carbon.ppc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.aix.motif.ppc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.win32.win32.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.solaris.motif.sparc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.motif.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.2.1.r321_v20060801-clWbqCmjexIWDqg/feature.xml" selfVersion="3.2.1.r321_v20060801-clWbqCmjexIWDqg" featureIds="" pluginIds="com.ibm.icu.source,3.4.5,org.eclipse.rcp.source,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.hpux.motif.ia64_32,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.ia64,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.qnx.photon.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.ppc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.x86_64,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.freebsd.gtk.amd64,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.solaris.gtk.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.solaris.gtk.sparc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.macosx.carbon.ppc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.gtk.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.freebsd.gtk.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.aix.motif.ppc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.win32.win32.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.solaris.motif.sparc,3.2.1.r321_v20060801-clWbqCmjexIWDqg,org.eclipse.rcp.source.linux.motif.x86,3.2.1.r321_v20060801-clWbqCmjexIWDqg,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml" selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu.source,3.4.5.20061213,org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.ia64_32,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ia64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.qnx.photon.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86_64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.macosx.carbon.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.aix.motif.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.win32.win32.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.motif.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.motif.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.2.2.r322_v20070104-iwP0VLKnfFC923K/feature.xml" selfVersion="3.2.2.r322_v20070104-iwP0VLKnfFC923K" featureIds="" pluginIds="com.ibm.icu.source,3.4.5.20061213,org.eclipse.rcp.source,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.ia64_32,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ia64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.qnx.photon.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86_64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.freebsd.gtk.amd64,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.freebsd.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.gtk.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.macosx.carbon.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.gtk.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.aix.motif.ppc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.win32.win32.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.solaris.motif.sparc,3.2.2.r322_v20070104-iwP0VLKnfFC923K,org.eclipse.rcp.source.linux.motif.x86,3.2.2.r322_v20070104-iwP0VLKnfFC923K,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h b/java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h deleted file mode 100644 index 10d6dbb14bfa..000000000000 --- a/java/eclipse/files/post-patch-plugins-swt-gtk-os_custom.h +++ /dev/null @@ -1,97 +0,0 @@ ---- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h.orig Thu Sep 21 10:57:34 2006 -+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h Tue Oct 3 15:02:26 2006 -@@ -36,50 +36,50 @@ - #define XRenderFreePicture_LIB "libXrender.so" - #define XRenderSetPictureClipRectangles_LIB "libXrender.so" - #define XRenderSetPictureTransform_LIB "libXrender.so" --#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_get_expanded_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_get_label_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_new_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_set_expanded_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_set_label_LIB "libgtk-x11-2.0.so.0" --#define gtk_expander_set_label_widget_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0" --#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0" --#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0" --#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0" --#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0" --#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0" --#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0" --#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0" --#define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so.0" --#define atk_object_add_relationship_LIB "libatk-1.0.so.0" --#define pango_layout_set_auto_dir_LIB "libpango-1.0.so.0" --#define pango_cairo_create_layout_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_layout_path_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_show_layout_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_font_map_create_context_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_font_map_new_LIB "libpangocairo-1.0.so.0" --#define pango_cairo_font_map_get_default_LIB "libpangocairo-1.0.so.0" --#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so.0" --#define gdk_cairo_region_LIB "libgdk-x11-2.0.so.0" -+#define gtk_entry_text_index_to_layout_index_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so" -+#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so" -+#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_get_expanded_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_get_label_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_new_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_set_expanded_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_set_label_LIB "libgtk-x11-2.0.so" -+#define gtk_expander_set_label_widget_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_selection_count_selected_rows_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so" -+#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so" -+#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so" -+#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so" -+#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so" -+#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so" -+#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so" -+#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so" -+#define gdk_x11_screen_lookup_visual_LIB "libgdk-x11-2.0.so" -+#define atk_object_add_relationship_LIB "libatk-1.0.so" -+#define pango_layout_set_auto_dir_LIB "libpango-1.0.so" -+#define pango_cairo_create_layout_LIB "libpangocairo-1.0.so" -+#define pango_cairo_layout_path_LIB "libpangocairo-1.0.so" -+#define pango_cairo_show_layout_LIB "libpangocairo-1.0.so" -+#define pango_cairo_font_map_create_context_LIB "libpangocairo-1.0.so" -+#define pango_cairo_font_map_new_LIB "libpangocairo-1.0.so" -+#define pango_cairo_font_map_get_default_LIB "libpangocairo-1.0.so" -+#define gdk_cairo_set_source_color_LIB "libgdk-x11-2.0.so" -+#define gdk_cairo_region_LIB "libgdk-x11-2.0.so" - - /* Field accessors */ - #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1 |