Mercurial > hg > release > icedtea6-1.7
changeset 1897:cf5e5cb5f1cd icedtea6-1.7.3
Add fix for Ant 1.8.0 -diagnostics.
2010-03-31 Andrew John Hughes <ahughes@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
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 31 Mar 2010 22:49:05 +0100 |
| parents | 15fbe52e01df |
| children | ca8875e4a89d |
| files | ChangeLog Makefile.am NEWS patches/ant-1.8.0.patch |
| diffstat | 4 files changed, 42 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 31 21:44:56 2010 +0100 +++ b/ChangeLog Wed Mar 31 22:49:05 2010 +0100 @@ -1,3 +1,11 @@ +2010-03-31 Andrew John Hughes <ahughes@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 Andrew John Hughes <ahughes@redhat.com> * configure.ac: Bump version to 1.7.3.
--- a/Makefile.am Wed Mar 31 21:44:56 2010 +0100 +++ b/Makefile.am Wed Mar 31 22:49:05 2010 +0100 @@ -331,7 +331,8 @@ 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 += \
--- a/NEWS Wed Mar 31 21:44:56 2010 +0100 +++ b/NEWS Wed Mar 31 22:49:05 2010 +0100 @@ -1,5 +1,6 @@ New in release 1.7.3 (2010-03-31): - 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 New in release 1.7.2 (2010-03-31):
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ant-1.8.0.patch Wed Mar 31 22:49:05 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) $@ + + #------------------------------------------------------------------- +