/hg/icedtea6: Give --enable-hg precedence over source zip or dir...

[andrew at icedtea.classpath.org]

changeset ad4ad518e870 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ad4ad518e870
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 24 19:46:13 2010 +0100

	Give --enable-hg precedence over source zip or directory
	specification.

	2010-05-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: The --enable-hg option should take
	precedence over any --with-openjdk-src-zip/dir options.
	Using a live Mercurial checkout only makes sense in this
	context.


diffstat:

2 files changed, 15 insertions(+), 13 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |   20 +++++++-------------

diffs (74 lines):

diff -r caa91bae0c5c -r ad4ad518e870 ChangeLog
--- a/ChangeLog	Thu May 20 10:15:11 2010 -0400
+++ b/ChangeLog	Mon May 24 19:46:13 2010 +0100
@@ -1,3 +1,11 @@ 2010-05-20  Gary Benson  <gbenson at redhat
+2010-05-24  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	The --enable-hg option should take precedence
+	over any --with-openjdk-src-zip/dir options.
+	Using a live Mercurial checkout only makes
+	sense in this context.
+
 2010-05-20  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
diff -r caa91bae0c5c -r ad4ad518e870 Makefile.am
--- a/Makefile.am	Thu May 20 10:15:11 2010 -0400
+++ b/Makefile.am	Mon May 24 19:46:13 2010 +0100
@@ -114,11 +114,11 @@ IT_JAVACFLAGS=$(IT_JAVAC_SETTINGS) -sour
 
 # Conditional defintions
 
+if USE_HG
+  OPENJDK_SRC_ZIP = 
+else
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
-else
-if USE_HG
-  OPENJDK_SRC_ZIP = 
 else
   OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
 endif
@@ -599,10 +599,6 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp
 # Download OpenJDK sources.
 
 stamps/hgforest.stamp:
-if OPENJDK_SRC_DIR_FOUND
-else
-if USE_ALT_OPENJDK_SRC_ZIP
-else
 if !USE_HG
 else
 	if ! $(HG) fclone -h; \
@@ -611,8 +607,6 @@ else
             "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
           exit 1; \
           fi;
-endif
-endif
 endif
 	mkdir -p stamps 
 	touch stamps/hgforest.stamp
@@ -711,16 +705,16 @@ clean-drops: clean-download-jaxp-drop cl
 	rm -f stamps/download-drops.stamp
 
 stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp
-if OPENJDK_SRC_DIR_FOUND
-else
-if USE_ALT_OPENJDK_SRC_ZIP
-else
 if USE_HG
 if WITH_HGREV
 	$(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk;
 else
 	$(HG) fclone $(OPENJDK_HG_URL) openjdk;
 endif
+else
+if OPENJDK_SRC_DIR_FOUND
+else
+if USE_ALT_OPENJDK_SRC_ZIP
 else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \