changeset in /hg/icedtea6: Allow Mercurial revision to be specif...

[Andrew John Hughes]

changeset 569f19d48956 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=569f19d48956
description:
	Allow Mercurial revision to be specified.

	2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Support use of HGREV.
		* acinclude.m4:
		(AC_CHECK_WITH_HG_REVISION): Add --with-hg-revision.
		* configure.ac:
		Call AC_CHECK_WITH_HG_REVISION.

diffstat:

4 files changed, 32 insertions(+), 1 deletion(-)
ChangeLog    |    9 +++++++++
Makefile.am  |    6 +++++-
acinclude.m4 |   17 +++++++++++++++++
configure.ac |    1 +

diffs (67 lines):

diff -r 7b1c3278c88a -r 569f19d48956 ChangeLog
--- a/ChangeLog	Tue Dec 09 22:30:54 2008 +0000
+++ b/ChangeLog	Tue Dec 09 22:38:21 2008 +0000
@@ -1,3 +1,12 @@ 2008-12-09  Andrew John Hughes  <gnu_and
+2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Support use of HGREV.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HG_REVISION): Add --with-hg-revision.
+	* configure.ac:
+	Call AC_CHECK_WITH_HG_REVISION.
+
 2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 7b1c3278c88a -r 569f19d48956 Makefile.am
--- a/Makefile.am	Tue Dec 09 22:30:54 2008 +0000
+++ b/Makefile.am	Tue Dec 09 22:38:21 2008 +0000
@@ -366,7 +366,11 @@ if USE_ALT_OPENJDK_SRC_ZIP
 if USE_ALT_OPENJDK_SRC_ZIP
 else
 if USE_HG
-	$(HG) fclone -r jdk6-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
+if WITH_HGREV
+	$(HG) fclone -r $(HGREV) $(OPENJDK_HG_URL) openjdk;
+else
+	$(HG) fclone $(OPENJDK_HG_URL) openjdk;
+endif
 else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
diff -r 7b1c3278c88a -r 569f19d48956 acinclude.m4
--- a/acinclude.m4	Tue Dec 09 22:30:54 2008 +0000
+++ b/acinclude.m4	Tue Dec 09 22:38:21 2008 +0000
@@ -988,3 +988,20 @@ AC_DEFUN([ENABLE_HG],
   AC_MSG_RESULT([${enable_hg}])
   AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes")
 ])
+
+AC_DEFUN([AC_CHECK_WITH_HG_REVISION],
+[
+  AC_MSG_CHECKING([which Mercurial revision to use])
+  AC_ARG_WITH([hg-revision],
+	      [AS_HELP_STRING(--with-hg-revision,the Mercurial revision to use)],
+  [
+    HGREV="${withval}"
+    AC_MSG_RESULT([${HGREV}])
+  ],
+  [ 
+    HGREV=""
+    AC_MSG_RESULT([tip])
+  ])
+  AC_SUBST([HGREV])
+  AM_CONDITIONAL(WITH_HGREV, test "x${HGREV}" != "x")
+])
diff -r 7b1c3278c88a -r 569f19d48956 configure.ac
--- a/configure.ac	Tue Dec 09 22:30:54 2008 +0000
+++ b/configure.ac	Tue Dec 09 22:38:21 2008 +0000
@@ -315,6 +315,7 @@ ENABLE_ZERO_BUILD
 ENABLE_ZERO_BUILD
 SET_CORE_OR_SHARK_BUILD
 ENABLE_HG
+AC_CHECK_WITH_HG_REVISION
 
 if test "x${enable_pulse_java}" = "xyes"
 then