/hg/icedtea6: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Wed Feb 23 07:20:00 PST 2011


changeset 81f8c5c03b3c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=81f8c5c03b3c
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 15:15:38 2011 +0000

	Bump to latest hs20 (b10). Close checksum loophole for HotSpot
	tarball.

	2011-02-23 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (download-openjdk): Verify HotSpot
	tarball, regardless of source.
		* hotspot.map: Bump to latest hs20 (b10).


changeset e7cf01c42190 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e7cf01c42190
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 15:19:53 2011 +0000

	Update INSTALL documentation for latest changes.

	2011-02-23 Andrew John Hughes <ahughes at redhat.com>

	 * INSTALL: Update with native2ascii option and
	JamVM. Mention --without-hotspot-build in HotSpot
	documentation.


diffstat:

4 files changed, 31 insertions(+), 6 deletions(-)
ChangeLog   |   14 ++++++++++++++
INSTALL     |   18 +++++++++++++++---
Makefile.am |    3 +--
hotspot.map |    2 +-

diffs (102 lines):

diff -r 69e952bd19fd -r e7cf01c42190 ChangeLog
--- a/ChangeLog	Wed Feb 23 13:55:40 2011 +0000
+++ b/ChangeLog	Wed Feb 23 15:19:53 2011 +0000
@@ -1,3 +1,17 @@ 2011-02-22  Andrew John Hughes  <ahughes
+2011-02-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* INSTALL:
+	Update with native2ascii option and JamVM.
+	Mention --without-hotspot-build in HotSpot
+	documentation.
+
+2011-02-23  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(download-openjdk): Verify HotSpot tarball,
+	regardless of source.
+	* hotspot.map: Bump to latest hs20 (b10).
+
 2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	Use more accurate ENABLE_CACAO rather
diff -r 69e952bd19fd -r e7cf01c42190 INSTALL
--- a/INSTALL	Wed Feb 23 13:55:40 2011 +0000
+++ b/INSTALL	Wed Feb 23 15:19:53 2011 +0000
@@ -118,6 +118,9 @@ to configure:
 * --with-rmic: Specify the location of a 'rmic' binary.  By default,
   ${SYSTEM_JDK_DIR}/bin/rmic is used.  If this is absent, then the path
   is checked for grmic and rmic.
+* --with-native2ascii:  Specify the location of a 'native2ascii' binary.  By default,
+  ${SYSTEM_JDK_DIR}/bin/native2ascii is used.  If this is absent, then the path
+  is checked for native2ascii and gnative2ascii.
 * --with-ecj-jar: Specify the location of an ecj JAR file.  By default, the
   following paths are checked:
     - /usr/share/java/eclipse-ecj.jar
@@ -163,6 +166,7 @@ These are documented fully in the releva
 * --enable-systemtap: Include support for tracing using systemtap.
 * --enable-nss: Enable the NSS security provider.
 * --enable-cacao: Replace HotSpot with the CACAO VM.
+* --enable-jamvm: Replace HotSpot with JamVM.
 * --enable-shark: Build the Shark LLVM-based JIT.
 * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
 * --with-hotspot-build: The HotSpot to use, defaulting to 'original'.
@@ -252,6 +256,14 @@ instead, and --with-cacao-src-zip/dir op
 instead, and --with-cacao-src-zip/dir options exist to allow the use
 of a pre-downloaded zip or source tree respectively.
 
+JamVM
+=====
+
+IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot.
+When --enable-jamvm is specified, JamVM will be downloaded and built,
+followed by the JDK portion of OpenJDK resulting in a JamVM+OpenJDK
+image in openjdk/build/<os>-<arch>/j2sdk-image.
+
 Zero & Shark
 ============
 
@@ -303,14 +315,14 @@ of the requested build.
 
 At present, IcedTea6 supports the 'original' HotSpot 19 provided as
 part of the upstream tarball and HotSpot 20 ('hs20') from the stable
-hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/baseline.  The default
+hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/master.  The default
 is 'original'; passing --with-hotspot-build=hs20 to configure will
 use the version of hs20 specified in hotspot.map.  Note that the norm. is
 for up to one alternate (non-default) build to be supported and just
 passing --with-hotspot-build (equivalent to --with-hotspot-build=yes)
 will always provide the alternate build (currently hs20).  Conversely,
-passing --with-hotspot-build=no provides the original build (currently
-hs19).
+passing --without-hotspot-build (equivalent to --with-hotspot-build=no)
+provides the original build (currently hs19).
 
 Javascript Support
 ==================
diff -r 69e952bd19fd -r e7cf01c42190 Makefile.am
--- a/Makefile.am	Wed Feb 23 13:55:40 2011 +0000
+++ b/Makefile.am	Wed Feb 23 15:19:53 2011 +0000
@@ -826,7 +826,7 @@ if WITH_ALT_HSBUILD
 if WITH_ALT_HSBUILD
 if USE_ALT_HOTSPOT_SRC_ZIP
 	ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
-else
+endif
 	hotspot_md5sum="`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) \
 	  $(abs_top_srcdir)/hotspot.map`" ; \
 	if ! echo "$${hotspot_md5sum}  $(HOTSPOT_SRC_ZIP)" \
@@ -840,7 +840,6 @@ else
 	    version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"; \
 	  $(WGET) $${hotspot_url} -O $(HOTSPOT_SRC_ZIP) ; \
 	fi
-endif
 endif
 endif
 	mkdir -p stamps
diff -r 69e952bd19fd -r e7cf01c42190 hotspot.map
--- a/hotspot.map	Wed Feb 23 13:55:40 2011 +0000
+++ b/hotspot.map	Wed Feb 23 15:19:53 2011 +0000
@@ -1,2 +1,2 @@
 # version url changeset md5sum
-hs20 http://hg.openjdk.java.net/hsx/hsx20/baseline 6aa467001334 236fa9a7fdb01339184378bb35e42e34
+hs20 http://hg.openjdk.java.net/hsx/hsx20/master f46354849fb3 2791c8009eefee305538c81328a8dfd2



More information about the distro-pkg-dev mailing list