[pkg-java] r6428 - trunk/eclipse/debian/patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Thu May 8 14:49:54 UTC 2008


Author: mkoch
Date: 2008-05-08 14:49:53 +0000 (Thu, 08 May 2008)
New Revision: 6428

Modified:
   trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch
Log:
update patch for eclipse 3.3

Modified: trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch	2008-05-08 14:47:59 UTC (rev 6427)
+++ trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch	2008-05-08 14:49:53 UTC (rev 6428)
@@ -21,229 +21,774 @@
 exit 0
 
 @DPATCH@
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml.orig	2007-03-08 10:22:29.000000000 -0500
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2007-03-08 10:27:04.000000000 -0500
-@@ -43,9 +43,6 @@
- 		<mkdir dir="${archiveParentFolder}"/>
- 		<mkdir dir="${assemblyTempDir}"/>
- 		<mkdir dir="${buildLabel}"/>
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml	2008-02-29 21:04:10.000000000 +0100
+@@ -95,9 +95,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -185,9 +182,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.linux.gtk.ia64" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -112,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+@@ -266,9 +260,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -290,9 +281,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -383,9 +371,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.linux.gtk.ia64" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -399,10 +387,6 @@
+@@ -524,10 +509,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -632,10 +613,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -712,10 +689,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -744,10 +717,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -860,10 +829,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2008-02-29 21:04:13.000000000 +0100
+@@ -95,9 +95,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -185,9 +182,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -263,9 +257,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -287,9 +278,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -380,9 +368,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -515,10 +500,6 @@
+ 		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -471,10 +455,6 @@
+@@ -623,10 +604,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
  		</antcall>
  		<antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml.orig	2007-03-08 10:27:26.000000000 -0500
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml	2007-03-08 10:29:13.000000000 -0500
-@@ -43,9 +43,6 @@
- 		<mkdir dir="${archiveParentFolder}"/>
- 		<mkdir dir="${assemblyTempDir}"/>
- 		<mkdir dir="${buildLabel}"/>
+@@ -699,10 +676,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -731,10 +704,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -847,10 +816,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2008-02-29 21:04:21.000000000 +0100
+@@ -98,9 +98,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -194,9 +191,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.launcher.gtk.linux.ppc" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -112,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+@@ -275,9 +269,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -299,9 +290,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -392,9 +380,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -390,10 +378,6 @@
+@@ -534,10 +519,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -642,10 +623,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -722,10 +699,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -754,10 +727,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -870,10 +839,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.s390.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.s390.xml	2008-02-29 21:04:23.000000000 +0100
+@@ -101,9 +101,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -188,9 +185,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -269,9 +263,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -293,9 +284,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -386,9 +374,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -531,10 +516,6 @@
+ 		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -462,10 +446,6 @@
+@@ -639,10 +620,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
  		</antcall>
  		<antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml.orig	2007-03-08 10:30:48.000000000 -0500
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2007-03-08 10:31:34.000000000 -0500
-@@ -43,9 +43,6 @@
- 		<mkdir dir="${archiveParentFolder}"/>
- 		<mkdir dir="${assemblyTempDir}"/>
- 		<mkdir dir="${buildLabel}"/>
+@@ -715,10 +692,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -747,10 +720,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -863,10 +832,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.s390x.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.s390x.xml	2008-02-29 21:04:26.000000000 +0100
+@@ -95,9 +95,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -188,9 +185,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -115,9 +112,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+@@ -266,9 +260,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -290,9 +281,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.rcp.source.linux.gtk.s390x" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -389,9 +377,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -402,10 +390,6 @@
- 		</ant>
+@@ -527,10 +512,6 @@
+ 		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -474,10 +458,6 @@
+@@ -639,10 +620,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
  		</antcall>
  		<antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig	2007-03-08 10:32:06.000000000 -0500
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2007-03-08 10:50:34.000000000 -0500
-@@ -43,9 +43,6 @@
- 		<mkdir dir="${archiveParentFolder}"/>
- 		<mkdir dir="${assemblyTempDir}"/>
- 		<mkdir dir="${buildLabel}"/>
+@@ -715,10 +692,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -747,10 +720,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -863,10 +832,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml	2008-02-29 21:04:34.000000000 +0100
+@@ -98,9 +98,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -185,9 +182,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -118,9 +115,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+@@ -272,9 +266,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -296,9 +287,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -389,9 +377,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.x86_64" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -402,10 +390,6 @@
- 		</ant>
+@@ -530,10 +515,6 @@
+ 		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -478,10 +462,6 @@
+@@ -638,10 +619,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
  		</antcall>
  		<antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml.orig	2007-03-29 23:32:57.000000000 +0200
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-03-29 23:34:19.000000000 +0200
-@@ -43,9 +43,6 @@
- 		<mkdir dir="${archiveParentFolder}"/>
- 		<mkdir dir="${assemblyTempDir}"/>
- 		<mkdir dir="${buildLabel}"/>
+@@ -718,10 +695,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -750,10 +723,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -866,10 +835,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.filesystem.linux.x86_64_1.0.100.v20070510"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig	2008-02-29 20:56:54.000000000 +0100
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml	2008-02-29 21:04:37.000000000 +0100
+@@ -101,9 +101,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.tool" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.http.jetty" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -191,9 +188,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -112,9 +109,6 @@
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+@@ -272,9 +266,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.pluggable.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.preferences" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -299,9 +290,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.compiler.apt" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jface.databinding" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -392,9 +380,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 -			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 -		</ant>
- 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts">
  			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
  		</ant>
