/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 9ac98799e75d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9ac98799e75d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 02 10:31:36 2010 +0100

	Don't delete alternate zip bundles, only those we download.

	2010-07-01 Andrew John Hughes <ahughes at redhat.com>

	 Don't delete alternate source zips. Only zips
	downloaded by the build should be deleted.
		* Makefile.am: (HOTSPOT_SRC_ZIP): Set as a constant value
	rather than setting to ALT_HOTSPOT_SRC_ZIP when available.
	(OPENJDK_SRC_ZIP): Likewise, though the value is still empty
	when using hg. (download-openjdk): Symlink the alternate
	OpenJDK and HotSpot source zips to the alternate versions.
	(clean-download-openjdk): Remvoe HOTSPOT_SRC_ZIP as well.


changeset 12239904d147 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=12239904d147
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 02 10:35:35 2010 +0100

	Delete empty tapset directory if srcdir != builddir.

	2010-07-01 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (distclean-local): Delete empty
	tapset directory if srcdir != builddir.


diffstat:

2 files changed, 32 insertions(+), 10 deletions(-)
ChangeLog   |   22 ++++++++++++++++++++++
Makefile.am |   20 ++++++++++----------

diffs (95 lines):

diff -r aafcd75154a1 -r 12239904d147 ChangeLog
--- a/ChangeLog	Thu Jul 01 23:41:42 2010 +0100
+++ b/ChangeLog	Fri Jul 02 10:35:35 2010 +0100
@@ -1,3 +1,25 @@ 2010-07-01  Andrew John Hughes  <ahughes
+2010-07-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(distclean-local): Delete empty tapset
+	directory if srcdir != builddir.
+
+2010-07-01  Andrew John Hughes  <ahughes at redhat.com>
+
+	Don't delete alternate source zips.  Only
+	zips downloaded by the build should be deleted.
+	* Makefile.am:
+	(HOTSPOT_SRC_ZIP): Set as a constant value
+	rather than setting to ALT_HOTSPOT_SRC_ZIP
+	when available.
+	(OPENJDK_SRC_ZIP): Likewise, though the value
+	is still empty when using hg.
+	(download-openjdk): Symlink the alternate
+	OpenJDK and HotSpot source zips to the
+	alternate versions.
+	(clean-download-openjdk): Remvoe
+	HOTSPOT_SRC_ZIP as well.
+
 2010-07-01  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r aafcd75154a1 -r 12239904d147 Makefile.am
--- a/Makefile.am	Thu Jul 01 23:41:42 2010 +0100
+++ b/Makefile.am	Fri Jul 02 10:35:35 2010 +0100
@@ -22,6 +22,8 @@ JAXP_DROP_SHA256SUM = d097627d4059d488c5
 JAXP_DROP_SHA256SUM = d097627d4059d488c5a09d4e33cec275a193d4d8bc0fea8ef4f1337170904156
 
 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
+
+HOTSPOT_SRC_ZIP = hotspot.tar.gz
 
 # Build directories
 
@@ -104,17 +106,7 @@ if USE_HG
 if USE_HG
   OPENJDK_SRC_ZIP = 
 else
-if USE_ALT_OPENJDK_SRC_ZIP
-  OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
-else
   OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
-endif
-endif
-
-if USE_ALT_HOTSPOT_SRC_ZIP
-  HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP)
-else
-  HOTSPOT_SRC_ZIP = hotspot.tar.gz
 endif
 
 # FIXME (HotSpot): HotSpot changeset logic goes here
@@ -529,6 +521,11 @@ clean-local: clean-jtreg clean-jtreg-rep
 	rm -f jni-common.o
 
 distclean-local: clean-download clean-hgforest
+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+	  if [ -e tapset ] ; then \
+	    rmdir tapset ; \
+	  fi ; \
+	fi
 
 install:
 
@@ -712,6 +709,7 @@ if OPENJDK_SRC_DIR_FOUND
 if OPENJDK_SRC_DIR_FOUND
 else
 if USE_ALT_OPENJDK_SRC_ZIP
+	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
 else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
@@ -726,6 +724,7 @@ endif
 endif
 if WITH_ALT_HSBUILD
 if USE_ALT_HOTSPOT_SRC_ZIP
+	ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
 else
 	hotspot_md5sum="`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) \
 	  $(abs_top_srcdir)/hotspot.map`" ; \
@@ -748,6 +747,7 @@ endif
 
 clean-download-openjdk:
 	rm -f $(OPENJDK_SRC_ZIP)
+	rm -f $(HOTSPOT_SRC_ZIP)
 	rm -f stamps/download-openjdk.stamp
 
 stamps/download.stamp: stamps/download-drops.stamp stamps/download-cacao.stamp \