Mercurial > hg > release > icedtea7-2.6
changeset 2009:19ad2af4b4e3
2009-10-08 Matthias Klose <doko@ubuntu.com>
* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
Add shark aliases to jvm.cfg.
(stamps/add-zero.stamp): Install as shark if default vm is zero.
* acinclude.m4: Allow shark as additional vm when default vm is zero.
* INSTALL, README: Document new build options.
author | doko@ubuntu.com |
---|---|
date | Thu, 08 Oct 2009 13:19:08 +0200 |
parents | 175529fae103 |
children | 05e6f20fb7fd |
files | ChangeLog INSTALL Makefile.am README acinclude.m4 |
diffstat | 5 files changed, 48 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 07 09:48:00 2009 +0100 +++ b/ChangeLog Thu Oct 08 13:19:08 2009 +0200 @@ -1,3 +1,11 @@ +2009-10-08 Matthias Klose <doko@ubuntu.com> + + * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): + Add shark aliases to jvm.cfg. + (stamps/add-zero.stamp): Install as shark if default vm is zero. + * acinclude.m4: Allow shark as additional vm when default vm is zero. + * INSTALL, README: Document new build options. + 2009-10-08 Andrew John Hughes <ahughes@redhat.com> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
--- a/INSTALL Wed Oct 07 09:48:00 2009 +0100 +++ b/INSTALL Thu Oct 08 13:19:08 2009 +0200 @@ -126,7 +126,10 @@ --with-additional-vms=cacao to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark The additional VM's are available by calling the java with the option -`-cacao' or `-zero' (for shark as well), or by calling the java tools with -`-J-<vm name>'. +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-<vm name>'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM.
--- a/Makefile.am Wed Oct 07 09:48:00 2009 +0100 +++ b/Makefile.am Thu Oct 08 13:19:08 2009 +0200 @@ -1508,6 +1508,9 @@ if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif +if SHARK_BUILD + printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1577,6 +1580,9 @@ if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif +if SHARK_BUILD + printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif if WITH_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -2044,12 +2050,20 @@ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) +if ZERO_BUILD + mkdir -p $(BUILD_JRE_ARCH_DIR)/shark + cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + $(BUILD_JRE_ARCH_DIR)/shark/ + printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +else mkdir -p $(BUILD_JRE_ARCH_DIR)/zero cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif else printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg + printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif touch $@ @@ -2065,12 +2079,20 @@ $(ADD_ZERO_EXTRA_BUILD_ENV) \ $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) +if ZERO_BUILD + mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark + cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/shark/ + printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +else mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \ $(BUILD_DEBUG_JRE_ARCH_DIR)/zero/ printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif else printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg + printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif touch $@
--- a/README Wed Oct 07 09:48:00 2009 +0100 +++ b/README Thu Oct 08 13:19:08 2009 +0200 @@ -144,13 +144,16 @@ machine, addtional VM's can be built without building the other components multiple times. -On architectures where hotspot is available, use +On architectures where hotspot is available, use --with-additional-vms=cacao,zero (or shark instead of zero) on architectures where only zero (or shark) is available, use - --with-additional-vms=cacao -to build the additional VM's. It's not possible to build cacao as the + --with-additional-vms=cacao +to build the additional VM's. It's not possible to build cacao as the default VM, and zero as additional VM. +To build zero as the default VM and shark as an additional VM, use + --enable-zero --with-additional-vms=shark -If the build was configured with --with-additional-vms, the additional VM's -are available by calling the java with the option `-cacao' or `-zero' (for -shark as well), or by calling the java tools with `-J-<vm name>'. +The additional VM's are available by calling the java with the option +`-cacao', `-zero' or `-shark', or by calling the java tools with +`-J-<vm name>'. If the build was configured with '--enable-shark', +use `-Xint' to just use the zero VM.
--- a/acinclude.m4 Wed Oct 07 09:48:00 2009 +0100 +++ b/acinclude.m4 Thu Oct 08 13:19:08 2009 +0200 @@ -1322,7 +1322,10 @@ if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi -if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x; then +if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" != x; then + AC_MSG_ERROR([additional vm is the default vm]) +fi +if test "x${SHARK_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then