-@@ -399,10 +387,6 @@
- 		</ant>
+@@ -534,10 +519,6 @@
+ 		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.tool_1.0.1.v_780_R33x"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ 			<param name="elementName" value="org.eclipse.equinox.http.jetty_1.0.1.R33x_v20070816"/>
  		</antcall>
  		<antcall target="jarUp">
-@@ -471,10 +455,6 @@
+@@ -642,10 +623,6 @@
  		</antcall>
  		<antcall target="jarUp">
  			<param name="source" value="${eclipse.plugins}"/>
--			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.3.1.R33x_v20070801-1930"/>
 -		</antcall>
 -		<antcall target="jarUp">
 -			<param name="source" value="${eclipse.plugins}"/>
- 			<param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ 			<param name="elementName" value="org.eclipse.pde_3.3.1.R33x_r20070920"/>
  		</antcall>
  		<antcall target="jarUp">
---- source-tree/features/org.eclipse.jdt/feature.xml.orig	2007-03-08 11:22:57.000000000 -0500
-+++ source-tree/features/org.eclipse.jdt/feature.xml	2007-03-08 11:27:11.000000000 -0500
-@@ -38,20 +38,6 @@
+@@ -718,10 +695,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.pluggable.core_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.equinox.preferences_3.2.100.v20070522"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -754,10 +727,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jface.databinding_1.1.1.M20070910-0800b"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -870,10 +839,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.3.1.R33x_v20070831-0435"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.core.runtime_3.3.100.v20070530"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+--- source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt.orig	2008-02-29 21:05:52.000000000 +0100
++++ source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2008-02-29 21:06:10.000000000 +0100
+@@ -22,12 +22,10 @@
+ ;../org.eclipse.jdt.ui/ui refactoring
+ ;../org.eclipse.jdt.ui/core extension
+ ;../org.eclipse.jdt.core.manipulation/refactoring
+-;../org.eclipse.jdt.core.manipulation/common
+-;../org.eclipse.jdt.apt.core/src"
++;../org.eclipse.jdt.core.manipulation/common"
+ -d reference/api
+ -classpath @rt@
+ ;../com.ibm.icu_3.6.1.v20070906.jar
+-;../org.eclipse.jdt.apt.core/mirrorapi.jar
+ ;../org.apache.ant_1.7.0.v200706080842/lib/ant.jar
+ ;../org.eclipse.compare/@dot
+ ;../org.eclipse.core.commands/@dot
+--- source-tree/features/org.eclipse.jdt/feature.xml.orig	2008-02-29 21:07:42.000000000 +0100
++++ source-tree/features/org.eclipse.jdt/feature.xml	2008-02-29 21:08:30.000000000 +0100
+@@ -38,43 +38,6 @@
           unpack="false"/>
  
     <plugin
@@ -259,38 +804,67 @@
 -         install-size="0"
 -         version="0.0.0"
 -         unpack="false"/>
+-         
+-  <plugin
+-         id="org.eclipse.jdt.apt.pluggable.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"         
+-         unpack="false"/>         
 -
 -   <plugin
