/hg/icedtea6: 5 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Aug 15 04:34:32 UTC 2016


changeset 2de5d5254c7c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2de5d5254c7c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 02:54:13 2016 +0100

	New backports for issues to be fixed in 1.13.12.

	S2178143, PR2959: JVM crashes if the number of bound CPUs changed during runtime
	S6260348, PR3068: GTK+ L&F JTextComponent not respecting desktop caret blink rate
	S6961123, PR2975: setWMClass fails to null-terminate WM_CLASS string
	PR2800: Files are missing from resources.jar
	PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order

	2016-08-15  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_PATCHES): Add new patches.
		* NEWS: Updated.
		* patches/ecj/icedtea.patch:
		Adjust and extend, following PR2800.
		* patches/openjdk/2178143-pr2959.patch,
		* patches/openjdk/6260348-pr3068.patch,
		* patches/openjdk/6961123-pr2975.patch,
		* patches/pr2800-missing_resources.patch,
		* patches/pr3137-alt_button_order.patch:
		New backports for issues to be fixed in 1.13.12.


changeset 98303b52c967 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=98303b52c967
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 03:01:21 2016 +0100

	PR3092: SystemTap is heavily confused by multiple JDKs

	2016-07-17  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR3092: SystemTap is heavily confused
		by multiple JDKs
		* AUTHORS: Added Felix Lu.
		* NEWS: Updated.

	2016-07-13  Felix Lu  <flu at redhat.com>

		PR3092: SystemTap is heavily confused
		by multiple JDKs
		* tapset/hotspot.stp.in,
		* tapset/jstack.stp.in:
		Use the new private keyword in SystemTap
		>= 3.0 to resolve global variable name
		collision and function overloading
		to select the correct jstack_call at runtime.


changeset b386b7cd2dd1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b386b7cd2dd1
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 03:44:04 2016 +0100

	PR3139: Update documentation

	2016-08-14  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR3139: Update documentation
		* NEWS: Updated.
		* README: Remove NIO2 backport information
		as this is long gone.

	2010-07-22  Andrew John Hughes  <ahughes at redhat.com>

		PR3139: Update documentation
		* INSTALL,
		* README: Updated to match current state of
		play and extended with missing information.
		Use IcedTea or IcedTea 1.x in place of
		"IcedTea6".
		* acinclude.m4: Add parameter information to
		configure help for all options.
		(FIND_ENDORSED_JARS): Remove unused macro and
		correct typos.


