/hg/release/icedtea6-1.8: Add Ant 1.8.0 diagnostics fix.

[andrew at icedtea.classpath.org]

changeset 6189f67c458a in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=6189f67c458a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 31 22:53:13 2010 +0100

	Add Ant 1.8.0 diagnostics fix.

	2010-03-31 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add Ant patch.
		* NEWS: Mention Ant and plugin patch.
		* patches/ant-1.8.0.patch: Fix for Ant -diagnostics with Ant
	1.8.0
	http://hg.openjdk.java.net/jdk7/tl/langtools/rev/de6375751eb7


diffstat:

4 files changed, 43 insertions(+), 1 deletion(-)
ChangeLog               |    8 ++++++++
Makefile.am             |    3 ++-
NEWS                    |    2 ++
patches/ant-1.8.0.patch |   31 +++++++++++++++++++++++++++++++

diffs (75 lines):

diff -r 56cef624c2e6 -r 6189f67c458a ChangeLog
--- a/ChangeLog	Wed Mar 31 16:32:04 2010 +0200
+++ b/ChangeLog	Wed Mar 31 22:53:13 2010 +0100
@@ -1,3 +1,11 @@ 2010-03-31  Matthias Klose  <doko at ubuntu
+2010-03-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add Ant patch.
+	* NEWS: Mention Ant patch.
+	* patches/ant-1.8.0.patch:
+	Fix for Ant -diagnostics with Ant 1.8.0
+	http://hg.openjdk.java.net/jdk7/tl/langtools/rev/de6375751eb7
+
 2010-03-31  Matthias Klose  <doko at ubuntu.com>
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc (plugin_start_appletviewer):
diff -r 56cef624c2e6 -r 6189f67c458a Makefile.am
--- a/Makefile.am	Wed Mar 31 16:32:04 2010 +0200
+++ b/Makefile.am	Wed Mar 31 22:53:13 2010 +0100
@@ -321,7 +321,8 @@ ICEDTEA_PATCHES = \
 	patches/security/20100330/6910590.patch \
 	patches/security/20100330/6914823.patch \
 	patches/security/20100330/6914866.patch \
-	patches/security/20100330/6932480.patch
+	patches/security/20100330/6932480.patch \
+	patches/ant-1.8.0.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 56cef624c2e6 -r 6189f67c458a NEWS
--- a/NEWS	Wed Mar 31 16:32:04 2010 +0200
+++ b/NEWS	Wed Mar 31 22:53:13 2010 +0100
@@ -35,6 +35,8 @@ New in release 1.8 (2010-XX-XX):
 - Dependence on the binary plugs mechanism removed.  The plugin and NetX
   code is now imported into the JDK build in the same manner as langtools,
   CORBA, JAXP and JAXWS.
+- Fix for plugin buffer overflow: https://bugzilla.mozilla.org/show_bug.cgi?id=555342
+- Fix issue with ant -diagnostics on ant 1.8.0 due to changed exit code
 - Zero/Shark
   - Shark is now able to build itself.
   - For ARM, add Thumb2 JIT.
diff -r 56cef624c2e6 -r 6189f67c458a patches/ant-1.8.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ant-1.8.0.patch	Wed Mar 31 22:53:13 2010 +0100
@@ -0,0 +1,31 @@
+
+# HG changeset patch
+# User ohair
+# Date 1269668224 25200
+# Node ID de6375751eb789306126ccfa23a8145bf43af828
+# Parent 65e422bbb9841febf9bfa706322b0870711fe6a0
+6938326: Use of "ant -diagnostics" a problem with ant 1.8.0, exit code 1 now
+Reviewed-by: jjg
+
+--- openjdk.orig/langtools/make/Makefile	Wed Mar 24 17:02:35 2010 -0700
++++ openjdk/langtools/make/Makefile	Fri Mar 26 22:37:04 2010 -0700
+@@ -188,10 +188,16 @@ clobber: clean
+ # All ant targets of interest
+ ANT_TARGETS = build clean sanity post-sanity diagnostics # for now
+ 
++# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
++$(OUTPUTDIR)/build/ant-diagnostics.log:
++	@mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
++	@$(RM) $@
++	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
++	  $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
++
+ # Create a make target for each
+-$(ANT_TARGETS):
++$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
+ 	@ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
+-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $(OUTPUTDIR)/build/ant-diagnostics.log
+ 	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
+ 
+ #-------------------------------------------------------------------
+