+-         id="org.eclipse.jdt.compiler.apt"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/>
+-         
+-   <plugin
+-         id="org.eclipse.jdt.compiler.tool"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         fragment="true"
+-         unpack="false"/> 
+-
+-   <plugin
           id="org.eclipse.jdt.core"
           download-size="0"
           install-size="0"
---- source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt.orig	2007-03-08 11:29:08.000000000 -0500
-+++ source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt	2007-03-08 11:29:54.000000000 -0500
-@@ -22,12 +22,10 @@
- ;../org.eclipse.jdt.ui/ui refactoring
- ;../org.eclipse.jdt.ui/core extension
- ;../org.eclipse.jdt.core.manipulation/refactoring
--;../org.eclipse.jdt.core.manipulation/common
--;../org.eclipse.jdt.apt.core/src"
-+;../org.eclipse.jdt.core.manipulation/common"
- -d reference/api
- -classpath @rt@
- ;../../baseLocation/plugins/com.ibm.icu_3.4.5.20061213.jar
--;../org.eclipse.jdt.apt.core/mirrorapi.jar
- ;../org.apache.ant/lib/ant.jar
- ;../org.eclipse.compare/@dot
- ;../org.eclipse.core.commands/@dot
---- source-tree/features/org.eclipse.jdt/build.xml.orig	2007-03-08 15:48:37.000000000 -0500
-+++ source-tree/features/org.eclipse.jdt/build.xml	2007-03-08 15:54:29.000000000 -0500
-@@ -77,16 +67,6 @@
+--- source-tree/features/org.eclipse.jdt/build.xml.orig	2008-02-29 21:07:55.000000000 +0100
++++ source-tree/features/org.eclipse.jdt/build.xml	2008-02-29 21:10:50.000000000 +0100
+@@ -32,26 +32,6 @@
  			<property name="os" value="win32"/>
  			<property name="ws" value="win32"/>
  		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.tool" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.compiler.apt" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
 -		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
 -			<property name="arch" value="x86"/>
 -			<property name="os" value="win32"/>
 -			<property name="ws" value="win32"/>
 -		</ant>
+-		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.pluggable.core" target="${target}">
+-			<property name="arch" value="x86"/>
+-			<property name="os" value="win32"/>
+-			<property name="ws" value="win32"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.debug" target="${target}">
+ 			<property name="arch" value="x86"/>
+ 			<property name="os" value="win32"/>
+@@ -92,11 +72,6 @@
+ 			<property name="os" value="win32"/>
+ 			<property name="ws" value="win32"/>
+ 		</ant>
 -		<ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}">
 -			<property name="arch" value="x86"/>
 -			<property name="os" value="win32"/>
@@ -299,12 +873,12 @@
  		<ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}">
  			<property name="arch" value="x86"/>
  			<property name="os" value="win32"/>
-@@ -150,7 +130,7 @@
- 		<copy todir="${feature.base}/features/org.eclipse.jdt_3.2.2.r322_v20070104-R4CR0Znkvtfjv9-" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html"			/>
+@@ -166,7 +141,7 @@
+ 				<include name="license.html"/>
+ 			</fileset>
  		</copy>
