# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1270070099 -3600
# Node ID 649522401c6f4a188e5891ab21fe7f987e0a9b36
# Parent  f9061e19dfb0440f97fa5145b77c01fdaaf943fa
Make replace-hotspot more robust.

2010-03-31  Andrew John Hughes  <ahughes@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.

diff -r f9061e19dfb0 -r 649522401c6f ChangeLog
--- a/ChangeLog	Wed Mar 31 01:41:40 2010 +0100
+++ b/ChangeLog	Wed Mar 31 22:14:59 2010 +0100
@@ -1,3 +1,10 @@
+2010-03-31  Andrew John Hughes  <ahughes@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@redhat.com>
 
 	* patches/hotspot/default/icedtea-gcc-stack-markings.patch:
diff -r f9061e19dfb0 -r 649522401c6f Makefile.am
--- a/Makefile.am	Wed Mar 31 01:41:40 2010 +0100
+++ b/Makefile.am	Wed Mar 31 22:14:59 2010 +0100
@@ -827,11 +827,11 @@
 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 ; \