changeset in /hg/icedtea: 2008-01-03 Lillian Angel <langel at red...

[Lillian Angel]

changeset c155610249dc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c155610249dc
description:
	2008-01-03  Lillian Angel  <langel at redhat.com>

	        * Makefile.am
	        (dist-openjdk): Added check for mercurial forest extension.
	        (stamps/clone.stamp): Likewise.
	        * Makefile.in: Regenerate.

diffstat:

3 files changed, 31 insertions(+)
ChangeLog   |    7 +++++++
Makefile.am |   12 ++++++++++++
Makefile.in |   12 ++++++++++++

diffs (72 lines):

diff -r e7bd40b829be -r c155610249dc ChangeLog
--- a/ChangeLog	Fri Dec 28 10:12:51 2007 -0500
+++ b/ChangeLog	Thu Jan 03 10:15:35 2008 -0500
@@ -1,3 +1,10 @@ 2007-12-28  Lillian Angel  <langel at redha
+2008-01-03  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am
+	(dist-openjdk): Added check for mercurial forest extension.
+	(stamps/clone.stamp): Likewise.
+	* Makefile.in: Regenerate.
+
 2007-12-28  Lillian Angel  <langel at redhat.com>
 
 	* rt/java/awt/image/Raster.java
diff -r e7bd40b829be -r c155610249dc Makefile.am
--- a/Makefile.am	Fri Dec 28 10:12:51 2007 -0500
+++ b/Makefile.am	Thu Jan 03 10:15:35 2008 -0500
@@ -105,6 +105,12 @@ snapshot: dist
 
 # Creates archive of openjdk.
 dist-openjdk:
+	if ! hg fclone -h; \
+	then \
+	echo "No forest extension found. Please refer to" \
+          "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+          exit 1; \
+	fi
 	hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk
 	find -name \\.hg* | xargs rm -rf	
 	cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
@@ -128,6 +134,12 @@ stamps/clone.stamp:
 	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
 	    $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
 	  else \
+	    if ! hg fclone -h; \
+            then \
+              echo "No forest extension found. Please refer to" \
+              "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+              exit 1; \
+            fi; \
 	    hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk; \
 	  fi ; \
 	fi
diff -r e7bd40b829be -r c155610249dc Makefile.in
--- a/Makefile.in	Fri Dec 28 10:12:51 2007 -0500
+++ b/Makefile.in	Thu Jan 03 10:15:35 2008 -0500
@@ -666,6 +666,12 @@ snapshot: dist
 
 # Creates archive of openjdk.
 dist-openjdk:
+	if ! hg fclone -h; \
+	then \
+	echo "No forest extension found. Please refer to" \
+          "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+          exit 1; \
+	fi
 	hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk-dist/openjdk
 	find -name \\.hg* | xargs rm -rf	
 	cd openjdk-dist && $(ZIP) -r openjdk-$(OPENJDK_VERSION) openjdk/
@@ -677,6 +683,12 @@ stamps/clone.stamp:
 	  if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
 	    $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \
 	  else \
+	    if ! hg fclone -h; \
+            then \
+              echo "No forest extension found. Please refer to" \
+              "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
+              exit 1; \
+            fi; \
 	    hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_URL) openjdk; \
 	  fi ; \
 	fi