changeset d9c4980dca4a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d9c4980dca4a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 03:54:34 2016 +0100

	PR3112: Provide option to disable SystemTap tests

	2016-03-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3112: Provide option to disable SystemTap tests
		* INSTALL: Document --disable-systemtap-tests.
		* Makefile.am:
		(SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
		are enabled.
		(check-local): Use SYSTEMTAP_TEST_SUITE in place
		of check-tapset.
		(.PHONY): Add check-jdk, check-hotspot, check-langtools,
		check-tapset, check-tapset-probes and check-tapset-jstack
		* NEWS: Updated.
		* acinclude.m4:
		(IT_DISABLE_SYSTEMTAP_TESTS): Add option to
		disable SystemTap tests.
		* configure.ac:
		Call IT_DISABLE_SYSTEMTAP_TESTS.


changeset 4c2bd990d28a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4c2bd990d28a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 05:37:57 2016 +0100

	PR2800: Files are missing from resources.jar

	2016-07-26  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR2800: Files are missing from resources.jar
		* Makefile.am:
		(MIME_TYPE_CHECK_BUILD_DIR): Add build directory
		for mime type check.
		(MIME_TYPE_CHECK_SRCS): Specify sources for
		mime type check.
		(EXTRA_DIST): Distribute mime type check sources.
		(check-local): Depend on check-mimetype.
		(clean-tests): Depend on clean-check-mimetype.
		(clean-local): Depend on clean-mimetypecheck.
		(.PHONY): Depend on clean-check-mimetype,
		clean-mimetypecheck, clean-add-mime-types-file,
		clean-add-mime-types-file-debug and
		clean-add-mime-types-file-boot.
		(icedtea-against-icedtea): Depend on
		add-mime-types-file.
		(clean-icedtea-against-icedtea): Depend on
		clean-add-mime-types-file.
		(icedtea-debug-against-icedtea): Depend on
		add-mime-types-file-debug.
		(clean-icedtea-debug-against-icedtea): Depend on
		clean-add-mime-types-file-debug.
		(add-mime-types-file): Add a symlink to the
		system mime.types file if found.
		(clean-add-mime-types-file): Remove symlink
		to the system mime types file.
		(add-mime-types-file-debug): Add a symlink to the
		system mime.types file, if found, in the debug build.
		(clean-add-mime-types-file-debug): Remove symlink
		to the system mime types file in the debug build.
		(icedtea-against-ecj): Depend on add-mime-types-file-boot.
		(clean-icedtea-against-ecj): Depend on
		clean-add-mime-types-file-boot.
		(add-mime-types-file-boot): Add a symlink to the
		system mime.types file, if found, in the bootstrap build.
		(clean-add-mime-types-file-boot): Remove symlink
		to the system mime types file in the bootstrap build.
		(check-mimetype): Check that we can recognise a HTML
		file and (if system mime.types is available) a Java file.
		(clean-check-mimetype): Cleanup after check-mimetype.
		(mimetypecheck): Build the MIME type check.
		(clean-mimetypecheck): Remove MIME type check build.
		(install-data-local): Install the mime.types symlink.
		* acinclude.m4:
		(IT_CHECK_FOR_MIME_TYPES): Check for a system mime.types
		file and define MIME_TYPES_FILE_FOUND if located.
		* configure.ac:
		Invoke IT_CHECK_FOR_MIME_TYPES.
		* test/RH1195203.java: Testcase to get Java to print
		the MIME type of a file.

	2015-05-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR2800: Files are missing from resources.jar
		* Makefile.am:
		(BUILD_SDK_DIR): Added.
		(BUILD_JRE_DIR): Likewise.
		(BUILD_JRE_ARCH_DIR): Redefine using BUILD_SDK_DIR.
		(BUILD_DEBUG_SDK_DIR): Added.
		(BUILD_DEBUG_JRE_DIR): Likewise.
		(BUILD_DEBUG_JRE_ARCH_DIR): Redefine using
		BUILD_DEBUG_SDK_DIR.
		(BUILD_BOOT_SDK_DIR): Added.
		(BUILD_BOOT_JRE_DIR): Likewise.
		(BUILD_BOOT_JRE_ARCH_DIR): Redefine using
		BUILD_BOOT_SDK_DIR.

	2015-06-03  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR2800: Files are missing from resources.jar
		* Makefile.am:
		(BUILD_BOOT_JRE_ARCH_DIR): Added.


diffstat:

 AUTHORS                                |    1 +
 ChangeLog                              |  145 +++++++++++++++++++++++++++++++
 INSTALL                                |   88 +++++++++---------
 Makefile.am                            |  154 +++++++++++++++++++++++++++++---
 NEWS                                   |    8 +
 README                                 |   14 +-
 acinclude.m4                           |  134 ++++++++++++++--------------
 configure.ac                           |    3 +
 patches/ecj/icedtea.patch              |   95 +++++++++++---------
 patches/openjdk/2178143-pr2959.patch   |   54 +++++++++++
 patches/openjdk/6260348-pr3068.patch   |  152 ++++++++++++++++++++++++++++++++
 patches/openjdk/6961123-pr2975.patch   |   21 ++++
 patches/pr2800-missing_resources.patch |   87 ++++++++++++++++++
 patches/pr3137-alt_button_order.patch  |   88 ++++++++++++++++++
 tapset/hotspot.stp.in                  |    3 +-
 tapset/jstack.stp.in                   |   54 ++++++++---
 test/RH1195203.java                    |   32 ++++++
 17 files changed, 938 insertions(+), 195 deletions(-)

diffs (truncated from 1986 to 500 lines):

diff -r cc7089689313 -r 4c2bd990d28a AUTHORS
--- a/AUTHORS	Tue May 24 17:57:12 2016 +0100
+++ b/AUTHORS	Mon Aug 15 05:37:57 2016 +0100
@@ -26,6 +26,7 @@
 Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
 Denis Lila <dlila at redhat.com>
+Felix Lu <flu at redhat.com>
 DJ Lucas <dj at linuxfromscratch.org>
 Omair Majid <omajid at redhat.com>
 Casey Marshall <csm at gnu.org>
diff -r cc7089689313 -r 4c2bd990d28a ChangeLog
--- a/ChangeLog	Tue May 24 17:57:12 2016 +0100
+++ b/ChangeLog	Mon Aug 15 05:37:57 2016 +0100
@@ -1,3 +1,148 @@
+2016-07-26  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR2800: Files are missing from resources.jar
+	* Makefile.am:
+	(MIME_TYPE_CHECK_BUILD_DIR): Add build directory
+	for mime type check.
+	(MIME_TYPE_CHECK_SRCS): Specify sources for
+	mime type check.
+	(EXTRA_DIST): Distribute mime type check sources.
+	(check-local): Depend on check-mimetype.
+	(clean-tests): Depend on clean-check-mimetype.
+	(clean-local): Depend on clean-mimetypecheck.
+	(.PHONY): Depend on clean-check-mimetype,
+	clean-mimetypecheck, clean-add-mime-types-file,
+	clean-add-mime-types-file-debug and
+	clean-add-mime-types-file-boot.
+	(icedtea-against-icedtea): Depend on
+	add-mime-types-file.
+	(clean-icedtea-against-icedtea): Depend on
+	clean-add-mime-types-file.
+	(icedtea-debug-against-icedtea): Depend on
+	add-mime-types-file-debug.
+	(clean-icedtea-debug-against-icedtea): Depend on
+	clean-add-mime-types-file-debug.
+	(add-mime-types-file): Add a symlink to the
+	system mime.types file if found.
+	(clean-add-mime-types-file): Remove symlink
+	to the system mime types file.
+	(add-mime-types-file-debug): Add a symlink to the
+	system mime.types file, if found, in the debug build.
+	(clean-add-mime-types-file-debug): Remove symlink
+	to the system mime types file in the debug build.
+	(icedtea-against-ecj): Depend on add-mime-types-file-boot.
+	(clean-icedtea-against-ecj): Depend on
+	clean-add-mime-types-file-boot.
+	(add-mime-types-file-boot): Add a symlink to the
+	system mime.types file, if found, in the bootstrap build.
+	(clean-add-mime-types-file-boot): Remove symlink
+	to the system mime types file in the bootstrap build.
+	(check-mimetype): Check that we can recognise a HTML
+	file and (if system mime.types is available) a Java file.
+	(clean-check-mimetype): Cleanup after check-mimetype.
+	(mimetypecheck): Build the MIME type check.
+	(clean-mimetypecheck): Remove MIME type check build.
+	(install-data-local): Install the mime.types symlink.
+	* acinclude.m4:
+	(IT_CHECK_FOR_MIME_TYPES): Check for a system mime.types
+	file and define MIME_TYPES_FILE_FOUND if located.
+	* configure.ac:
+	Invoke IT_CHECK_FOR_MIME_TYPES.
+	* test/RH1195203.java: Testcase to get Java to print
+	the MIME type of a file.
+
+2015-05-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2800: Files are missing from resources.jar
+	* Makefile.am:
+	(BUILD_SDK_DIR): Added.
+	(BUILD_JRE_DIR): Likewise.
+	(BUILD_JRE_ARCH_DIR): Redefine using BUILD_SDK_DIR.
+	(BUILD_DEBUG_SDK_DIR): Added.
+	(BUILD_DEBUG_JRE_DIR): Likewise.
+	(BUILD_DEBUG_JRE_ARCH_DIR): Redefine using
+	BUILD_DEBUG_SDK_DIR.
+	(BUILD_BOOT_SDK_DIR): Added.
+	(BUILD_BOOT_JRE_DIR): Likewise.
+	(BUILD_BOOT_JRE_ARCH_DIR): Redefine using
+	BUILD_BOOT_SDK_DIR.
+
+2015-06-03  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2800: Files are missing from resources.jar
+	* Makefile.am:
+	(BUILD_BOOT_JRE_ARCH_DIR): Added.
+
+2016-03-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3112: Provide option to disable SystemTap tests
+	* INSTALL: Document --disable-systemtap-tests.
+	* Makefile.am:
+	(SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
+	are enabled.
+	(check-local): Use SYSTEMTAP_TEST_SUITE in place
+	of check-tapset.
+	(.PHONY): Add check-jdk, check-hotspot, check-langtools,
+	check-tapset, check-tapset-probes and check-tapset-jstack
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DISABLE_SYSTEMTAP_TESTS): Add option to
+	disable SystemTap tests.
+	* configure.ac:
+	Call IT_DISABLE_SYSTEMTAP_TESTS.
+
+2016-08-14  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR3139: Update documentation
+	* NEWS: Updated.
+	* README: Remove NIO2 backport information
+	as this is long gone.
+
+2010-07-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR3139: Update documentation
+	* INSTALL,
+	* README: Updated to match current state of
+	play and extended with missing information.
+	Use IcedTea or IcedTea 1.x in place of
+	"IcedTea6".
+	* acinclude.m4: Add parameter information to
+	configure help for all options.
+	(FIND_ENDORSED_JARS): Remove unused macro and
+	correct typos.
+
+2016-07-17  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR3092: SystemTap is heavily confused
+	by multiple JDKs
+	* AUTHORS: Added Felix Lu.
+	* NEWS: Updated.
+
+2016-07-13  Felix Lu  <flu at redhat.com>
+
+	PR3092: SystemTap is heavily confused
+	by multiple JDKs
+	* tapset/hotspot.stp.in,
+	* tapset/jstack.stp.in:
+	Use the new private keyword in SystemTap
+	>= 3.0 to resolve global variable name
+	collision and function overloading
+	to select the correct jstack_call at runtime.
+
+2016-08-15  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patches.
+	* NEWS: Updated.
+	* patches/ecj/icedtea.patch:
+	Adjust and extend, following PR2800.
+	* patches/openjdk/2178143-pr2959.patch,
+	* patches/openjdk/6260348-pr3068.patch,
+	* patches/openjdk/6961123-pr2975.patch,
+	* patches/pr2800-missing_resources.patch,
+	* patches/pr3137-alt_button_order.patch:
+	New backports for issues to be fixed in 1.13.12.
+
 2016-05-24  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	PR2969: ENABLE_SYSTEM_LCMS is not defined
diff -r cc7089689313 -r 4c2bd990d28a INSTALL
--- a/INSTALL	Tue May 24 17:57:12 2016 +0100
+++ b/INSTALL	Mon Aug 15 05:37:57 2016 +0100
@@ -1,5 +1,5 @@
-Building IcedTea6
-=================
+Building IcedTea
+================
 
 For convenience we've provided make targets that automatically
 download, extract and patch the source code from openjdk.java.net, in
@@ -9,7 +9,7 @@
 
 A bootstrap JDK, either:
   - GNU libgcj >= 4.3.0 (or equivalent class library based on GNU Classpath >= 0.95) (the default)
-  - IcedTea6
+  - IcedTea 1.x
 Eclipse Java Compiler (ecj)
 CUPS
 libX11 (xproto, libX11, libXext, libXtst, libXi, libXt, libXinerama, libXcomposite, libXau, libXdmcp, libxcb)
@@ -63,10 +63,10 @@
 in that order.
 
 A quick build can be performed by passing --disable-bootstrap.
-This requires a recent version of IcedTea6 as the boot JDK, so
+This requires a recent version of IcedTea 1.x as the boot JDK, so
 the first three JDKs above are not searched for.
 
-Note that IcedTea7 can not be used to build IcedTea6.
+Note that IcedTea 2.x and 3.x can not be used to build IcedTea 1.x.
 
 There is currently no install target.  IcedTea ends up in
 openjdk.build when the build completes.
@@ -85,6 +85,9 @@
 to configure:
 
 * --disable-docs: Don't build the Javadoc documentation.
+* --disable-bootstrap: Perform a quick build using an installed
+  copy of IcedTea 1.x.  If a directory is not specified, a check against
+  the list presented above is performed.
 * --with-openjdk-src-dir: Copy the specified OpenJDK tree, rather than
   downloading and extracting a tarball.
 * --disable-optimizations: Build with -O0.
@@ -96,9 +99,6 @@
   query it at runtime to obtain the cache location, rather than using a
   hardcoded value.
 * --with-gcj: Compile ecj to native code with gcj prior to building.
-* --disable-bootstrap: Perform a quick build using an installed
-  copy of IcedTea6.  If a directory is not specified, a check against
-  the list presented above is performed.
 * --with-parallel-jobs: Run the specified number of parallel jobs when
   building HotSpot and the JDK.  If this option is passed without an
   argument, the number of online processors plus one is used.
@@ -144,12 +144,22 @@
 * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
 * --with-llvm-config: Specify the location of the llvm-config binary.
+* --with-hotspot-build: The HotSpot to use, defaulting to 'original'.
+* --with-pax: The command used to PaX-mark built binaries.
+* --enable-Werror: Turn gcc & javac warnings into errors.
+* --disable-jar-compression: Don't compress the OpenJDK JAR files.
+* --disable-downloading: Don't download tarballs if not available; fail instead.
 * --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK.
 * --with-fonts-dir: Specify the location of system fonts. This is currently only used on Gentoo systems.
 
 Other options may be supplied which enable or disable new features.
 These are documented fully in the relevant section below.
 
+* --disable-tests: Disable the running of all JTReg tests.
+* --disable-hotspot-tests: Disable the running of the HotSpot JTReg suite.
+* --disable-langtools-tests: Disable the running of the langtools JTReg suite.
+* --disable-jdk-tests: Disable the running of the jdk JTreg suite.
+* --disable-systemtap-tests: Disable the running of the SystemTap test suite.
 * --enable-pulse-java: Build the PulseAudio sound provider.
 * --disable-xrender: Don't include the XRender pipeline.
 * --enable-systemtap: Include support for tracing using systemtap.
@@ -158,7 +168,6 @@
 * --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'.
 * --with-rhino: Include Javascript support using Rhino.
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
@@ -168,7 +177,7 @@
 Testing
 =======
 
-IcedTea6 includes support for running the test suite included with
+IcedTea includes support for running the test suite included with
 OpenJDK, using the in-tree copy of JTReg.  Invoking 'make check' will
 cause the HotSpot, JDK and langtools test suites to be run.  It will
 exit with an error code if a regression test fails, so use 'make check
@@ -176,57 +185,47 @@
 failures occur in one.  The individual test suites may be run using
 the check-hotspot, check-jdk and check-langtools targets respectively,
 or by setting jtreg_checks e.g. jtreg_checks="langtools hotspot".
+The --disable-tests option can be used to turn off all tests, and the
+--disable-{hotspot,langtools,jdk}-tests options can be used to turn
+off individual suites.  This is useful when using 'make distcheck'
+as a way of avoiding running the extensive JDK test suite which
+takes several hours.
 
 The PulseAudio provider
 =======================
 
-IcedTea6 includes an implementation of the javax.sound.* APIs using
+IcedTea includes an implementation of the javax.sound.* APIs using
 PulseAudio which can be enabled using --enable-pulse-java.   The resulting
 provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider.
 
 XRender Support
 ===============
 
-IcedTea6 includes support for an Xrender-based rendering pipeline
+IcedTea includes support for an Xrender-based rendering pipeline
 developed by Clemens Eisserer (http://linuxhippy.blogspot.com/).  This
 is compiled by default, and can be disabled using --disable-xrender.
 To actually use the pipeline, the sun.java2d.xrender property needs to
 be set to true, e.g.  by passing the -Dsun.java2d.xrender=True option
 to java.
 
-NIO2 Backport
-=============
-
-IcedTea6 includes a backport of NIO2 from OpenJDK7; see
-http://openjdk.java.net/projects/nio/.  This provides support for
-asynchronous I/O and an improved file system API, providing access to
-POSIX file permissions, timestamps, extended attributes and ACLs and
-allowing directories to be watched.  This is enabled using the
---enable-nio2 option.
-
-As new classes can not be added to the java.* and javax.* namespace of
-the 1.6 API, the new java.nio classes are contained in
-org.classpath.icedtea.java.nio, so code will needed to be adjusted to
-work with the backport.
-
 SystemTap
 =========
 
-IcedTea6 includes work to allow the existing DTrace probes included in
+IcedTea includes work to allow the existing DTrace probes included in
 OpenJDK to be used with SystemTap.  This is enabled using the
 --enable-systemtap option, and requires version 0.9.5 or later (0.9.9
 or later if you want Java method tracing).  The tapset needs to know
 the final install location of the JDK, so the --with-abs-install-dir
 should also be used to specify this.  If not set, it defaults to the
-in-tree location of openjdk/build/<os>-<arch>/j2sdk-image and requires
+in-tree location of openjdk.build/j2sdk-image and requires
 manual changes to tapset/hotspot.stp to work from elsewhere. For
 example, if you plan to install the resulting build in
 /usr/lib/jvm/java-1.6.0-openjdk, then you should specify
 --enable-systemtap
 --with-abs-install-dir=/usr/lib/jvm/java-1.6.0-openjdk.
 
-NSS Security Provider
-=====================
+The NSS PKCS11 Security Provider
+================================
 
 OpenJDK includes an NSS-based security provider in the form of
 sun.security.pkcs11.SunPKCS11.  However, as this needs to know the
@@ -240,12 +239,12 @@
 CACAO
 =====
 
-IcedTea6 can use CACAO as the virtual machine, as opposed to HotSpot.
+IcedTea can use CACAO as the virtual machine, as opposed to HotSpot.
 One advantage of this is that CACAO has a JIT implementation for
 more platforms than HotSpot, including ppc, ppc64, arm and mips.
 When --enable-cacao is specified, CACAO will be downloaded and built,
 followed by the JDK portion of OpenJDK resulting in a CACAO+OpenJDK
-image in openjdk/build/<os>-<arch>/j2sdk-image.  The --with-cacao-home
+image in openjdk.build/j2sdk-image.  The --with-cacao-home
 option can be used to specify the use of an existing CACAO install
 instead, and --with-cacao-src-zip/dir options exist to allow the use
 of a pre-downloaded zip or source tree respectively.
@@ -253,16 +252,16 @@
 JamVM
 =====
 
-IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot.
+IcedTea 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.  The
---with-jamvm-src-zip option exists to allow the use of a pre-downloaded zip.
+image in openjdk.build/j2sdk-image.  The --with-jamvm-src-zip option
+exists to allow the use of a pre-downloaded zip.
 
 Zero & Shark
 ============
 
-IcedTea6 includes a zero assembler port of HotSpot, which avoids
+IcedTea includes a zero assembler port of HotSpot, which avoids
 architecture-specific code as much as possible, allowing an
 interpreter to be built and run on most platforms (albeit very
 slowly).  As HotSpot only includes JITs for x86, x86_64 and SPARC, the
@@ -289,7 +288,7 @@
 hotspot.map file maps the name to a changeset from a given repository
 URL.  During the build, it downloads HotSpot from
 ${URL}/archive/${CHANGESET}.tar.gz and the resulting file is verified
-using the MD5 sum stored in hotspot.map.
+using the SHA256 sum stored in hotspot.map.
 
 New build selections may be provided by providing further mappings in
 the hotspot.map file.  The name can be anything
@@ -311,12 +310,13 @@
 download stage and just verifies that the zip's MD5 sum matches that
 of the requested build.
 
-At present, IcedTea6 supports the 'original' HotSpot 23 provided as
+At present, IcedTea 1.x supports the 'original' HotSpot 23 provided as
 part of the upstream tarball.  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.  Conversely, passing --without-hotspot-build (equivalent to
---with-hotspot-build=no) provides the original build from the OpenJDK tarball.
+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.  Conversely, passing
+--without-hotspot-build (equivalent to --with-hotspot-build=no)
+provides the original build from the OpenJDK tarball.
 
 When no option is specified, the default build is used.  At present,
 this is 'original'.
@@ -324,7 +324,7 @@
 JavaScript Support
 ==================
 
-IcedTea6 adds Javascript support via the javax.script API by using
+IcedTea adds Javascript support via the javax.script API by using
 an existing installation of Rhino.  Support is enabled by default,
 with the following locations being searched for a Rhino JAR file:
 
diff -r cc7089689313 -r 4c2bd990d28a Makefile.am
--- a/Makefile.am	Tue May 24 17:57:12 2016 +0100
+++ b/Makefile.am	Mon Aug 15 05:37:57 2016 +0100
@@ -34,12 +34,20 @@
 ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
 JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
 SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
-BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_SDK_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_JRE_DIR = $(BUILD_OUTPUT_DIR)/j2re-image
+BUILD_JRE_ARCH_DIR = $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_DEBUG_SDK_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_DEBUG_JRE_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image
+BUILD_DEBUG_JRE_ARCH_DIR = $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
+BUILD_BOOT_SDK_DIR = $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+BUILD_BOOT_JRE_DIR = $(ECJ_BUILD_OUTPUT_DIR)/j2re-image
+BUILD_BOOT_JRE_ARCH_DIR = $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
 FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
 REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
 GENERATED_BUILD_DIR = $(abs_top_builddir)/generated.build
 CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
+MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build
 
 # Source directories
 
@@ -250,6 +258,10 @@
 endif
 endif
 
+if !DISABLE_SYSTEMTAP_TESTS
+SYSTEMTAP_TEST_SUITE = check-tapset
+endif
+
 # Target to ensure a patched OpenJDK tree containing Zero & Shark
 # and any overlays is available in $(abs_top_builddir)/openjdk
 OPENJDK_TREE = stamps/overlay.stamp
@@ -263,6 +275,7 @@
 
 REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
 CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
+MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/RH1195203.java
 
 # Relative path to JTreg tool
 JTREG_DIR = src/jtreg
@@ -641,7 +654,12 @@
 	patches/openjdk/8150954-pr2868-composite_desktop.patch \
 	patches/pr2890-system_cacerts.patch \
 	patches/openjdk/6863746-pr2951-no_ct.sym_in_javap.patch \
-	patches/openjdk/7050826-pr2956-allow_type1_fonts.patch
+	patches/openjdk/7050826-pr2956-allow_type1_fonts.patch \
+	patches/openjdk/2178143-pr2959.patch \
+	patches/pr3137-alt_button_order.patch \
+	patches/openjdk/6260348-pr3068.patch \
+	patches/openjdk/6961123-pr2975.patch \
+	patches/pr2800-missing_resources.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -981,16 +999,17 @@
 	rewriter/agpl-3.0.txt \
 	$(REWRITER_SRCS) \
 	$(TAPSET_TEST_SRCS) \
-	$(CRYPTO_CHECK_SRCS)
+	$(CRYPTO_CHECK_SRCS) \
+	$(MIME_TYPE_CHECK_SRCS)
 
 # Top-Level Targets
 # =================
 
 all-local: icedtea-against-icedtea
 
-check-local: jtregcheck check-tapset
-
-clean-tests: clean-jtreg clean-tapset-report
+check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) check-mimetype
+
+clean-tests: clean-jtreg clean-tapset-report clean-check-mimetype
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
 	  if [ -e test ] ; then \
 	    rmdir test ; \
@@ -1003,7 +1022,7 @@
  clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
  clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
  clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
- clean-bootstrap-directory-symlink-ecj clean-fonts clean-cryptocheck
+ clean-bootstrap-directory-symlink-ecj clean-fonts clean-cryptocheck clean-mimetypecheck
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -1032,7 +1051,7 @@
 	clean-tools-jar clean-copy clean-rt hotspot \
 	hotspot-helper clean-extra clean-jtreg clean-jtreg-reports \
 	clean-add-zero clean-add-zero-debug clean-icedtea clean-icedtea-debug \
-	clean-icedtea-against-ecj \
+	clean-icedtea-against-ecj clean-check-mimetype clean-mimetypecheck \
 	clean-jamvm clean-add-jamvm clean-add-jamvm-debug \
 	clean-cacao clean-add-cacao clean-add-cacao-debug \
 	clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \
@@ -1041,10 +1060,12 @@
 	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
 	clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \


More information about the distro-pkg-dev mailing list