--		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.2.r322_v20070104-R4CR0Znkvtfjv9-/feature.xml"  selfVersion="3.2.2.r322_v20070104-R4CR0Znkvtfjv9-" featureIds="" pluginIds="org.eclipse.jdt,3.2.1.r321_v20060823,org.eclipse.ant.ui,3.2.1.r321_v20060828,org.eclipse.jdt.apt.core,3.2.1.R32x_v20060822-2100,org.eclipse.jdt.apt.ui,3.2.1.R32x_v20060822-2100,org.eclipse.jdt.core,3.2.3.v_686_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.2.r322_v20061205,org.eclipse.jdt.debug,3.2.2.r322_v20070130,org.eclipse.jdt.junit,3.2.1.r321_v20060810,org.eclipse.jdt.junit.runtime,3.2.1.r321_v20060721,org.eclipse.jdt.junit4.runtime,1.0.1.r321_v20060905,org.eclipse.jdt.launching,3.2.2.r322_v20061114,org.eclipse.jdt.ui,3.2.2.r322_v20070124,org.junit,3.8.1,org.junit4,4.1.0.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
-+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.2.r322_v20070104-R4CR0Znkvtfjv9-/feature.xml"  selfVersion="3.2.2.r322_v20070104-R4CR0Znkvtfjv9-" featureIds="" pluginIds="org.eclipse.jdt,3.2.1.r321_v20060823,org.eclipse.ant.ui,3.2.1.r321_v20060828,org.eclipse.jdt.core,3.2.3.v_686_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.2.r322_v20061205,org.eclipse.jdt.debug,3.2.2.r322_v20070130,org.eclipse.jdt.junit,3.2.1.r321_v20060810,org.eclipse.jdt.junit.runtime,3.2.1.r321_v20060721,eclipse.jdt.junit4.runtime,1.0.1.r321_v20060905,org.eclipse.jdt.launching,3.2.2.r322_v20061114,org.eclipse.jdt.ui,3.2.2.r322_v20070124,org.junit,3.8.1,org.junit4,4.1.0.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
+-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL/feature.xml"  selfVersion="3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL" featureIds="" pluginIds="org.eclipse.jdt:0.0.0,3.3.0.v20070607-1300,org.eclipse.ant.ui:0.0.0,3.2.200.v20070825_r331,org.eclipse.jdt.apt.core:0.0.0,3.3.1.R33x_v20070831-0435,org.eclipse.jdt.apt.ui:0.0.0,3.3.1.R33x_v20070801-1930,org.eclipse.jdt.apt.pluggable.core:0.0.0,1.0.1.R33x_v20070831-0435,org.eclipse.jdt.compiler.apt:0.0.0,1.0.1.R33x_v20070831-0435,org.eclipse.jdt.compiler.tool:0.0.0,1.0.1.v_780_R33x,org.eclipse.jdt.core:0.0.0,3.3.1.v_780_R33x,org.eclipse.jdt.core.manipulation:0.0.0,1.1.0.v20070606-0010,org.eclipse.jdt.debug.ui:0.0.0,3.2.101.v20070718_r331,org.eclipse.jdt.debug:0.0.0,3.3.1.v20070719_r331,org.eclipse.jdt.junit:0.0.0,3.3.1.r331_v20070829,org.eclipse.jdt.junit.runtime:0.0.0,3.3.0.v20070606-0010,org.eclipse.jdt.junit4.runtime:0.0.0,1.0.100.v20070606-0010,org.eclipse.jdt.launching:0.0.0,3.3.1.v20070808_r331,org.eclipse.jdt.ui:0.0.0,3.3.1.r331_v20070906,org.junit:0.0.0,3.8.2.v200706111738,org.junit4:0.0.0,4.3.1,org.eclipse.jdt.doc.user:0.0.0,3.3.1.r331_v20070912a,org.eclipse.jdt.launching.macosx:0.0.0,3.1.100.v20061211,"/>
++		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL/feature.xml"  selfVersion="3.3.1.r331_v20070629-7o7jE72EDlXAbqAcnbmyg1rf8RIL" featureIds="" pluginIds="org.eclipse.jdt:0.0.0,3.3.0.v20070607-1300,org.eclipse.ant.ui:0.0.0,3.2.200.v20070825_r331,org.eclipse.jdt.core:0.0.0,3.3.1.v_780_R33x,org.eclipse.jdt.core.manipulation:0.0.0,1.1.0.v20070606-0010,org.eclipse.jdt.debug.ui:0.0.0,3.2.101.v20070718_r331,org.eclipse.jdt.debug:0.0.0,3.3.1.v20070719_r331,org.eclipse.jdt.junit:0.0.0,3.3.1.r331_v20070829,org.eclipse.jdt.junit.runtime:0.0.0,3.3.0.v20070606-0010,org.eclipse.jdt.junit4.runtime:0.0.0,1.0.100.v20070606-0010,org.eclipse.jdt.launching:0.0.0,3.3.1.v20070808_r331,org.eclipse.jdt.ui:0.0.0,3.3.1.r331_v20070906,org.junit:0.0.0,3.8.2.v200706111738,org.junit4:0.0.0,4.3.1,org.eclipse.jdt.doc.user:0.0.0,3.3.1.r331_v20070912a,org.eclipse.jdt.launching.macosx:0.0.0,3.1.100.v20061211,"/>
  		<antcall target="rootFiles${os}_${ws}_${arch}"/>
  	</target>
  	<target name="rootFileswin32_win32_x86">




More information about the pkg-java-commits mailing list