/hg/icedtea6: Handle the ENABLE_HG case for extract-openjdk.

[andrew at icedtea.classpath.org]

changeset 48029753c45f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=48029753c45f
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Sep 30 10:33:22 2010 +0100

	Handle the ENABLE_HG case for extract-openjdk.

	2010-09-29 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (download-openjdk): Clone OpenJDK to
	openjdk.hg not openjdk. (clean-download-openjdk):
	Remove openjdk.hg. (extract-openjdk): Handle the ENABLE_HG
	case by making a hardlinked copy of openjdk.hg


diffstat:

2 files changed, 21 insertions(+), 4 deletions(-)
ChangeLog   |   11 ++++++++++-
Makefile.am |   14 +++++++++++---

diffs (58 lines):

diff -r 674b1799df8c -r 48029753c45f ChangeLog
--- a/ChangeLog	Wed Sep 29 13:37:46 2010 -0700
+++ b/ChangeLog	Thu Sep 30 10:33:22 2010 +0100
@@ -1,5 +1,14 @@ 2010-09-29  Deepak Bhole <dbhole at redhat.
+2010-09-29  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(download-openjdk): Clone OpenJDK to openjdk.hg
+	not openjdk.
+	(clean-download-openjdk): Remove openjdk.hg.
+	(extract-openjdk): Handle the ENABLE_HG case by
+	making a hardlinked copy of openjdk.hg
+
 2010-09-29  Deepak Bhole <dbhole at redhat.com>
-	
+
 	Fixed PR519 (patch from dnietoc at gmail.com).
 	* plugin/icedteanp/IcedTeaNPPlugin.cc: Have ITNP_NewStream return
 	NPERR_GENERIC_ERROR instead of NPERR_NO_ERROR.
diff -r 674b1799df8c -r 48029753c45f Makefile.am
--- a/Makefile.am	Wed Sep 29 13:37:46 2010 -0700
+++ b/Makefile.am	Thu Sep 30 10:33:22 2010 +0100
@@ -754,9 +754,9 @@ stamps/download-openjdk.stamp: stamps/hg
 stamps/download-openjdk.stamp: stamps/hgforest.stamp
 if USE_HG
 if WITH_HGREV
-	$(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk;
+	$(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk.hg;
 else
-	$(HG) fclone $(OPENJDK_HG_URL) openjdk;
+	$(HG) fclone $(OPENJDK_HG_URL) openjdk.hg;
 endif
 else
 if OPENJDK_SRC_DIR_FOUND
@@ -801,6 +801,7 @@ clean-download-openjdk:
 clean-download-openjdk:
 	rm -f $(OPENJDK_SRC_ZIP)
 	rm -f $(HOTSPOT_SRC_ZIP)
+	rm -rf openjdk.hg
 	rm -f stamps/download-openjdk.stamp
 
 stamps/download.stamp: stamps/download-drops.stamp stamps/download-cacao.stamp \
@@ -820,7 +821,14 @@ clean-extract: clean-extract-openjdk cle
 
 stamps/extract-openjdk.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
-	cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk
+	if ! test -d openjdk ; then \
+	  cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \
+	fi
+else
+if USE_HG
+	if ! test -d openjdk ; then \
+	  cp -pPRl openjdk.hg openjdk ; \
+	fi
 else
 	set -e ; \
 	if ! test -d openjdk ; \