/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu May 19 15:32:37 PDT 2011
changeset c718b8720581 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c718b8720581
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu May 19 23:19:12 2011 +0100
Fix icedtea-boot build with --enable-jamvm.
2011-02-22 Xerxes Ranby <xranby at zafena.se>
Fix icedtea-boot build with --enable-jamvm (stamps
/icedtea-boot.stamp): Add stamps/jamvm.stamp
changeset 8e028745e884 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8e028745e884
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu May 19 23:26:01 2011 +0100
JamVM: Try --with-additional-vms=jamvm topping!
2011-02-23 Xerxes Ranby <xerxes at zafena.se>
JamVM: Try --with-additional-vms=jamvm topping!
* NEWS: Updated.
* Makefile.am (stamps/add-jamvm.stamp): New make target.
(clean-add-jamvm): Likewise. (stamps/add-jamvm-debug.stamp):
Likewise. (clean-add-jamvm-debug): Likewise.
(.PHONY): Add clean-add-jamvm and clean-add-jamvm-debug.
(stamps/icedtea-stage2.stamp): Add stamps/add-jamvm.stamp.
(clean-icedtea-stage2): Add clean-add-jamvm. (stamps
/icedtea-debug-stage2.stamp): Add stamps/add-jamvm-
debug.stamp. (clean-icedtea-debug-stage2): Add clean-add-
jamvm-debug.
* acinclude.m4 (IT_CHECK_ADDITIONAL_VMS): Set add_vm_jamvm if
jamvm are found. (BUILD_JAMVM): Add check for add_vm_jamvm.
(ADD_JAMVM_BUILD): New conditional dependent on add_vm_jamvm.
changeset d327a9da4588 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d327a9da4588
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Feb 23 16:54:17 2011 +0100
Switch to using IcedTea server for JamVM drops too.
2011-02-23 Xerxes Ranby <xerxes at zafena.se>
* Makefile.am: (JAMVM_BASE_URL): Switch to using IcedTea
server for JamVM drops too. (JAMVM_VERSION): Updated to
latest JamVM revision. (JAMVM_SHA256SUM): Updated.
changeset bc3f282f0bc5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bc3f282f0bc5
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu May 19 23:28:51 2011 +0100
Add --with-jamvm-src-zip support.
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.
changeset 526e140c51c9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=526e140c51c9
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu May 19 23:32:31 2011 +0100
Merge
diffstat:
ChangeLog | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 68 ++++++++++++++++++++++++++++++++++++++++++++---------------
NEWS | 2 +
acinclude.m4 | 26 +++++++++++++++++++++-
configure.ac | 1 +
5 files changed, 135 insertions(+), 20 deletions(-)
diffs (284 lines):
diff -r 0f78ff523f7f -r 526e140c51c9 ChangeLog
--- a/ChangeLog Thu May 19 01:25:06 2011 +0100
+++ b/ChangeLog Thu May 19 23:32:31 2011 +0100
@@ -1,3 +1,61 @@
+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
+ server for JamVM drops too.
+ (JAMVM_VERSION): Updated to latest JamVM revision.
+ (JAMVM_SHA256SUM): Updated.
+
+2011-02-23 Xerxes Ranby <xerxes at zafena.se>
+
+ JamVM: Try --with-additional-vms=jamvm topping!
+ * NEWS: Updated.
+ * Makefile.am (stamps/add-jamvm.stamp): New make target.
+ (clean-add-jamvm): Likewise.
+ (stamps/add-jamvm-debug.stamp): Likewise.
+ (clean-add-jamvm-debug): Likewise.
+ (.PHONY): Add clean-add-jamvm and clean-add-jamvm-debug.
+ (stamps/icedtea-stage2.stamp): Add stamps/add-jamvm.stamp.
+ (clean-icedtea-stage2): Add clean-add-jamvm.
+ (stamps/icedtea-debug-stage2.stamp):
+ Add stamps/add-jamvm-debug.stamp.
+ (clean-icedtea-debug-stage2): Add clean-add-jamvm-debug.
+ * acinclude.m4 (IT_CHECK_ADDITIONAL_VMS):
+ Set add_vm_jamvm if jamvm are found.
+ (BUILD_JAMVM): Add check for add_vm_jamvm.
+ (ADD_JAMVM_BUILD): New conditional dependent on add_vm_jamvm.
+
+2011-02-22 Xerxes Ranby <xranby at zafena.se>
+
+ Fix icedtea-boot build with --enable-jamvm
+ (stamps/icedtea-boot.stamp): Add stamps/jamvm.stamp
+
+2011-05-20 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am:
+ (HOTSPOT_CHANGESET): Test enhancement - make the test compatible with
+ OpenJDK7/IcedTea7, disabling printing unnecessary information to error
+ output.
+ (HOTSPOT_SHA256SUM): Likewise
+
+2011-05-19 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am:
+ (JDK_CHANGESET): Fixed behaviour of regression test
+ PrintAllXcheckJNI.java, added check if test frame is really initialized
+ to avoid exception thrown when BufferedImage is created.
+ (JDK_SHA256SUM): Likewise
+
2011-05-18 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 0f78ff523f7f -r 526e140c51c9 Makefile.am
--- a/Makefile.am Thu May 19 01:25:06 2011 +0100
+++ b/Makefile.am Thu May 19 23:32:31 2011 +0100
@@ -3,18 +3,18 @@
OPENJDK_VERSION = b136
CORBA_CHANGESET = b62418551e20
-HOTSPOT_CHANGESET = 74ff0c608935
+HOTSPOT_CHANGESET = 591c7dc0b2ee
JAXP_CHANGESET = 1c2f25bf36b1
JAXWS_CHANGESET = 339c2d381d80
-JDK_CHANGESET = fcc5e53dca33
+JDK_CHANGESET = 1571aa7abe47
LANGTOOLS_CHANGESET = 8e26c4aee63c
OPENJDK_CHANGESET = d4aea1a51d62
CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac
-HOTSPOT_SHA256SUM = fe5d240d87a5680f05a80236a087a67ad7ab190d8ea92057bf5180a50d233765
+HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82
JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0
JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c
-JDK_SHA256SUM = 128026428ea4aa9068964e50df25013971c80f1ba63c600f7d15418e49031627
+JDK_SHA256SUM = 6d12de7cecd01c4ddef1a28fc393dfe5f8d66dea80b7d1484e028e8b921ac219
LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39
OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d
@@ -24,14 +24,9 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-# The jamvm-3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27.tar.gz got fetched from
-# http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/snapshot/jamvm-3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27.tar.gz
-# Unfortunally the generated .tar.gz by the berlios cgit snapshot function
-# keeps changing sha256sum. I have hosted a snapshot on labb.zafena.se
-# while we wait for the final JamVM 1.6.0 release.
-JAMVM_VERSION = 3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27
-JAMVM_SHA256SUM = 396daf08896a71cfcddfabfbaf2d8b3f07557d8143eaaa93be25e2d80f30e165
-JAMVM_BASE_URL = http://labb.zafena.se/jamvm
+JAMVM_VERSION = 10329d9f3205698af125bba131b4f47339e81d90
+JAMVM_SHA256SUM = 0e87f22bc6a35c327ab343e7ca0e89512e3797aff93ee8a5539f0babfbd40f9b
+JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -755,7 +750,7 @@
clean-icedtea icedtea-stage2 clean-icedtea-boot \
clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
clean-drops jtregcheck clean-remove-intree-libraries \
- clean-jamvm clean-extract-jamvm
+ clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug
env:
@echo 'unset JAVA_HOME'
@@ -1099,6 +1094,9 @@
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 \
@@ -1878,19 +1876,19 @@
rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
- stamps/add-zero.stamp
+ stamps/add-zero.stamp stamps/add-jamvm.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage2:
+clean-icedtea-stage2: clean-add-jamvm
rm -f stamps/icedtea-stage2.stamp
stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
- stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp
mkdir -p stamps
touch $@
-clean-icedtea-debug-stage2:
+clean-icedtea-debug-stage2: clean-add-jamvm-debug
rm -f stamps/icedtea-debug-stage2.stamp
# OpenJDK boot Targets
@@ -1898,7 +1896,7 @@
stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \
- stamps/rewrite-rhino.stamp
+ stamps/rewrite-rhino.stamp stamps/jamvm.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV_BOOT) \
-C openjdk-boot \
@@ -2083,6 +2081,40 @@
rm -rf jamvm
rm -f stamps/jamvm.stamp
+# Targets for additional VMs
+
+stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
+if ADD_JAMVM_BUILD
+ mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
+ install -m 644 jamvm/install/lib/libjvm.so \
+ $(BUILD_JRE_ARCH_DIR)/jamvm/
+ printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
+ printf -- '-jamvm ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+ touch $@
+
+clean-add-jamvm:
+ rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm
+ sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg
+ rm -f stamps/add-jamvm.stamp
+
+stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp
+if ADD_JAMVM_BUILD
+ mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
+ install -m 644 jamvm/install/lib/libjvm.so \
+ $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm/
+ printf -- '-jamvm KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+else
+ printf -- '-jamvm ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+ touch $@
+
+clean-add-jamvm-debug:
+ rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
+ sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg
+ rm -f stamps/add-jamvm-debug.stamp
+
# CACAO
stamps/cacao.stamp: stamps/rt.stamp
diff -r 0f78ff523f7f -r 526e140c51c9 NEWS
--- a/NEWS Thu May 19 01:25:06 2011 +0100
+++ b/NEWS Thu May 19 23:32:31 2011 +0100
@@ -3,6 +3,8 @@
* NetX and the plugin moved to the IcedTea-Web project with a separate
release cycle.
* 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
* Bug fixes
- PR616, PR99: Don't statically link libstdc++
* Zero/Shark
diff -r 0f78ff523f7f -r 526e140c51c9 acinclude.m4
--- a/acinclude.m4 Thu May 19 01:25:06 2011 +0100
+++ b/acinclude.m4 Thu May 19 23:32:31 2011 +0100
@@ -1272,7 +1272,7 @@
AC_MSG_CHECKING([for additional virtual machines to build])
AC_ARG_WITH(additional-vms,
AC_HELP_STRING([--with-additional-vms=VM-LIST],
- [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]),
+ [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `jamvm', `zero' and `shark'.]),
[
if test "x${withval}" != x ; then
with_additional_vms=${withval}
@@ -1281,6 +1281,7 @@
xcacao) add_vm_cacao=yes;;
xzero) add_vm_zero=yes;;
xshark) add_vm_shark=yes;;
+ xjamvm) add_vm_jamvm=yes;;
*) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...])
esac
done
@@ -1291,12 +1292,16 @@
fi
AC_MSG_RESULT($with_additional_vms)
+AM_CONDITIONAL(ADD_JAMVM_BUILD, test x$add_vm_jamvm != x)
AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x)
AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x)
AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x)
-AM_CONDITIONAL(BUILD_JAMVM, test "x${ENABLE_JAMVM}" = xyes)
+AM_CONDITIONAL(BUILD_JAMVM, test x$add_vm_jamvm != x || test "x${ENABLE_JAMVM}" = xyes)
AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes)
+if test "x${ENABLE_JAMVM}" = xyes && test "x${ADD_JAMVM_BUILD_TRUE}" = x; then
+ AC_MSG_ERROR([additional vm is the default vm])
+fi
if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then
AC_MSG_ERROR([additional vm is the default vm])
fi
@@ -1900,3 +1905,20 @@
AM_CONDITIONAL(ENABLE_JAMVM, test x"${ENABLE_JAMVM}" = "xyes")
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)
+])
diff -r 0f78ff523f7f -r 526e140c51c9 configure.ac
--- a/configure.ac Thu May 19 01:25:06 2011 +0100
+++ b/configure.ac Thu May 19 23:32:31 2011 +0100
@@ -150,6 +150,7 @@
AC_CHECK_WITH_CACAO_HOME
AC_CHECK_WITH_CACAO_SRC_ZIP
IT_CHECK_ENABLE_JAMVM
+IT_CHECK_WITH_JAMVM_SRC_ZIP
DISABLE_OPTIMIZATIONS
SET_SHARK_BUILD
More information about the distro-pkg-dev
mailing list