[pkg-java] r3104 - in trunk/eclipse/debian: . patches source-tree
source-tree/plugins source-tree/plugins/org.eclipse.jdt.core
source-tree/plugins/org.eclipse.jdt.core/batch
source-tree/plugins/org.eclipse.jdt.core/batch/org
source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse
source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt
source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal
source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler
source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch
Vladimír Lapáček
vladimir-guest at alioth.debian.org
Sat Mar 24 15:34:54 CET 2007
Author: vladimir-guest
Date: 2007-03-24 14:34:46 +0000 (Sat, 24 Mar 2007)
New Revision: 3104
Added:
trunk/eclipse/debian/source-tree/
trunk/eclipse/debian/source-tree/plugins/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/
trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/eclipse-platform.install
trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch
trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch
trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch
trunk/eclipse/debian/rules
Log:
Updated to Eclipse 3.2.2
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/changelog 2007-03-24 14:34:46 UTC (rev 3104)
@@ -1,3 +1,13 @@
+eclipse (3.2.2-0ubuntu1) feisty; urgency=low
+
+ * New upstream release
+ * Updated debian/rules for the new upstream
+ * Added com.ibm.icu.source plugin to satisfy dependencies
+ * Update junit4 patch for the new upstream
+ * Updated the eclipse-ecj-gcj patch from Fedora
+
+ -- Vladimír Lapáček <vladimir.lapacek at gmail.com> Thu, 8 Mar 2007 08:28:48 -0500
+
eclipse (3.2.1-6) unstable; urgency=low
* Rebuilt with unstables libc6.
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/control 2007-03-24 14:34:46 UTC (rev 3104)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, 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.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
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, 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.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, firefox-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java, ${shlibs:Depends}
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java, firefox (>= 1.4.99)
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -188,7 +188,7 @@
Package: libswt3.2-gtk-java
Architecture: any
Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
-Recommends: libswt3.2-gtk-gcj, ${shlibs:Depends}
+Recommends: libswt3.2-gtk-gcj, firefox (>= 1.4.99)
Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
Description: Fast and rich GUI toolkit for Java, gtk2 version
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/control.in 2007-03-24 14:34:46 UTC (rev 3104)
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@, @MOZILLA_DEP@
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@, @MOZILLA_DEP@
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Modified: trunk/eclipse/debian/eclipse-platform.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform.install 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/eclipse-platform.install 2007-03-24 14:34:46 UTC (rev 3104)
@@ -7,6 +7,7 @@
debian/tmp/usr/lib/eclipse/features/org.eclipse.platform_*
debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu_*.jar
+debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu.source_*
debian/tmp/usr/lib/eclipse/plugins/com.ibm.icu.base_*.jar
debian/tmp/usr/lib/eclipse/plugins/com.jcraft.jsch_*
debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*
Modified: trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch 2007-03-24 14:34:46 UTC (rev 3104)
@@ -21,71 +21,71 @@
exit 0
@DPATCH@
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml.orig 2006-10-03 16:25:50.000000000 +0000
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-10-03 16:26:58.000000000 +0000
-@@ -97,9 +97,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" 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">
+--- 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.rcp.source.linux.gtk.ia64" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -109,9 +106,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
+@@ -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.junit4" target="gather.bin.parts">
+- <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.ui" target="gather.bin.parts">
+ <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>
-@@ -139,9 +133,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
+@@ -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.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <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.ui.editors" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -157,9 +148,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+@@ -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.search" target="gather.bin.parts">
+ <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>
-@@ -451,10 +439,6 @@
- </antcall>
+@@ -399,10 +387,6 @@
+ </ant>
<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.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -491,10 +475,6 @@
+@@ -471,10 +455,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.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
+ <param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -515,10 +495,6 @@
+@@ -651,10 +631,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
@@ -93,73 +93,74 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
+ <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 2006-10-03 16:25:50.000000000 +0000
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc64.xml 2006-10-03 16:27:25.000000000 +0000
-@@ -94,18 +94,12 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" 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">
+--- 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.rcp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
+@@ -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.junit4" target="gather.bin.parts">
+- <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.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -133,9 +127,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
+@@ -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.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <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.ui.editors" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -151,9 +142,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+@@ -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.search" target="gather.bin.parts">
+ <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>
-@@ -442,10 +430,6 @@
- </antcall>
+@@ -390,10 +378,6 @@
+ </ant>
<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.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -482,10 +466,6 @@
+@@ -462,10 +446,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.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
+ <param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -506,10 +486,6 @@
+@@ -638,10 +618,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
@@ -167,73 +168,74 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
+ <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 2006-10-03 16:25:50.000000000 +0000
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml 2006-10-03 16:30:07.000000000 +0000
-@@ -94,18 +94,12 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" 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">
+--- 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.rcp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
+@@ -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.junit4" target="gather.bin.parts">
+- <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.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -136,9 +130,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
+@@ -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.eclipse.jdt.apt.ui" target="gather.bin.parts">
+- <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.ui.editors" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -154,9 +145,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+@@ -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.search" target="gather.bin.parts">
+ <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>
-@@ -451,10 +439,6 @@
- </antcall>
+@@ -402,10 +390,6 @@
+ </ant>
<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.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -495,10 +479,6 @@
+@@ -474,10 +458,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.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
+ <param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -519,10 +499,6 @@
+@@ -658,10 +638,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
@@ -241,147 +243,74 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
+ <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 2006-10-03 16:25:50.000000000 +0000
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86_64.xml 2006-10-03 16:30:35.000000000 +0000
-@@ -97,18 +97,12 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" 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.rcp" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" 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.ui" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -139,9 +133,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
+--- 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.ui.editors" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -157,9 +148,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.navigator" target="gather.bin.parts">
+@@ -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.junit4.runtime" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -454,10 +442,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.rcp_3.2.0.v20060605"/>
- </antcall>
- <antcall target="jarUp">
-@@ -494,10 +478,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"/>
-- </antcall>
-- <antcall target="jarUp">
-- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
- </antcall>
- <antcall target="jarUp">
-@@ -518,10 +498,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.search_3.2.1.r321_v20060726"/>
- </antcall>
- <antcall target="jarUp">
---- source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig 2006-10-03 16:25:50.000000000 +0000
-+++ source-tree/assemble.org.eclipse.sdk.linux.gtk.x86.xml 2006-10-03 16:31:06.000000000 +0000
-@@ -97,18 +97,12 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.browser" 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.rcp" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts">
+@@ -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.ui" target="gather.bin.parts">
+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts">
<property name="destination.temp.folder" value="${eclipse.plugins}"/>
</ant>
-@@ -136,9 +130,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts">
+@@ -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.apt.ui" target="gather.bin.parts">
-- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
-- </ant>
- <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
- <property name="destination.temp.folder" value="${eclipse.plugins}"/>
- </ant>
-@@ -157,9 +148,6 @@
- <ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.linux.x86" 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.search" target="gather.bin.parts">
+ <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>
-@@ -454,10 +442,6 @@
- </antcall>
+@@ -402,10 +390,6 @@
+ </ant>
<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.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.rcp_3.2.0.v20060605"/>
+ <param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
</antcall>
<antcall target="jarUp">
-@@ -494,10 +478,6 @@
+@@ -478,10 +462,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.apt.core_3.2.1.R32x_v20060822-2100"/>
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.ui.editors_3.2.1.r321_v20060721"/>
+ <param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
</antcall>
<antcall target="jarUp">
-@@ -522,10 +502,6 @@
+@@ -658,10 +638,6 @@
</antcall>
<antcall target="jarUp">
<param name="source" value="${eclipse.plugins}"/>
@@ -389,63 +318,11 @@
- </antcall>
- <antcall target="jarUp">
- <param name="source" value="${eclipse.plugins}"/>
- <param name="elementName" value="org.eclipse.search_3.2.1.r321_v20060726"/>
+ <param name="elementName" value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
</antcall>
<antcall target="jarUp">
---- source-tree/features/org.eclipse.jdt/build.xml.orig 2006-10-03 16:38:23.000000000 +0000
-+++ source-tree/features/org.eclipse.jdt/build.xml 2006-10-03 16:42:52.000000000 +0000
-@@ -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.1.r321_v20060905-R4CM1Znkvre9wC-" 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.1.r321_v20060905-R4CM1Znkvre9wC-/feature.xml" selfVersion="3.2.1.r321_v20060905-R4CM1Znkvre9wC-" 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.1.v_677_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.1.r321_v20060918,org.eclipse.jdt.debug,3.2.1.r321_v20060731,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.1.r321_v20060731,org.eclipse.jdt.ui,3.2.1.r321_v20060907,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.1.r321_v20060905-R4CM1Znkvre9wC-/feature.xml" selfVersion="3.2.1.r321_v20060905-R4CM1Znkvre9wC-" 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.1.v_677_R32x,org.eclipse.jdt.core.manipulation,1.0.1.r321_v20060721,org.eclipse.jdt.debug.ui,3.2.1.r321_v20060918,org.eclipse.jdt.debug,3.2.1.r321_v20060731,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.1.r321_v20060731,org.eclipse.jdt.ui,3.2.1.r321_v20060907,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">
---- source-tree/features/org.eclipse.jdt/feature.xml.orig 2006-10-03 16:38:59.000000000 +0000
-+++ source-tree/features/org.eclipse.jdt/feature.xml 2006-10-03 16:44:27.000000000 +0000
+--- 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"/>
@@ -476,7 +353,7 @@
- install-size="0"
- version="0.0.0"
- unpack="false"/>
--
+-
- <plugin
id="org.eclipse.jdt.launching"
download-size="0"
@@ -489,24 +366,13 @@
- 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/buildDoc.xml.orig 2006-10-03 16:49:20.000000000 +0000
-+++ source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2006-10-03 16:50:13.000000000 +0000
-@@ -75,7 +75,7 @@
- <exec dir="." executable="${javadoc}" output="doc.bin.log">
- <arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
- </exec>
-- <antcall target="generateJdtAptJavadoc" />
-+ <!-- <antcall target="generateJdtAptJavadoc" /> -->
- </target>
-
- <target name="generateJdtAptJavadoc">
---- source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt.orig 2006-10-03 16:49:31.000000000 +0000
-+++ source-tree/plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt 2006-10-03 16:50:44.000000000 +0000
+--- 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
@@ -516,8 +382,60 @@
+;../org.eclipse.jdt.core.manipulation/common"
-d reference/api
-classpath @rt@
- ;../../baseLocation/plugins/com.ibm.icu_3.4.5.jar
+ ;../../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/patches/eclipse-ecj-gcj.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/patches/eclipse-ecj-gcj.dpatch 2007-03-24 14:34:46 UTC (rev 3104)
@@ -21,749 +21,13 @@
exit 0
@DPATCH@
-Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java
+Index: source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
===================================================================
-RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v
-retrieving revision 1.254
-diff -u -r1.254 Main.java
---- source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2 May 2006 13:45:31 -0000 1.254
-+++ source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java 18 Jul 2006 22:46:41 -0000
-@@ -1392,6 +1392,391 @@
- }
-
- /*
-+Handle a single warning token.
-+*/
-+protected void handleWarningToken(String token, boolean isEnabling,
-+ boolean useEnableJavadoc) throws InvalidInputException {
-+ if (token.equals("constructorName")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMethodWithConstructorName,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("pkgDefaultMethod") || token.equals("packageDefaultMethod")/*backward compatible*/ ) { //$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportHiddenCatchBlock,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("deprecation")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDeprecation,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode,
-+ CompilerOptions.DISABLED);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod,
-+ CompilerOptions.DISABLED);
-+ } else if (token.equals("allDeprecation")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDeprecation,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode,
-+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod,
-+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-+ } else if (token.equals("unusedLocal") || token.equals("unusedLocals")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedLocal,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unusedArgument") || token.equals("unusedArguments")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedParameter,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unusedImport") || token.equals("unusedImports")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedImport,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unusedPrivate")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedPrivateMember,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unusedLabel")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedLabel,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("localHiding")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportLocalVariableHiding,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("fieldHiding")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportFieldHiding,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("specialParamHiding")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportSpecialParameterHidingField,
-+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-+ } else if (token.equals("conditionAssign")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportPossibleAccidentalBooleanAssignment,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("syntheticAccess") //$NON-NLS-1$
-+ || token.equals("synthetic-access")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportSyntheticAccessEmulation,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("nls")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportNonExternalizedStringLiteral,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("staticReceiver")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("indirectStatic")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportIndirectStaticAccess,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("noEffectAssign")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportNoEffectAssignment,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("intfNonInherited") || token.equals("interfaceNonInherited")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportIncompatibleNonInheritedInterfaceMethod,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("charConcat") || token.equals("noImplicitStringConversion")/*backward compatible*/) {//$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportNoImplicitStringConversion,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("semicolon")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportEmptyStatement,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("serial")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingSerialVersion,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("emptyBlock")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUndocumentedEmptyBlock,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("uselessTypeCheck")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnnecessaryTypeCheck,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unchecked") || token.equals("unsafe")) {//$NON-NLS-1$ //$NON-NLS-2$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUncheckedTypeOperation,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("raw")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportRawTypeReference,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("finalBound")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportFinalParameterBound,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("suppress")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_SuppressWarnings,
-+ isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-+ } else if (token.equals("warningToken")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnhandledWarningToken,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unnecessaryElse")) {//$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnnecessaryElse,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("javadoc")) {//$NON-NLS-1$
-+ if (!useEnableJavadoc) {
-+ this.options.put(
-+ CompilerOptions.OPTION_DocCommentSupport,
-+ isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
-+ }
-+ // if disabling then it's not necessary to set other javadoc options
-+ if (isEnabling) {
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadoc,
-+ CompilerOptions.WARNING);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadocTags,
-+ CompilerOptions.ENABLED);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef,
-+ CompilerOptions.DISABLED);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef,
-+ CompilerOptions.DISABLED);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
-+ CompilerOptions.PRIVATE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingJavadocTags,
-+ CompilerOptions.WARNING);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
-+ CompilerOptions.PRIVATE);
-+ }
-+ } else if (token.equals("allJavadoc")) { //$NON-NLS-1$
-+ if (!useEnableJavadoc) {
-+ this.options.put(
-+ CompilerOptions.OPTION_DocCommentSupport,
-+ isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
-+ }
-+ // if disabling then it's not necessary to set other javadoc options
-+ if (isEnabling) {
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadoc,
-+ CompilerOptions.WARNING);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadocTags,
-+ CompilerOptions.ENABLED);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
-+ CompilerOptions.PRIVATE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingJavadocTags,
-+ CompilerOptions.WARNING);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
-+ CompilerOptions.PRIVATE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingJavadocComments,
-+ CompilerOptions.WARNING);
-+ }
-+ } else if (token.startsWith("tasks")) { //$NON-NLS-1$
-+ String taskTags = ""; //$NON-NLS-1$
-+ int start = token.indexOf('(');
-+ int end = token.indexOf(')');
-+ if (start >= 0 && end >= 0 && start < end){
-+ taskTags = token.substring(start+1, end).trim();
-+ taskTags = taskTags.replace('|',',');
-+ }
-+ if (taskTags.length() == 0){
-+ throw new InvalidInputException(Main.bind("configure.invalidTaskTag", token)); //$NON-NLS-1$
-+ }
-+ this.options.put(
-+ CompilerOptions.OPTION_TaskTags,
-+ isEnabling ? taskTags : ""); //$NON-NLS-1$
-+ } else if (token.equals("assertIdentifier")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportAssertIdentifier,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("enumIdentifier")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportEnumIdentifier,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("finally")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportFinallyBlockNotCompletingNormally,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unusedThrown")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unqualifiedField") //$NON-NLS-1$
-+ || token.equals("unqualified-field-access")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnqualifiedFieldAccess,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("typeHiding")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportTypeParameterHiding,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("varargsCast")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportVarargsArgumentNeedCast,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("null")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportNullReference,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("boxing")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportAutoboxing,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("over-ann")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingOverrideAnnotation,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("dep-ann")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportMissingDeprecatedAnnotation,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("intfAnnotation")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportAnnotationSuperInterface,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("enumSwitch") //$NON-NLS-1$
-+ || token.equals("incomplete-switch")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportIncompleteEnumSwitch,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("hiding")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportHiddenCatchBlock,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportLocalVariableHiding,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportFieldHiding,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportTypeParameterHiding,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("static-access")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportIndirectStaticAccess,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("unused")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedLocal,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedParameter,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedImport,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedPrivateMember,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportUnusedLabel,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("paramAssign")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportParameterAssignment,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("discouraged")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportDiscouragedReference,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("forbidden")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportForbiddenReference,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else if (token.equals("fallthrough")) { //$NON-NLS-1$
-+ this.options.put(
-+ CompilerOptions.OPTION_ReportFallthroughCase,
-+ isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-+ } else {
-+ throw new InvalidInputException(Main.bind("configure.invalidWarning", token)); //$NON-NLS-1$
-+ }
-+}
-+
-+/*
-+Handle extdirs processing
-+*/
-+protected ArrayList handleExtdirs(ArrayList extdirsClasspaths) {
-+ final File javaHome = getJavaHome();
-+ final int DEFAULT_SIZE_CLASSPATH = 4;
-+
-+ /*
-+ * Feed endorsedDirClasspath according to:
-+ * - -extdirs first if present;
-+ * - else java.ext.dirs if defined;
-+ * - else default extensions directory for the platform.
-+ */
-+ if (extdirsClasspaths == null) {
-+ extdirsClasspaths = new ArrayList(DEFAULT_SIZE_CLASSPATH);
-+ String extdirsStr = System.getProperty("java.ext.dirs"); //$NON-NLS-1$
-+ if (extdirsStr == null) {
-+ extdirsClasspaths.add(javaHome.getAbsolutePath() + "/lib/ext"); //$NON-NLS-1$
-+ } else {
-+ StringTokenizer tokenizer = new StringTokenizer(extdirsStr, File.pathSeparator);
-+ while (tokenizer.hasMoreTokens())
-+ extdirsClasspaths.add(tokenizer.nextToken());
-+ }
-+ }
-+
-+ /*
-+ * Feed extdirsClasspath with the entries found into the directories listed by
-+ * extdirsNames.
-+ */
-+ if (extdirsClasspaths.size() != 0) {
-+ File[] directoriesToCheck = new File[extdirsClasspaths.size()];
-+ for (int i = 0; i < directoriesToCheck.length; i++)
-+ directoriesToCheck[i] = new File((String) extdirsClasspaths.get(i));
-+ extdirsClasspaths.clear();
-+ File[][] extdirsJars = getLibrariesFiles(directoriesToCheck);
-+ if (extdirsJars != null) {
-+ for (int i = 0, max = extdirsJars.length; i < max; i++) {
-+ File[] current = extdirsJars[i];
-+ if (current != null) {
-+ for (int j = 0, max2 = current.length; j < max2; j++) {
-+ FileSystem.Classpath classpath =
-+ FileSystem.getClasspath(
-+ current[j].getAbsolutePath(),
-+ null, null);
-+ if (classpath != null) {
-+ extdirsClasspaths.add(classpath);
-+ }
-+ }
-+ } else if (directoriesToCheck[i].isFile()) {
-+ this.logger.logIncorrectExtDirsEntry(directoriesToCheck[i].getAbsolutePath());
-+ }
-+ }
-+ }
-+ }
-+
-+ return extdirsClasspaths;
-+}
-+
-+/*
- Decode the command line arguments
- */
- public void configure(String[] argv) throws InvalidInputException {
-@@ -1848,326 +2233,7 @@
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- tokenCounter++;
-- if (token.equals("constructorName")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportMethodWithConstructorName,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("pkgDefaultMethod") || token.equals("packageDefaultMethod")/*backward compatible*/ ) { //$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportOverridingPackageDefaultMethod,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("maskedCatchBlock") || token.equals("maskedCatchBlocks")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportHiddenCatchBlock,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("deprecation")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportDeprecation,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode,
-- CompilerOptions.DISABLED);
-- this.options.put(
-- CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod,
-- CompilerOptions.DISABLED);
-- } else if (token.equals("allDeprecation")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportDeprecation,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode,
-- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-- this.options.put(
-- CompilerOptions.OPTION_ReportDeprecationWhenOverridingDeprecatedMethod,
-- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-- } else if (token.equals("unusedLocal") || token.equals("unusedLocals")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedLocal,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unusedArgument") || token.equals("unusedArguments")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedParameter,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unusedImport") || token.equals("unusedImports")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedImport,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unusedPrivate")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedPrivateMember,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unusedLabel")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedLabel,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("localHiding")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportLocalVariableHiding,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("fieldHiding")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportFieldHiding,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("specialParamHiding")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportSpecialParameterHidingField,
-- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-- } else if (token.equals("conditionAssign")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportPossibleAccidentalBooleanAssignment,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("syntheticAccess") //$NON-NLS-1$
-- || token.equals("synthetic-access")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportSyntheticAccessEmulation,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("nls")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportNonExternalizedStringLiteral,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("staticReceiver")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("indirectStatic")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportIndirectStaticAccess,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("noEffectAssign")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportNoEffectAssignment,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("intfNonInherited") || token.equals("interfaceNonInherited")/*backward compatible*/) { //$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportIncompatibleNonInheritedInterfaceMethod,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("charConcat") || token.equals("noImplicitStringConversion")/*backward compatible*/) {//$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportNoImplicitStringConversion,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("semicolon")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportEmptyStatement,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("serial")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingSerialVersion,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("emptyBlock")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUndocumentedEmptyBlock,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("uselessTypeCheck")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnnecessaryTypeCheck,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unchecked") || token.equals("unsafe")) {//$NON-NLS-1$ //$NON-NLS-2$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUncheckedTypeOperation,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("raw")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportRawTypeReference,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("finalBound")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportFinalParameterBound,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("suppress")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_SuppressWarnings,
-- isEnabling ? CompilerOptions.ENABLED : CompilerOptions.DISABLED);
-- } else if (token.equals("warningToken")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnhandledWarningToken,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unnecessaryElse")) {//$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnnecessaryElse,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("javadoc")) {//$NON-NLS-1$
-- if (!useEnableJavadoc) {
-- this.options.put(
-- CompilerOptions.OPTION_DocCommentSupport,
-- isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
-- }
-- // if disabling then it's not necessary to set other javadoc options
-- if (isEnabling) {
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadoc,
-- CompilerOptions.WARNING);
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadocTags,
-- CompilerOptions.ENABLED);
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef,
-- CompilerOptions.DISABLED);
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef,
-- CompilerOptions.DISABLED);
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
-- CompilerOptions.PRIVATE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingJavadocTags,
-- CompilerOptions.WARNING);
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
-- CompilerOptions.PRIVATE);
-- }
-- } else if (token.equals("allJavadoc")) { //$NON-NLS-1$
-- if (!useEnableJavadoc) {
-- this.options.put(
-- CompilerOptions.OPTION_DocCommentSupport,
-- isEnabling ? CompilerOptions.ENABLED: CompilerOptions.DISABLED);
-- }
-- // if disabling then it's not necessary to set other javadoc options
-- if (isEnabling) {
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadoc,
-- CompilerOptions.WARNING);
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadocTags,
-- CompilerOptions.ENABLED);
-- this.options.put(
-- CompilerOptions.OPTION_ReportInvalidJavadocTagsVisibility,
-- CompilerOptions.PRIVATE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingJavadocTags,
-- CompilerOptions.WARNING);
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility,
-- CompilerOptions.PRIVATE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingJavadocComments,
-- CompilerOptions.WARNING);
-- }
-- } else if (token.startsWith("tasks")) { //$NON-NLS-1$
-- String taskTags = ""; //$NON-NLS-1$
-- int start = token.indexOf('(');
-- int end = token.indexOf(')');
-- if (start >= 0 && end >= 0 && start < end){
-- taskTags = token.substring(start+1, end).trim();
-- taskTags = taskTags.replace('|',',');
-- }
-- if (taskTags.length() == 0){
-- throw new InvalidInputException(Main.bind("configure.invalidTaskTag", token)); //$NON-NLS-1$
-- }
-- this.options.put(
-- CompilerOptions.OPTION_TaskTags,
-- isEnabling ? taskTags : ""); //$NON-NLS-1$
-- } else if (token.equals("assertIdentifier")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportAssertIdentifier,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("enumIdentifier")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportEnumIdentifier,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("finally")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportFinallyBlockNotCompletingNormally,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unusedThrown")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unqualifiedField") //$NON-NLS-1$
-- || token.equals("unqualified-field-access")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnqualifiedFieldAccess,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("typeHiding")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportTypeParameterHiding,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("varargsCast")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportVarargsArgumentNeedCast,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("null")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportNullReference,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("boxing")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportAutoboxing,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("over-ann")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingOverrideAnnotation,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("dep-ann")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportMissingDeprecatedAnnotation,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("intfAnnotation")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportAnnotationSuperInterface,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("enumSwitch") //$NON-NLS-1$
-- || token.equals("incomplete-switch")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportIncompleteEnumSwitch,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("hiding")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportHiddenCatchBlock,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportLocalVariableHiding,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportFieldHiding,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportTypeParameterHiding,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("static-access")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportNonStaticAccessToStatic,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportIndirectStaticAccess,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("unused")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedLocal,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedParameter,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedImport,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedPrivateMember,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedDeclaredThrownException,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- this.options.put(
-- CompilerOptions.OPTION_ReportUnusedLabel,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("paramAssign")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportParameterAssignment,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("discouraged")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportDiscouragedReference,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("forbidden")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportForbiddenReference,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else if (token.equals("fallthrough")) { //$NON-NLS-1$
-- this.options.put(
-- CompilerOptions.OPTION_ReportFallthroughCase,
-- isEnabling ? CompilerOptions.WARNING : CompilerOptions.IGNORE);
-- } else {
-- throw new InvalidInputException(Main.bind("configure.invalidWarning", token)); //$NON-NLS-1$
-- }
-+ handleWarningToken(token, isEnabling, useEnableJavadoc);
- }
- if (tokenCounter == 0)
- throw new InvalidInputException(
-@@ -2708,7 +2774,7 @@
- this.timesCounter = 0;
- }
- }
--private void disableWarnings() {
-+protected void disableWarnings() {
- Object[] entries = this.options.entrySet().toArray();
- for (int i = 0, max = entries.length; i < max; i++) {
- Map.Entry entry = (Map.Entry) entries[i];
-Index: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
-===================================================================
-RCS file: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
-diff -N batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+RCS file: source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+diff -N source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,442 @@
+@@ -0,0 +1,495 @@
+/**
+ *
+ */
@@ -937,16 +201,16 @@
+ String customEncoding = null;
+ AccessRule[] accessRules = new AccessRule[0];
+ String templates[] = new String[AccessRuleSet.MESSAGE_TEMPLATES_LENGTH];
-+ templates[0] = Main.bind(
++ templates[0] = this.bind(
+ "template.restrictedAccess.type", //$NON-NLS-1$
+ new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$
-+ templates[1] = Main.bind(
++ templates[1] = this.bind(
+ "template.restrictedAccess.constructor", //$NON-NLS-1$
+ new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$
-+ templates[2] = Main.bind(
++ templates[2] = this.bind(
+ "template.restrictedAccess.method", //$NON-NLS-1$
+ new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$
-+ templates[3] = Main.bind(
++ templates[3] = this.bind(
+ "template.restrictedAccess.field", //$NON-NLS-1$
+ new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$
+ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, templates);
@@ -997,6 +261,20 @@
+ super.handleWarningToken(token, isEnabling, useEnableJavadoc);
+ }
+
++ private void turnWarningsToErrors() {
++ Object[] entries = this.options.entrySet().toArray();
++ for (int i = 0, max = entries.length; i < max; i++) {
++ Map.Entry entry = (Map.Entry) entries[i];
++ if (!(entry.getKey() instanceof String))
++ continue;
++ if (!(entry.getValue() instanceof String))
++ continue;
++ if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) {
++ this.options.put(entry.getKey(), CompilerOptions.ERROR);
++ }
++ }
++ }
++
+ /**
+ * Set the debug level to the indicated value. The level should be
+ * between 0 and 2, inclusive, but this is not checked.
@@ -1035,6 +313,30 @@
+ }
+ }
+
++ private void handleWall(boolean enable) throws InvalidInputException {
++ // A somewhat arbitrary list. We use the GCC names
++ // here, and the local handleWarningToken translates
++ // for us.
++ handleWarningToken("constructor-name", enable, false);
++ handleWarningToken("pkg-default-method", enable, false);
++ handleWarningToken("masked-catch-block", enable, false);
++ handleWarningToken("all-deprecation", enable, false);
++ handleWarningToken("unused-local", enable, false);
++ handleWarningToken("unused-label", enable, false);
++ handleWarningToken("static-receiver", enable, false);
++ handleWarningToken("indirect-static", enable, false);
++ handleWarningToken("no-effect-assign", enable, false);
++ handleWarningToken("char-concat", enable, false);
++ handleWarningToken("useless-type-check", enable, false);
++ handleWarningToken("final-bound", enable, false);
++ handleWarningToken("assert-identifier", enable, false);
++ handleWarningToken("enum-identifier", enable, false);
++ handleWarningToken("finally", enable, false);
++ handleWarningToken("varargs-cast", enable, false);
++ handleWarningToken("unused", enable, false);
++ handleWarningToken("forbidden", enable, false);
++ }
++
+ public void configure(String[] argv) throws InvalidInputException {
+ if ((argv == null) || (argv.length == 0)) {
+ // This is a "can't happen".
@@ -1045,6 +347,8 @@
+ ArrayList otherFiles = new ArrayList();
+ String classpath = null;
+ boolean haveFileList = false;
++ boolean inhibitAllWarnings = false;
++ boolean treatWarningsAsErrors = false;
+
+ for (int i = 0; i < argv.length; ++i) {
+ String currentArg = argv[i];
@@ -1056,7 +360,7 @@
+ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
+ } catch (UnsupportedEncodingException e) {
+ throw new InvalidInputException(
-+ Main.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
++ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
+ }
+ this.options.put(CompilerOptions.OPTION_Encoding, encoding);
+ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
@@ -1067,23 +371,21 @@
+ errorMessage.append(' ');
+ errorMessage.append(arg);
+ throw new InvalidInputException(
-+ Main.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
++ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+ }
+ this.destinationPath = arg;
-+ this.generatePackagesStructure = true;
++ // this.generatePackagesStructure = true;
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+ classpath = getArgument(currentArg);
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
+ ++i;
+ if (i >= argv.length)
-+ // FIXME: i18n.
-+ throw new InvalidInputException("-fzip-target requires argument");
++ throw new InvalidInputException(this.bind("gcc.zipArg")); //$NON-NLS-1$
+ this.zipDestination = argv[i];
+ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
+ ++i;
+ if (i >= argv.length)
-+ // FIXME: i18n.
-+ throw new InvalidInputException("-fzip-dependency requires argument");
++ throw new InvalidInputException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$
+ this.zipDependencyDestination = argv[i];
+ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
+ if (currentArg.equals("-g0")) { //$NON-NLS-1$
@@ -1095,12 +397,20 @@
+ // Handle -g1 but also things like -gstabs.
+ setDebugLevel(1);
+ }
++ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$
++ treatWarningsAsErrors = true;
++ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$
++ treatWarningsAsErrors = false;
++ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$
++ handleWall(true);
++ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$
++ handleWall(false);
+ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
+ handleWarningToken(currentArg.substring(5), false, false);
+ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
+ handleWarningToken(currentArg.substring(2), true, false);
+ } else if (currentArg.equals("-w")) { //$NON-NLS-1$
-+ disableWarnings();
++ inhibitAllWarnings = true;
+ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
+ // Ignore.
+ } else if (currentArg.equals("-v")) { //$NON-NLS-1$
@@ -1118,7 +428,7 @@
+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
+ } else {
-+ throw new InvalidInputException(Main.bind("configure.source", currentArg)); //$NON-NLS-1$
++ throw new InvalidInputException(this.bind("configure.source", currentArg)); //$NON-NLS-1$
+ }
+ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
+ currentArg = getArgument(currentArg);
@@ -1137,7 +447,7 @@
+ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
+ } else {
-+ throw new InvalidInputException(Main.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
++ throw new InvalidInputException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
+ }
+ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
+ haveFileList = true;
@@ -1157,12 +467,14 @@
+
+ this.filenames = (String[]) files.toArray(new String[0]);
+ this.encodings = new String[this.filenames.length];
++ this.destinationPaths = new String[this.filenames.length];
++ for (int i = 0; i < this.filenames.length; ++i)
++ this.destinationPaths[i] = this.destinationPath;
+
+ // Classpath processing.
+ ArrayList result = new ArrayList();
+ if (classpath == null)
-+ // FIXME: update resources.
-+ throw new InvalidInputException("no classpath specified");
++ throw new InvalidInputException(this.bind("gcc.noClasspath")); //$NON-NLS-1$
+ parsePath(result, classpath);
+
+ // We must always create both output files, even if one is not used.
@@ -1174,6 +486,11 @@
+ fail(err);
+ }
+
++ if (inhibitAllWarnings)
++ disableWarnings();
++ if (treatWarningsAsErrors)
++ turnWarningsToErrors();
++
+ this.checkedClasspaths = new FileSystem.Classpath[result.size()];
+ result.toArray(this.checkedClasspaths);
+
Modified: trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/patches/eclipse-icu4j-build-files.dpatch 2007-03-24 14:34:46 UTC (rev 3104)
@@ -371,3 +371,35 @@
+ </target>
+
+</project>
+--- source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/META-INF/MANIFEST.MF.orig 2007-03-11 00:18:12.000000000 -0500
++++ source-tree/baseLocation/plugins/icu4j-build/com.ibm.icu/META-INF/MANIFEST.MF 2006-12-13 17:17:00.000000000 -0500
+@@ -2,17 +2,23 @@
+ Bundle-ManifestVersion: 2
+ Bundle-Name: %pluginName
+ Bundle-SymbolicName: com.ibm.icu; singleton:=true
+-Bundle-Version: 3.4.5
++Bundle-Version: 3.4.5.20061213
+ Bundle-Vendor: %providerName
+ Bundle-Localization: plugin
+ Bundle-Copyright: Licensed Materials - Property of IBM
+ (C) Copyright IBM Corp. 2000, 2006. All Rights Reserved.
+ IBM is a registered trademark of IBM Corp.
+-Export-Package: com.ibm.icu.lang,
+- com.ibm.icu.math,
+- com.ibm.icu.text,
+- com.ibm.icu.util
++Export-Package: com.ibm.icu.lang;version="3.4.5",
++ com.ibm.icu.math;version="3.4.5",
++ com.ibm.icu.text;version="3.4.5",
++ com.ibm.icu.util;version="3.4.5",
++ com.ibm.icu.impl;x-internal:=true,
++ com.ibm.icu.impl.data;x-internal:=true,
++ com.ibm.icu.impl.data.icudt34b;x-internal:=true,
++ com.ibm.icu.impl.data.icudt34b.coll;x-internal:=true,
++ com.ibm.icu.impl.data.icudt34b.rbnf;x-internal:=true,
++ com.ibm.icu.impl.data.icudt34b.translit;x-internal:=true
+ Eclipse-LazyStart: true
+ Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
+ J2SE-1.3
+-
++Bundle-ClassPath: icu-data.jar,.
Modified: trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch 2007-03-24 14:34:46 UTC (rev 3104)
@@ -193,3 +193,14 @@
<delete dir="${temp.folder}"/>
</target>
+--- source-tree/features/org.eclipse.platform/build.xml.orig 2007-03-21 00:28:21.000000000 +0100
++++ source-tree/features/org.eclipse.platform/build.xml 2007-03-21 00:29:56.000000000 +0100
+@@ -376,7 +376,7 @@
+ <copy todir="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" />
+ </copy>
+- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml" selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,4.1.130.v20060601,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/>
++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.2.2.r322_v20070119-CXMbUe9K_WF26uA/feature.xml" selfVersion="3.2.2.r322_v20070119-CXMbUe9K_WF26uA" featureIds="org.eclipse.rcp,3.2.2.r322_v20070104-iwP0VLKnfFC923K," pluginIds="com.jcraft.jsch,0.1.28,org.apache.ant,1.6.5,org.apache.lucene,1.4.103.v20060601,org.eclipse.ant.core,3.1.100.v20060531,org.eclipse.compare,3.2.1.M20060711,org.eclipse.core.boot,3.1.100.v20060603,org.eclipse.core.filebuffers,3.2.1.r321_v20060721,org.eclipse.core.filesystem,1.0.0.v20060603,org.eclipse.core.resources,3.2.2.R32x_v20061218,org.eclipse.core.resources.compatibility,3.2.0.v20060603,org.eclipse.core.runtime.compatibility,3.1.100.v20060603,org.eclipse.osgi.services,3.1.100.v20060601,org.eclipse.osgi.util,3.1.100.v20060601,org.eclipse.core.variables,3.1.100.v20060605,org.eclipse.debug.core,3.2.1.v20060823,org.eclipse.debug.ui,3.2.2.r322_v20070202,org.eclipse.help.webapp,3.2.2.R322_v20061114,org.eclipse.help.base,3.2.2.R322_v20061207,org.eclipse.help.ui,3.2.0.v20060602,org.eclipse.help.appserver,3.1.100.v20060602,org.eclipse.ltk.core.refactoring,3.2.1.r321_v20060823,org.eclipse.ltk.ui.refactoring,3.2.2.r322_v20070124,org.eclipse.platform,3.2.2.r322_v20070117b,org.eclipse.platform.doc.user,3.2.1.R32x_v200608101155,org.eclipse.search,3.2.1.r321_v20060726,org.eclipse.team.core,3.2.2.M20061114,org.eclipse.team.cvs.core,3.2.2.M20061205,org.eclipse.team.cvs.ssh,3.2.1.M20061205,org.eclipse.team.cvs.ssh2,3.2.1.M20061205,org.eclipse.team.cvs.ui,3.2.2.M20061121,org.eclipse.team.ui,3.2.1.M200608151725,org.eclipse.tomcat,5.5.17,org.eclipse.text,3.2.0.v20060605-1400,org.eclipse.jface.text,3.2.2.r322_v20070104,org.eclipse.ui.console,3.1.100.v20060605,org.eclipse.ui.presentations.r21,3.2.0.I20060605-1400,org.eclipse.ui.intro,3.2.2.R322_v20061214,org.eclipse.ui.intro.universal,3.2.1.R321_v20060905,org.eclipse.ui.cheatsheets,3.2.1.R321_v20060720,org.eclipse.ui.browser,3.2.0.v20060602,org.eclipse.ui.navigator,3.2.1.M20060913-0800,org.eclipse.ui.navigator.resources,3.2.1.M20060906-0800b,org.eclipse.ui.workbench.texteditor,3.2.0.v20060605-1400,org.eclipse.ui.views,3.2.1.M20060906-0800,org.eclipse.ui.editors,3.2.1.r321_v20060721,org.eclipse.ui.forms,3.2.0.v20060602,org.eclipse.ui.externaltools,3.1.101.r321_v20060802,org.eclipse.ui.ide,3.2.1.M20060915-1030,org.eclipse.update.core,3.2.3.R32x_v20070118,org.eclipse.update.scheduler,3.2.2.R32x_v20061214,org.eclipse.update.ui,3.2.2.R32x_v20070111,org.eclipse.ui.workbench.compatibility,3.2.0.I20060605-1400,org.eclipse.core.filesystem.hpux.ia64_32,1.0.0.v20060603,org.eclipse.core.filesystem.hpux.PA_RISC,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86,1.0.0.v20060603,org.eclipse.core.filesystem.linux.x86_64,1.0.0.v20060603,org.eclipse.core.filesystem.macosx,1.0.0.v20060603,org.eclipse.core.filesystem.qnx.x86,1.0.0.v20060603,org.eclipse.core.filesystem.win32.x86,1.0.0.v20060603,org.eclipse.core.resources.win32,3.2.0.v20060603,org.eclipse.ui.carbon,3.2.0.I20060605-1400,org.eclipse.ui.win32,3.2.0.I20060605-1400,org.eclipse.update.core.linux,3.2.0.v20060605,org.eclipse.update.core.win32,3.2.2.R32x_v20061214,org.eclipse.ui.views.properties.tabbed,3.2.1.M20060830-0800,org.eclipse.core.runtime.compatibility.registry,3.2.1.R32x_v20060907,"/>
+ <antcall target="rootFiles${os}_${ws}_${arch}"/>
+ </target>
+ <target name="rootFileswin32_win32_x86">
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/rules 2007-03-24 14:34:46 UTC (rev 3104)
@@ -53,7 +53,7 @@
SOURCE_VERSION=$(shell head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\1/')
UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | sed -e 's/-.*$$//')
-REL=v3235
+REL=v3236
export JAVA_HOME=/usr/lib/jvm/java-gcj
@@ -121,7 +121,6 @@
eclipse_patches = \
eclipse-ant-manifest \
- eclipse-helpindexbuilder \
eclipse-fileinitializer \
eclipse-gnuformatterjdt \
eclipse-gnuformatterjdtui \
@@ -150,6 +149,7 @@
# eclipse-link-classpathdoc \
# eclipse-gjdoc-reflection \
# eclipse-public-applypatch \
+# eclipse-helpindexbuilder \
ifeq ($(with_tomcat),yes)
eclipse_patches += \
@@ -169,7 +169,7 @@
# eclipse-libswt-mozilla-profiles
- BUILD_DEPS += , libxul-dev
+ BUILD_DEPS += , firefox-dev
MOZILLA_DEP = $${shlibs:Depends}
MOZILLA_HOME = /usr/lib/mozilla
endif
@@ -224,8 +224,8 @@
mkdir -p "$(SOURCE_TREE)"
(cd "$(SOURCE_TREE)" && tar xfj ../"$(SOURCE)" > /dev/null)
- rm $(SOURCE_TREE)/baseLocation/plugins/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip
- rm $(SOURCE_TREE)/baseLocation/plugins/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip
+# rm $(SOURCE_TREE)/baseLocation/plugins/com.ibm.icu.source_3.4.5.????????/src/com.ibm.icu_3.4.5.????????/src.zip
+ rm $(SOURCE_TREE)/baseLocation/plugins/com.ibm.icu.base.source_3.4.5.????????/src/com.ibm.icu.base_3.4.5.????????/src.zip
@cd $(SOURCE_TREE)/baseLocation/plugins; \
mkdir icu4j-build-temp; \
@@ -347,7 +347,7 @@
# Build icu4j
cd $(SOURCE_TREE)/baseLocation/plugins; \
- zipfile=$$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip; \
+ zipfile=$$PWD/com.ibm.icu.base.source_3.4.5.20061213/src/com.ibm.icu.base_3.4.5.20061213/src.zip; \
pushd icu4j-build/com.ibm.icu.base/src; \
find -name \*.java | xargs touch --date=1/1/1970; \
zip -X -9 -r $$zipfile . -i \*.java; \
@@ -355,10 +355,10 @@
pushd icu4j-build/com.ibm.icu.base; \
ant build.update.jar; \
popd; \
- mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar .
+ mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar com.ibm.icu.base_3.4.5.20061213.jar
cd $(SOURCE_TREE)/baseLocation/plugins; \
- zipfile=$$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip; \
+ zipfile=$$PWD/com.ibm.icu.source_3.4.5.200612113/src/com.ibm.icu_3.4.5.20061213/src.zip; \
pushd icu4j-build/com.ibm.icu/src; \
find -name \*.java | xargs touch --date=1/1/1970; \
zip -X -9 -r $$zipfile . -i \*.java; \
@@ -366,7 +366,7 @@
pushd icu4j-build/com.ibm.icu; \
ant build.update.jar; \
popd; \
- mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar .
+ mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar com.ibm.icu_3.4.5.20061213.jar
# Build jsch
cd $(SOURCE_TREE)/baseLocation/plugins/jsch-0.1.28; \
@@ -610,15 +610,15 @@
dh_compress
dpkg-shlibdeps \
-dDepends \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gtk-3235.so \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-atk-gtk-3235.so \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-awt-gtk-3235.so \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-cairo-gtk-3235.so \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-pi-gtk-3235.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gtk-3236.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-atk-gtk-3236.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-awt-gtk-3236.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-cairo-gtk-3236.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-pi-gtk-3236.so \
-dRecommends \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3235.so \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3235.so \
- debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-glx-gtk-3235.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3236.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3236.so \
+ debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-glx-gtk-3236.so \
-Tdebian/libswt3.2-gtk-jni.substvars
dh_shlibdeps -Nlibswt3.2-gtk-jni
dh_makeshlibs
Added: trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
===================================================================
--- trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 2007-03-23 23:12:25 UTC (rev 3103)
+++ trunk/eclipse/debian/source-tree/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java 2007-03-24 14:34:46 UTC (rev 3104)
@@ -0,0 +1,442 @@
+/**
+ *
+ */
+package org.eclipse.jdt.internal.compiler.batch;
+
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.zip.CRC32;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.eclipse.jdt.core.compiler.InvalidInputException;
+import org.eclipse.jdt.internal.compiler.ClassFile;
+import org.eclipse.jdt.internal.compiler.CompilationResult;
+import org.eclipse.jdt.internal.compiler.env.AccessRule;
+import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.jdt.internal.compiler.util.Messages;
+import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
+
+/**
+ * This is an alternate entry point for the command-line compiler which
+ * is simpler to integrate into GCC. In particular the option processing
+ * is more GNU-like and the recognized options are similar to those supported
+ * by other GCC front ends.
+ */
+public class GCCMain extends Main {
+
+ // All the compilation units specified on the command line.
+ private HashSet commandLineCompilationUnits = new HashSet();
+ // True if we are only checking syntax.
+ private boolean syntaxOnly;
+ // If not null, the name of the output zip file.
+ // If null, we are generating class files in the file system,
+ // not a zip file.
+ private String zipDestination;
+ // The zip stream to which we're writing, or null if it hasn't been opened.
+ private ZipOutputStream zipStream;
+
+ // If not null, the name of the zip file to which dependency class files
+ // should be written.
+ private String zipDependencyDestination;
+ // The zip stream to which dependency files should be written.
+ private ZipOutputStream zipDependencyStream;
+
+ public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
+ boolean systemExitWhenFinished) {
+ super(outWriter, errWriter, systemExitWhenFinished);
+ this.logger.setEmacs();
+ }
+
+ public GCCMain(PrintWriter outWriter, PrintWriter errWriter,
+ boolean systemExitWhenFinished, Map customDefaultOptions) {
+ super(outWriter, errWriter, systemExitWhenFinished,
+ customDefaultOptions);
+ this.logger.setEmacs();
+ }
+
+ private void fail(Exception t) {
+ this.logger.logException(t);
+ System.exit(1);
+ }
+
+ public CompilationUnit[] getCompilationUnits() throws InvalidInputException {
+ CompilationUnit[] units = super.getCompilationUnits();
+ for (int i = 0; i < units.length; ++i)
+ this.commandLineCompilationUnits.add(units[i]);
+ return units;
+ }
+
+ private String combine(char[] one, char[] two) {
+ StringBuffer b = new StringBuffer();
+ b.append(one);
+ b.append(two);
+ return b.toString();
+ }
+
+ private ZipOutputStream getZipOutput() throws IOException {
+ if (this.zipDestination != null && this.zipStream == null) {
+ OutputStream os;
+ if ("-".equals(this.zipDestination)) { //$NON-NLS-1$
+ os = System.out;
+ } else {
+ os = new FileOutputStream(this.zipDestination);
+ }
+ zipStream = new ZipOutputStream(new BufferedOutputStream(os));
+ zipStream.setMethod(ZipOutputStream.STORED);
+ }
+ return zipStream;
+ }
+
+ private ZipOutputStream getDependencyOutput() throws IOException {
+ if (this.zipDependencyDestination != null && this.zipDependencyStream == null) {
+ OutputStream os = new FileOutputStream(zipDependencyDestination);
+ zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os));
+ zipDependencyStream.setMethod(ZipOutputStream.STORED);
+ }
+ return zipDependencyStream;
+ }
+
+ public void outputClassFiles(CompilationResult unitResult) {
+ if (this.syntaxOnly) {
+ return;
+ }
+ if (this.zipDestination == null) {
+ // Nothing special to do here.
+ super.outputClassFiles(unitResult);
+ return;
+ }
+ if (unitResult == null || unitResult.hasErrors()) {
+ return;
+ }
+
+ // If we are compiling with indirect dispatch, we don't need
+ // any dependent classes. If we are using the C++ ABI, then we
+ // do need the dependencies in order to do proper layout.
+ boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit());
+ if (this.zipDependencyDestination == null && !gcjCompile) {
+ return;
+ }
+
+ try {
+ ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput();
+ ClassFile[] classFiles = unitResult.getClassFiles();
+ for (int i = 0; i < classFiles.length; ++i) {
+ ClassFile classFile = classFiles[i];
+ String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class);
+ if (this.verbose)
+ this.out.println(
+ Messages.bind(
+ Messages.compilation_write,
+ new String[] {
+ String.valueOf(this.exportedClassFilesCounter+1),
+ filename
+ }));
+ ZipEntry entry = new ZipEntry(filename);
+ byte[] contents = classFile.getBytes();
+ CRC32 crc = new CRC32();
+ crc.update(contents);
+ entry.setSize(contents.length);
+ entry.setCrc(crc.getValue());
+ dest.putNextEntry(entry);
+ dest.write(contents);
+ dest.closeEntry();
+ }
+ } catch (IOException err) {
+ fail(err);
+ }
+ }
+
+ private String getArgument(String option) {
+ int index = option.indexOf('=');
+ return option.substring(index + 1);
+ }
+
+ private void addPath(ArrayList result, String currentClasspathName) {
+ String customEncoding = null;
+ AccessRule[] accessRules = new AccessRule[0];
+ String templates[] = new String[AccessRuleSet.MESSAGE_TEMPLATES_LENGTH];
+ templates[0] = Main.bind(
+ "template.restrictedAccess.type", //$NON-NLS-1$
+ new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$
+ templates[1] = Main.bind(
+ "template.restrictedAccess.constructor", //$NON-NLS-1$
+ new String[] {"{0}", currentClasspathName}); //$NON-NLS-1$
+ templates[2] = Main.bind(
+ "template.restrictedAccess.method", //$NON-NLS-1$
+ new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$
+ templates[3] = Main.bind(
+ "template.restrictedAccess.field", //$NON-NLS-1$
+ new String[] {"{0}", "{1}", currentClasspathName}); //$NON-NLS-1$ //$NON-NLS-2$
+ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, templates);
+ FileSystem.Classpath currentClasspath = FileSystem
+ .getClasspath(currentClasspathName,
+ customEncoding, accessRuleSet);
+ if (currentClasspath != null) {
+ result.add(currentClasspath);
+ }
+ }
+
+ private void parsePath(ArrayList result, String path) {
+ StringTokenizer iter = new StringTokenizer(path, File.pathSeparator);
+ while (iter.hasMoreTokens()) {
+ addPath(result, iter.nextToken());
+ }
+ }
+
+ protected void handleWarningToken(String token, boolean isEnabling,
+ boolean useEnableJavadoc) throws InvalidInputException {
+ // Recognize this for compatibility with older versions of gcj.
+ if ("deprecated".equals(token)) //$NON-NLS-1$
+ token = "deprecation"; //$NON-NLS-1$
+ else if ("static-access".equals(token) //$NON-NLS-1$
+ || "dep-ann".equals(token) //$NON-NLS-1$
+ || "over-ann".equals(token)) { //$NON-NLS-1$
+ // Some exceptions to the warning naming rule.
+ } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$
+ // Compatibility with earlier versions of gcj.
+ token = "semicolon"; //$NON-NLS-1$
+ } else {
+ // Turn "foo-bar-baz" into eclipse-style "fooBarBaz".
+ StringBuffer newToken = new StringBuffer(token.length());
+ StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$
+ boolean first = true;
+ while (t.hasMoreTokens()) {
+ String next = t.nextToken();
+ if (first) {
+ newToken.append(next);
+ first = false;
+ } else {
+ newToken.append(Character.toUpperCase(next.charAt(0)));
+ newToken.append(next.substring(1));
+ }
+ }
+ token = newToken.toString();
+ }
+ super.handleWarningToken(token, isEnabling, useEnableJavadoc);
+ }
+
+ /**
+ * Set the debug level to the indicated value. The level should be
+ * between 0 and 2, inclusive, but this is not checked.
+ * @param level the debug level
+ */
+ private void setDebugLevel(int level) {
+ this.options.put(
+ CompilerOptions.OPTION_LocalVariableAttribute,
+ level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
+ this.options.put(
+ CompilerOptions.OPTION_LineNumberAttribute,
+ level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE);
+ this.options.put(
+ CompilerOptions.OPTION_SourceFileAttribute,
+ CompilerOptions.GENERATE);
+ }
+
+ private void readFileList(String file, ArrayList result) {
+ try {
+ BufferedReader b = new BufferedReader(new FileReader(file));
+ String line;
+ while ((line = b.readLine()) != null) {
+ if (line.endsWith(SUFFIX_STRING_java))
+ result.add(line);
+ }
+ b.close();
+ } catch (IOException err) {
+ fail(err);
+ }
+ }
+
+ private void readAllFileListFiles(ArrayList fileList, ArrayList result) {
+ Iterator it = fileList.iterator();
+ while (it.hasNext()) {
+ readFileList((String) it.next(), result);
+ }
+ }
+
+ public void configure(String[] argv) throws InvalidInputException {
+ if ((argv == null) || (argv.length == 0)) {
+ // This is a "can't happen".
+ System.exit(1);
+ }
+
+ ArrayList files = new ArrayList();
+ ArrayList otherFiles = new ArrayList();
+ String classpath = null;
+ boolean haveFileList = false;
+
+ for (int i = 0; i < argv.length; ++i) {
+ String currentArg = argv[i];
+
+ if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$
+ // Simply accept the last one.
+ String encoding = getArgument(currentArg);
+ try { // ensure encoding is supported
+ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding);
+ } catch (UnsupportedEncodingException e) {
+ throw new InvalidInputException(
+ Main.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$
+ }
+ this.options.put(CompilerOptions.OPTION_Encoding, encoding);
+ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$
+ String arg = getArgument(currentArg);
+ if (this.destinationPath != null) {
+ StringBuffer errorMessage = new StringBuffer();
+ errorMessage.append("-d"); //$NON-NLS-1$
+ errorMessage.append(' ');
+ errorMessage.append(arg);
+ throw new InvalidInputException(
+ Main.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
+ }
+ this.destinationPath = arg;
+ this.generatePackagesStructure = true;
+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
+ classpath = getArgument(currentArg);
+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$
+ ++i;
+ if (i >= argv.length)
+ // FIXME: i18n.
+ throw new InvalidInputException("-fzip-target requires argument");
+ this.zipDestination = argv[i];
+ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$
+ ++i;
+ if (i >= argv.length)
+ // FIXME: i18n.
+ throw new InvalidInputException("-fzip-dependency requires argument");
+ this.zipDependencyDestination = argv[i];
+ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$
+ if (currentArg.equals("-g0")) { //$NON-NLS-1$
+ setDebugLevel(0);
+ } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$
+ || currentArg.equals("-g")) { //$NON-NLS-1$
+ setDebugLevel(2);
+ } else {
+ // Handle -g1 but also things like -gstabs.
+ setDebugLevel(1);
+ }
+ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$
+ handleWarningToken(currentArg.substring(5), false, false);
+ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$
+ handleWarningToken(currentArg.substring(2), true, false);
+ } else if (currentArg.equals("-w")) { //$NON-NLS-1$
+ disableWarnings();
+ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$
+ // Ignore.
+ } else if (currentArg.equals("-v")) { //$NON-NLS-1$
+ this.verbose = true;
+ } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$
+ this.syntaxOnly = true;
+ } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$
+ currentArg = getArgument(currentArg);
+ if (currentArg.equals("1.3")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3);
+ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
+ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
+ } else {
+ throw new InvalidInputException(Main.bind("configure.source", currentArg)); //$NON-NLS-1$
+ }
+ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$
+ currentArg = getArgument(currentArg);
+ if (currentArg.equals("1.1")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1);
+ } else if (currentArg.equals("1.2")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2);
+ } else if (currentArg.equals("1.3")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
+ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);
+ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
+ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$
+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14);
+ } else {
+ throw new InvalidInputException(Main.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$
+ }
+ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$
+ haveFileList = true;
+ } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) {
+ files.add(currentArg);
+ } else if (currentArg.charAt(0) == '-'){
+ // FIXME: error if not a file?
+ } else {
+ otherFiles.add(currentArg);
+ }
+ }
+
+ // Read the file list file. We read them all, but really there
+ // will only be one.
+ if (haveFileList)
+ readAllFileListFiles(otherFiles, files);
+
+ this.filenames = (String[]) files.toArray(new String[0]);
+ this.encodings = new String[this.filenames.length];
+
+ // Classpath processing.
+ ArrayList result = new ArrayList();
+ if (classpath == null)
+ // FIXME: update resources.
+ throw new InvalidInputException("no classpath specified");
+ parsePath(result, classpath);
+
+ // We must always create both output files, even if one is not used.
+ // That way we will always pass valid zip file on to jc1.
+ try {
+ getZipOutput();
+ getDependencyOutput();
+ } catch (IOException err) {
+ fail(err);
+ }
+
+ this.checkedClasspaths = new FileSystem.Classpath[result.size()];
+ result.toArray(this.checkedClasspaths);
+
+ this.logger.logCommandLineArguments(argv);
+ this.logger.logOptions(this.options);
+ this.logger.logClasspath(this.checkedClasspaths);
+
+ this.repetitions = 1;
+ }
+
+ public boolean compile(String[] argv) {
+ boolean result = super.compile(argv);
+ try {
+ if (zipStream != null) {
+ zipStream.finish();
+ zipStream.close();
+ }
+ if (zipDependencyStream != null) {
+ zipDependencyStream.finish();
+ zipDependencyStream.close();
+ }
+ } catch (IOException err) {
+ fail(err);
+ }
+ return result;
+ }
+
+ public static void main(String[] argv) {
+ boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv);
+ System.exit(result ? 0 : 1);
+ }
+}
More information about the pkg-java-commits
mailing list