/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset a2f35c839a52 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a2f35c839a52
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 31 01:47:21 2011 +0100

	Separate HotSpot downloading into a separate target so it works with
	--enable-hg.

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

	 * Makefile.am: Add missing download-openjdk and new
	download-hotspot aliases. (.PHONY): Add clean-download-
	hotspot. (download-openjdk): Move HotSpot download to...
	(clean-download-openjdk): Don't delete hotspot zip.
	(download-hotspot): ...here. (clean-download-hotspot):
	Remove hotspot zip and stamp. (download): Add download-
	hotspot as a dependency. (clean-download): Add clean-
	download-hotspot as a dependency.


changeset 449a27a644bd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=449a27a644bd
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Mar 31 01:52:25 2011 +0100

	Revert changes in 478d3f5f6a59409078b1adcfba24150158b92695 which
	were still under discussion.

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

	 * Makefile.am: Revert broken changes in
	478d3f5f6a59409078b1adcfba24150158b92695 (.PHONY): Remove
	jtregcheck-summary. (jtregcheck): Revert to version before
	last change. Remove pointless touch invocation.


diffstat:

 ChangeLog   |  21 +++++++++++++++++++++
 Makefile.am |  34 +++++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 13 deletions(-)

diffs (116 lines):

diff -r 44dde878b860 -r 449a27a644bd ChangeLog
--- a/ChangeLog	Tue Mar 29 10:44:35 2011 +0200
+++ b/ChangeLog	Thu Mar 31 01:52:25 2011 +0100
@@ -1,3 +1,24 @@
+2011-03-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Revert broken changes in
+	478d3f5f6a59409078b1adcfba24150158b92695
+	(.PHONY): Remove jtregcheck-summary.
+	(jtregcheck): Revert to version before last change.
+	Remove pointless touch invocation.
+
+2011-03-31  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add missing download-openjdk and new download-hotspot aliases.
+	(.PHONY): Add clean-download-hotspot.
+	(download-openjdk): Move HotSpot download to...
+	(clean-download-openjdk): Don't delete hotspot zip.
+	(download-hotspot): ...here.
+	(clean-download-hotspot): Remove hotspot zip and stamp.
+	(download): Add download-hotspot as a dependency.
+	(clean-download): Add clean-download-hotspot as a dependency.
+
 2011-03-29  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r 44dde878b860 -r 449a27a644bd Makefile.am
--- a/Makefile.am	Tue Mar 29 10:44:35 2011 +0200
+++ b/Makefile.am	Thu Mar 31 01:52:25 2011 +0100
@@ -633,7 +633,7 @@
 	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
 	clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
 	clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
-	jtregcheck-summary
+	clean-download-hotspot
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -842,6 +842,16 @@
 	fi
 endif
 endif
+endif
+	mkdir -p stamps
+	touch stamps/download-openjdk.stamp
+
+clean-download-openjdk:
+	rm -f $(OPENJDK_SRC_ZIP)
+	rm -rf openjdk.hg
+	rm -f stamps/download-openjdk.stamp
+
+stamps/download-hotspot.stamp:
 if WITH_ALT_HSBUILD
 if USE_ALT_HOTSPOT_SRC_ZIP
 	ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
@@ -860,22 +870,19 @@
 	  $(WGET) $${hotspot_url} -O $(HOTSPOT_SRC_ZIP) ; \
 	fi
 endif
-endif
 	mkdir -p stamps
-	touch stamps/download-openjdk.stamp
+	touch stamps/download-hotspot.stamp
 
-clean-download-openjdk:
-	rm -f $(OPENJDK_SRC_ZIP)
+clean-download-hotspot:
 	rm -f $(HOTSPOT_SRC_ZIP)
-	rm -rf openjdk.hg
-	rm -f stamps/download-openjdk.stamp
+	rm -f stamps/download-hotspot.stamp
 
 stamps/download.stamp: stamps/download-drops.stamp stamps/download-cacao.stamp \
- stamps/download-jamvm.stamp stamps/download-openjdk.stamp
+ stamps/download-jamvm.stamp stamps/download-openjdk.stamp stamps/download-hotspot.stamp
 	touch stamps/download.stamp
 
 clean-download: clean-drops clean-download-cacao clean-download-jamvm \
- clean-download-openjdk
+ clean-download-openjdk clean-download-hotspot
 	rm -f stamps/download.stamp
 
 stamps/extract.stamp: stamps/extract-openjdk.stamp \
@@ -2123,11 +2130,8 @@
 
 jtreg_checks = hotspot langtools jdk
 
-jtregcheck: jtreg $(jtreg_checks:%=check-%) jtregcheck-summary
-
-jtregcheck-summary:
+jtregcheck: jtreg $(jtreg_checks:%=check-%)
 	for i in hotspot langtools jdk; do \
-	  touch test/check-$$i.log; \
 	  echo "--------------- jtreg console summary for $$i ---------------"; \
 	  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
 	done | tee test/jtreg-summary.log
@@ -2224,6 +2228,8 @@
 
 download-drops: stamps/download-drops.stamp
 
+download-hotspot: stamps/download-hotspot.stamp
+
 download-jamvm: stamps/download-jamvm.stamp
 
 download-jaf-drop: stamps/download-jaf-drop.stamp
@@ -2232,6 +2238,8 @@
 
 download-jaxws-drop: stamps/download-jaxws-drop.stamp
 
+download-openjdk: stamps/download-openjdk.stamp
+
 extract: stamps/extract.stamp
 
 extract-ecj: stamps/extract-ecj.stamp