Author: mkoch
Date: 2007-10-11 07:03:26 +0000 (Thu, 11 Oct 2007)
New Revision: 4344
Added:
trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch
Removed:
trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/eclipse-jdt-gcj.install
trunk/eclipse/debian/eclipse-jdt.install
trunk/eclipse/debian/extra/links.txt
trunk/eclipse/debian/rules
Log:
- added junit4 support.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2007-10-11 06:48:10 UTC (rev 4343)
+++ trunk/eclipse/debian/changelog 2007-10-11 07:03:26 UTC (rev 4344)
@@ -1,3 +1,9 @@
+eclipse (3.2.2-5) UNRELEASED; urgency=low
+
+ * Added junit4 support.
+
+ -- Michael Koch <[EMAIL PROTECTED]> Thu, 11 Oct 2007 08:16:25 +0200
+
eclipse (3.2.2-4) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2007-10-11 06:48:10 UTC (rev 4343)
+++ trunk/eclipse/debian/control 2007-10-11 07:03:26 UTC (rev 4344)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34),
libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6),
libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config,
libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>=
0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>=
2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc,
pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java,
libxul-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
@@ -97,7 +97,7 @@
Package: eclipse-jdt
Architecture: any
-Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), ant-optional
(>= 1.6.5-3)
+Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), junit4,
ant-optional (>= 1.6.5-3)
Recommends: eclipse-jdt-gcj
Replaces: eclipse-jdt-common
Conflicts: eclipse-jdt-common
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2007-10-11 06:48:10 UTC (rev 4343)
+++ trunk/eclipse/debian/control.in 2007-10-11 07:03:26 UTC (rev 4344)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Jerry Haltom <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>,
Matthias Klose <[EMAIL PROTECTED]>, Stephan Michels <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.34),
libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6),
libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config,
[EMAIL PROTECTED]@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, zip,
sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2),
liblucene-java-doc (>= 1.4.2), junit (>= 3.8), junit4, libjsch-java (>=
0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>=
2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc,
pkg-config, [EMAIL PROTECTED]@
Standards-Version: 3.7.2
Package: eclipse-rcp
@@ -97,7 +97,7 @@
Package: eclipse-jdt
Architecture: any
-Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), @ANT_DEP@
+Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), junit4,
@ANT_DEP@
Recommends: eclipse-jdt-gcj
Replaces: eclipse-jdt-common
Conflicts: eclipse-jdt-common
Modified: trunk/eclipse/debian/eclipse-jdt-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.install 2007-10-11 06:48:10 UTC
(rev 4343)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.install 2007-10-11 07:03:26 UTC
(rev 4344)
@@ -10,5 +10,7 @@
/usr/lib/gcj/eclipse/org.eclipse.jdt.doc.isv_*.jar.??
/usr/lib/gcj/eclipse/org.eclipse.jdt.doc.user_*.jar.??
/usr/lib/gcj/eclipse/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.junit4.runtime_*/junitruntime.jar.??
/usr/lib/gcj/eclipse/org.eclipse.jdt.junit_*/junitsupport.jar.??
/usr/lib/gcj/eclipse/org.junit_*
+/usr/lib/gcj/eclipse/org.junit4_*
Modified: trunk/eclipse/debian/eclipse-jdt.install
===================================================================
--- trunk/eclipse/debian/eclipse-jdt.install 2007-10-11 06:48:10 UTC (rev
4343)
+++ trunk/eclipse/debian/eclipse-jdt.install 2007-10-11 07:03:26 UTC (rev
4344)
@@ -10,9 +10,11 @@
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.doc.user_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.junit_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.junit.runtime_*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.junit4.runtime_*
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.launching_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jdt.ui_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.junit_*
+debian/tmp/usr/lib/eclipse/plugins/org.junit4_*
debian/linda/eclipse-jdt /usr/share/linda/overrides
debian/lintian/eclipse-jdt /usr/share/lintian/overrides
Modified: trunk/eclipse/debian/extra/links.txt
===================================================================
--- trunk/eclipse/debian/extra/links.txt 2007-10-11 06:48:10 UTC (rev
4343)
+++ trunk/eclipse/debian/extra/links.txt 2007-10-11 07:03:26 UTC (rev
4344)
@@ -41,3 +41,4 @@
/usr/share/ant/lib/ant-swing.jar
org.apache.ant/lib/ant-swing.jar
/usr/share/java/lucene-1.4.3.jar
org.apache.lucene/lucene-1.4.3.jar
/usr/share/java/junit.jar org.junit/junit.jar
+/usr/share/java/junit4.jar org.junit4/junit-4.1.jar
Copied: trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch (from rev 4343,
trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch)
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch
(rev 0)
+++ trunk/eclipse/debian/patches/eclipse-disable-apt.dpatch 2007-10-11
07:03:26 UTC (rev 4344)
@@ -0,0 +1,310 @@
+#! /bin/sh -e
+##
+## DP: Debian specific patch, converted from eclipse-disable-junit4-apt.patch
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $patch_opts -p0 < $0;;
+ -unpatch)
+ patch $patch_opts -p0 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+exit 0
+
[EMAIL PROTECTED]@
+--- 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}"/>
+- <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">
+ <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">
+ <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">
+ <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
+ </ant>
+@@ -399,10 +387,6 @@
+ </ant>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ </antcall>
+ <antcall target="jarUp">
+@@ -471,10 +455,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"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ </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}"/>
+- <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">
+ <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">
+ <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">
+ <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
+ </ant>
+@@ -390,10 +378,6 @@
+ </ant>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ </antcall>
+ <antcall target="jarUp">
+@@ -462,10 +446,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"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ </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}"/>
+- <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">
+ <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">
+ <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">
+ <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
+ </ant>
+@@ -402,10 +390,6 @@
+ </ant>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ </antcall>
+ <antcall target="jarUp">
+@@ -474,10 +458,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"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ </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}"/>
+- <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">
+ <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">
+ <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">
+ <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
+ </ant>
+@@ -402,10 +390,6 @@
+ </ant>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ </antcall>
+ <antcall target="jarUp">
+@@ -478,10 +462,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"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ </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}"/>
+- <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">
+ <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">
+ <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">
+ <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
+ </ant>
+@@ -399,10 +387,6 @@
+ </ant>
+ <antcall target="jarUp">
+ <param name="source" value="${eclipse.plugins}"/>
+- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ </antcall>
+ <antcall target="jarUp">
+@@ -471,10 +455,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"/>
+- </antcall>
+- <antcall target="jarUp">
+- <param name="source" value="${eclipse.plugins}"/>
+ <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ </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 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.jdt.apt.core"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.jdt.apt.ui"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- 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 @@
+ <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.ui" target="${target}">
+- <property name="arch" value="x86"/>
+- <property name="os" value="win32"/>
+- <property name="ws" value="win32"/>
+- </ant>
+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.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"
/>
+ </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,"/>
+ <antcall target="rootFiles${os}_${ws}_${arch}"/>
+ </target>
+ <target name="rootFileswin32_win32_x86">
Deleted: trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
2007-10-11 06:48:10 UTC (rev 4343)
+++ trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
2007-10-11 07:03:26 UTC (rev 4344)
@@ -1,516 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Debian specific patch, converted from eclipse-disable-junit4-apt.patch
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch)
- patch $patch_opts -p0 < $0;;
- -unpatch)
- patch $patch_opts -p0 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-exit 0
-
[EMAIL PROTECTED]@
---- 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}"/>
-- <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">
- <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">
- <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">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -178,9 +172,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.jobs"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4"
target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -280,9 +271,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml"
dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml"
dir="plugins/org.eclipse.core.runtime.compatibility.registry"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -399,10 +387,6 @@
- </ant>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
- </antcall>
- <antcall target="jarUp">
-@@ -471,10 +455,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"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
- </antcall>
- <antcall target="jarUp">
-@@ -651,10 +631,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
- </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}"/>
-- <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">
- <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">
- <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">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -175,9 +169,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.jobs"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4"
target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -274,9 +265,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml"
dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml"
dir="plugins/org.eclipse.core.runtime.compatibility.registry"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -390,10 +378,6 @@
- </ant>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
- </antcall>
- <antcall target="jarUp">
-@@ -462,10 +446,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"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
- </antcall>
- <antcall target="jarUp">
-@@ -638,10 +618,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
- </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}"/>
-- <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">
- <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">
- <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">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -184,9 +178,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.jobs"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4"
target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -280,9 +271,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml"
dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml"
dir="plugins/org.eclipse.core.runtime.compatibility.registry"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -402,10 +390,6 @@
- </ant>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
- </antcall>
- <antcall target="jarUp">
-@@ -474,10 +458,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"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
- </antcall>
- <antcall target="jarUp">
-@@ -658,10 +638,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
- </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}"/>
-- <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">
- <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">
- <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">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -187,9 +181,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.jobs"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4"
target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -283,9 +274,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml"
dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml"
dir="plugins/org.eclipse.core.runtime.compatibility.registry"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -402,10 +390,6 @@
- </ant>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
- </antcall>
- <antcall target="jarUp">
-@@ -478,10 +462,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"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
- </antcall>
- <antcall target="jarUp">
-@@ -658,10 +638,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
- </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}"/>
-- <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">
- <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">
- <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">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -178,9 +172,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.jobs"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml" dir="plugins/org.junit4"
target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -274,9 +265,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-- <ant antfile="build.xml"
dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
-- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml"
dir="plugins/org.eclipse.core.runtime.compatibility.registry"
target="gather.bin.parts">
- <property name="destination.temp.folder"
value="${eclipse.plugins}"/>
- </ant>
-@@ -399,10 +387,6 @@
- </ant>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
- </antcall>
- <antcall target="jarUp">
-@@ -471,10 +455,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"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
- </antcall>
- <antcall target="jarUp">
-@@ -647,10 +627,6 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
-- <param name="elementName"
value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName"
value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
- </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 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.jdt.apt.core"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
-- id="org.eclipse.jdt.apt.ui"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jdt.core"
- download-size="0"
- install-size="0"
-@@ -91,13 +77,6 @@
- version="0.0.0"/>
-
- <plugin
-- id="org.eclipse.jdt.junit4.runtime"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.jdt.launching"
- download-size="0"
- install-size="0"
-@@ -118,12 +97,6 @@
- version="3.8.1"/>
-
- <plugin
-- id="org.junit4"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"/>
--
-- <plugin
- id="org.eclipse.jdt.doc.user"
- 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
-@@ -12,11 +12,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml" dir="../../plugins/org.junit4"
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.junit"
target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -27,11 +22,6 @@
- <property name="os" value="win32"/>
- <property name="ws" value="win32"/>
- </ant>
-- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.jdt.junit4.runtime" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml"
dir="../../plugins/org.eclipse.jdt.core" target="${target}">
- <property name="arch" value="x86"/>
- <property name="os" value="win32"/>
-@@ -77,16 +67,6 @@
- <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.ui" target="${target}">
-- <property name="arch" value="x86"/>
-- <property name="os" value="win32"/>
-- <property name="ws" value="win32"/>
-- </ant>
- <ant antfile="build.xml" dir="../../plugins/org.eclipse.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"
/>
- </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,org.eclipse.jdt.launching,3.2.2.r322_v20061114,org.eclipse.jdt.ui,3.2.2.r322_v20070124,org.junit,3.8.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
- <antcall target="rootFiles${os}_${ws}_${arch}"/>
- </target>
- <target name="rootFileswin32_win32_x86">
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2007-10-11 06:48:10 UTC (rev 4343)
+++ trunk/eclipse/debian/rules 2007-10-11 07:03:26 UTC (rev 4344)
@@ -144,7 +144,7 @@
eclipse-libupdatebuild2 \
eclipse-jsch \
eclipse-jsch-sftpexception \
- eclipse-disable-junit4-apt \
+ eclipse-disable-apt \
eclipse-libswt-xpcomgcc4 \
eclipse-icu4j-build-files \
eclipse-jsch-build-files \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
