/hg/release/icedtea6-1.6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 649522401c6f in /hg/release/icedtea6-1.6
details: http://icedtea.classpath.org/hg/release/icedtea6-1.6?cmd=changeset;node=649522401c6f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Mar 31 22:14:59 2010 +0100

	Make replace-hotspot more robust.

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

	 * Makefile.am: (replace-hotspot.stamp): Don't delete
	openjdk/hotspot until new HotSpot is available, extracted
	and has the correct permissions. Fail immediately if one
	stage fails.


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

	Fix Ant 1.8.0 diagnostics issue.

	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


diffstat:

4 files changed, 51 insertions(+), 3 deletions(-)
ChangeLog               |   15 +++++++++++++++
Makefile.am             |    7 ++++---
NEWS                    |    1 +
patches/ant-1.8.0.patch |   31 +++++++++++++++++++++++++++++++

diffs (94 lines):

diff -r f9061e19dfb0 -r e78e331c336a ChangeLog
--- a/ChangeLog	Wed Mar 31 01:41:40 2010 +0100
+++ b/ChangeLog	Wed Mar 31 22:57:45 2010 +0100
@@ -1,3 +1,18 @@ 2010-03-31  Andrew John Hughes  <ahughes
+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  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(replace-hotspot.stamp): Don't delete openjdk/hotspot
+	until new HotSpot is available, extracted and has the
+	correct permissions.  Fail immediately if one stage fails.
+
 2010-03-31  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/hotspot/default/icedtea-gcc-stack-markings.patch:
diff -r f9061e19dfb0 -r e78e331c336a Makefile.am
--- a/Makefile.am	Wed Mar 31 01:41:40 2010 +0100
+++ b/Makefile.am	Wed Mar 31 22:57:45 2010 +0100
@@ -776,6 +776,7 @@ ICEDTEA_PATCHES += \
 	patches/security/20100330/6914823.patch \
 	patches/security/20100330/6914866.patch \
 	patches/security/20100330/6932480.patch \
+	patches/ant-1.8.0.patch \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
@@ -827,11 +828,11 @@ stamps/replace-hotspot.stamp: stamps/ext
 stamps/replace-hotspot.stamp: stamps/extract.stamp
 if WITH_ALT_HSBUILD
 	if test "x${HSBUILD}" != "xoriginal"; then \
-	  rm -rf openjdk/hotspot ; \
 	  if test -e ${HOTSPOT_SRC_ZIP} ; \
 	  then \
-	    $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
-	    chmod -R ug+w master-* ; \
+	    $(TAR) xf $(HOTSPOT_SRC_ZIP) && \
+	    chmod -R ug+w master-* && \
+	    rm -rf openjdk/hotspot && \
 	    mv master-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \
 	      $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \
 	  fi ; \
diff -r f9061e19dfb0 -r e78e331c336a NEWS
--- a/NEWS	Wed Mar 31 01:41:40 2010 +0100
+++ b/NEWS	Wed Mar 31 22:57:45 2010 +0100
@@ -32,6 +32,7 @@ New in release 1.6.3 (2010-03-30)
 - Add SystemTap jstack support.
 - PR179: Rhino bootclasspath issue
 - PR356: Support ECC via NSS
+- Fix issue with ant -diagnostics on ant 1.8.0 due to changed exit code
 
 New in release 1.6.2 (2009-11-09)
 - Latest security updates:
diff -r f9061e19dfb0 -r e78e331c336a 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:57:45 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) $@
+ 
+ #-------------------------------------------------------------------
+