/hg/icedtea6: 2011-02-23 Xerxes Ranby <xerxes at zafena.se>

[xranby at icedtea.classpath.org]

changeset a4352c2385ef in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a4352c2385ef
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Feb 23 17:26:18 2011 +0100

	2011-02-23 Xerxes Ranby <xerxes at zafena.se>

	 JamVM: configure --with-jamvm-src-zip
		* NEWS: Updated.
		* Makefile.am (stamps/download-jamvm.stamp): Link in jamvm
	source zip dependent on USE_ALT_JAMVM_SRC_ZIP
		* acinclude.m4 (IT_CHECK_WITH_JAMVM_SRC_ZIP): New macro.
	(USE_ALT_JAMVM_SRC_ZIP): New conditional.
	(ALT_JAMVM_SRC_ZIP): New variable.
		* configure.ac: Call IT_CHECK_WITH_JAMVM_SRC_ZIP.


diffstat:

5 files changed, 34 insertions(+)
ChangeLog    |   11 +++++++++++
Makefile.am  |    3 +++
NEWS         |    2 ++
acinclude.m4 |   17 +++++++++++++++++
configure.ac |    1 +

diffs (81 lines):

diff -r ae87b2a6ee6b -r a4352c2385ef ChangeLog
--- a/ChangeLog	Wed Feb 23 16:54:17 2011 +0100
+++ b/ChangeLog	Wed Feb 23 17:26:18 2011 +0100
@@ -1,3 +1,14 @@ 2011-02-23  Xerxes Ranby  <xerxes at zafena
+2011-02-23  Xerxes Ranby  <xerxes at zafena.se>
+
+	JamVM: configure --with-jamvm-src-zip
+	* NEWS: Updated.
+	* Makefile.am (stamps/download-jamvm.stamp):
+	Link in jamvm source zip dependent on USE_ALT_JAMVM_SRC_ZIP
+	* acinclude.m4 (IT_CHECK_WITH_JAMVM_SRC_ZIP): New macro.
+	(USE_ALT_JAMVM_SRC_ZIP): New conditional.
+	(ALT_JAMVM_SRC_ZIP): New variable.
+	* configure.ac: Call IT_CHECK_WITH_JAMVM_SRC_ZIP.
+
 2011-02-23  Xerxes Ranby  <xerxes at zafena.se>
 
 	* Makefile.am: (JAMVM_BASE_URL): Switch to using IcedTea
diff -r ae87b2a6ee6b -r a4352c2385ef Makefile.am
--- a/Makefile.am	Wed Feb 23 16:54:17 2011 +0100
+++ b/Makefile.am	Wed Feb 23 17:26:18 2011 +0100
@@ -767,6 +767,9 @@ clean-download-cacao:
 
 stamps/download-jamvm.stamp:
 if BUILD_JAMVM
+if USE_ALT_JAMVM_SRC_ZIP
+	ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP)
+endif
 	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
 	 | $(SHA256SUM) --check ; \
 	then \
diff -r ae87b2a6ee6b -r a4352c2385ef NEWS
--- a/NEWS	Wed Feb 23 16:54:17 2011 +0100
+++ b/NEWS	Wed Feb 23 17:26:18 2011 +0100
@@ -18,6 +18,8 @@ New in release 1.10 (2011-XX-XX):
 * Added out-of-the-box JamVM support using --enable-jamvm
 * Allow building of JamVM beside the default VM by using
   --with-additional-vms=jamvm
+* Allow the location of the JamVM source zip to be specified using
+  --with-jamvm-src-zip
 * Import of OpenJDK6 b21 including upgrade to HotSpot 19
   - S6961870: More rebranding fixes for templates/gpl-*-header files
   - S6976186: Shark build system changes
diff -r ae87b2a6ee6b -r a4352c2385ef acinclude.m4
--- a/acinclude.m4	Wed Feb 23 16:54:17 2011 +0100
+++ b/acinclude.m4	Wed Feb 23 17:26:18 2011 +0100
@@ -875,6 +875,23 @@ AC_DEFUN([IT_CHECK_ENABLE_JAMVM],
   AC_SUBST(ENABLE_JAMVM)
 ])
 
+AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP],
+[
+  AC_MSG_CHECKING([for a JamVM source zip])
+  AC_ARG_WITH([jamvm-src-zip],
+	      [AS_HELP_STRING(--with-jamvm-src-zip,specify the location of the JamVM source zip)],
+  [
+    ALT_JAMVM_SRC_ZIP=${withval}
+    AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x = x)
+  ],
+  [
+    ALT_JAMVM_SRC_ZIP="not specified"
+    AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP})
+  AC_SUBST(ALT_JAMVM_SRC_ZIP)
+])
+
 AC_DEFUN([IT_CHECK_ENABLE_CACAO],
 [
   AC_MSG_CHECKING(whether to use CACAO as VM)
diff -r ae87b2a6ee6b -r a4352c2385ef configure.ac
--- a/configure.ac	Wed Feb 23 16:54:17 2011 +0100
+++ b/configure.ac	Wed Feb 23 17:26:18 2011 +0100
@@ -177,6 +177,7 @@ IT_CHECK_WITH_CACAO_SRC_DIR
 IT_CHECK_WITH_CACAO_SRC_DIR
 
 IT_CHECK_ENABLE_JAMVM
+IT_CHECK_WITH_JAMVM_SRC_ZIP
 
 IT_DISABLE_OPTIMIZATIONS
 IT_SET_SHARK_BUILD