/hg/release/icedtea6-1.13: 10 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Aug 17 03:14:16 UTC 2016
changeset ced27e54d17c in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=ced27e54d17c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Aug 17 03:22:59 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 5f02205c65fb in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=5f02205c65fb
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 0c39aecdacad in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=0c39aecdacad
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Aug 17 03:35:59 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.
changeset 25a95cf50cc8 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=25a95cf50cc8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Aug 17 04:00:23 2016 +0100
PR3117: Add tests for Java debug info and source files
2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3117: Add tests for Java debug info and
source files
* Makefile.am:
(check-java-debug): Guard with
ENABLE_JAVA_DEBUGINFO.
* NEWS: Updated.
2016-07-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3117: Add tests for Java debug info and
source files
* Makefile.am:
(check-local): Depend on check-java-debug and
check-java-src.
(clean-tests): Depend on clean-check-java-debug
and clean-check-java-src.
(.PHONY): Add clean-check-java-src and
clean-check-java-debug.
(check-java-debug): Adapt Omair Majid's Java debug
info test from Fedora RPM to IcedTea.
(clean-check-java-debug): Cleanup target for
check-java-debug.
(check-java-src): Adapt Omair Majid's Java source
file test from Fedora RPM to IcedTea.
(clean-check-java-src): Cleanup target for
check-java-src.
changeset f0018499e963 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=f0018499e963
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 06:16:39 2016 +0100
PR3130: Avoid giving PAX_COMMAND a value if no PaX utility is available
2016-08-14 Andrew John Hughes <gnu.andrew at redhat.com>
PR3130: Avoid giving PAX_COMMAND a value if
no PaX utility is available
* NEWS: Updated.
2014-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3130: Avoid giving PAX_COMMAND a value if
no PaX utility is available
* acinclude.m4:
(IT_WITH_PAX): Leave PAX_COMMAND with the empty
string rather than "not specified" to avoid build
failures.
* pax-mark-vm.in: Update PAX_COMMAND check.
changeset 8cb3232d660b in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=8cb3232d660b
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 06:26:24 2016 +0100
PR3132: PaX marking fails on filesystems which don't support extended attributes
2016-04-07 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3132: PaX marking fails on filesystems which
don't support extended attributes
* Makefile.am:
(pax-mark-vm): Pass true to pax-mark-vm to fail
if PaX marking fails.
(pax-mark-vm-debug): Likewise.
(pax-mark-vm-ecj): Likewise.
* NEWS: Updated.
* pax-mark-vm.in:
Add a second option, FAIL_ON_ERROR, which will
cause the script to exit if it can't PaX mark
when set to true, but just issue a warning when
set to false.
changeset 9057420d85df in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=9057420d85df
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 06:30:32 2016 +0100
PR3129: pax-mark-vm script calls "exit -1" which is invalid in dash
2016-08-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3129: pax-mark-vm script calls "exit -1" which
is invalid in dash
* NEWS: Updated.
* pax-mark-vm.in:
Use POSIX-compliant exit value.
changeset d491b689c5b8 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=d491b689c5b8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Aug 17 03:46:55 2016 +0100
PR3140: Pass $(CC) and $(CXX) to OpenJDK build
2016-08-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3140: Pass $(CC) and $(CXX) to OpenJDK build
* Makefile.am:
(ICEDTEA_ENV): Set CC and CXX instead
of BUILD_GCC and BUILD_CXX. Use $(CC)
and $(CXX) instead of hardcoding gcc
and g++.
* NEWS: Updated.
changeset 71cd145e7a3a in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=71cd145e7a3a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 20:13:54 2016 +0100
PR3142: Don't assume system mime.types supports text/x-java-source
2016-07-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3142: Don't assume system mime.types
supports text/x-java-source
* Makefile.am:
(check-mimetype): Make second test depend
on JAVA_SOURCE_SUPPORTED conditional,
not MIME_TYPES_FILE_FOUND.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_MIME_TYPES): Check if the
system mime types file supports text/x-java-source.
changeset 8746fd545d78 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=8746fd545d78
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Aug 16 04:13:50 2016 +0100
PR3144: Test subdirectory of build tree not emptied
2016-08-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3144: Test subdirectory of build tree not emptied
* Makefile.am:
(CRYPTO_CHECK_BUILD_DIR): Make a subdirectory of
'test'.
(clean-tests): Depend on clean-cryptocheck and
clean-mimetypecheck. Don't try to remove the
test directory as it will always contain the
configure-generated jstapset.pl.
(clean-local); Remove clean-cryptocheck and
clean-mimetypecheck dependencies now handled
by clean-tests.
(clean-mimetypecheck); Depend on clean-check-mimetype
as that removes a file in the directory which
this target deletes.
* NEWS: Updated.
diffstat:
AUTHORS | 1 +
ChangeLog | 214 +++++++++++++++++++++++++++++++++
Makefile.am | 198 ++++++++++++++++++++++++++----
NEWS | 13 ++
acinclude.m4 | 33 ++++-
configure.ac | 2 +
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 +++++++++++++
pax-mark-vm.in | 24 ++-
tapset/hotspot.stp.in | 3 +-
tapset/jstack.stp.in | 54 ++++++--
test/RH1195203.java | 32 ++++
16 files changed, 973 insertions(+), 98 deletions(-)
diffs (truncated from 1596 to 500 lines):
diff -r dcf569e8e778 -r 8746fd545d78 AUTHORS
--- a/AUTHORS Tue May 24 17:57:12 2016 +0100
+++ b/AUTHORS Tue Aug 16 04:13:50 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 dcf569e8e778 -r 8746fd545d78 ChangeLog
--- a/ChangeLog Tue May 24 17:57:12 2016 +0100
+++ b/ChangeLog Tue Aug 16 04:13:50 2016 +0100
@@ -1,3 +1,217 @@
+2016-08-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3144: Test subdirectory of build tree not emptied
+ * Makefile.am:
+ (CRYPTO_CHECK_BUILD_DIR): Make a subdirectory of
+ 'test'.
+ (clean-tests): Depend on clean-cryptocheck and
+ clean-mimetypecheck. Don't try to remove the
+ test directory as it will always contain the
+ configure-generated jstapset.pl.
+ (clean-local); Remove clean-cryptocheck and
+ clean-mimetypecheck dependencies now handled
+ by clean-tests.
+ (clean-mimetypecheck); Depend on clean-check-mimetype
+ as that removes a file in the directory which
+ this target deletes.
+ * NEWS: Updated.
+
+2016-07-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3142: Don't assume system mime.types
+ supports text/x-java-source
+ * Makefile.am:
+ (check-mimetype): Make second test depend
+ on JAVA_SOURCE_SUPPORTED conditional,
+ not MIME_TYPES_FILE_FOUND.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_MIME_TYPES): Check if the
+ system mime types file supports text/x-java-source.
+
+2016-08-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3140: Pass $(CC) and $(CXX) to OpenJDK build
+ * Makefile.am:
+ (ICEDTEA_ENV): Set CC and CXX instead
+ of BUILD_GCC and BUILD_CXX. Use $(CC)
+ and $(CXX) instead of hardcoding gcc
+ and g++.
+ * NEWS: Updated.
+
+2016-08-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3129: pax-mark-vm script calls "exit -1" which
+ is invalid in dash
+ * NEWS: Updated.
+ * pax-mark-vm.in:
+ Use POSIX-compliant exit value.
+
+2016-04-07 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3132: PaX marking fails on filesystems which
+ don't support extended attributes
+ * Makefile.am:
+ (pax-mark-vm): Pass true to pax-mark-vm to fail
+ if PaX marking fails.
+ (pax-mark-vm-debug): Likewise.
+ (pax-mark-vm-ecj): Likewise.
+ * NEWS: Updated.
+ * pax-mark-vm.in:
+ Add a second option, FAIL_ON_ERROR, which will
+ cause the script to exit if it can't PaX mark
+ when set to true, but just issue a warning when
+ set to false.
+
+2016-08-14 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3130: Avoid giving PAX_COMMAND a value if
+ no PaX utility is available
+ * NEWS: Updated.
+
+2014-02-21 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3130: Avoid giving PAX_COMMAND a value if
+ no PaX utility is available
+ * acinclude.m4:
+ (IT_WITH_PAX): Leave PAX_COMMAND with the empty
+ string rather than "not specified" to avoid build
+ failures.
+ * pax-mark-vm.in: Update PAX_COMMAND check.
+
+2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3117: Add tests for Java debug info and
+ source files
+ * NEWS: Updated.
+
+2016-07-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3117: Add tests for Java debug info and
+ source files
+ * Makefile.am:
+ (check-local): Depend on check-java-debug and
+ check-java-src.
+ (clean-tests): Depend on clean-check-java-debug
+ and clean-check-java-src.
+ (.PHONY): Add clean-check-java-src and
+ clean-check-java-debug.
+ (check-java-debug): Adapt Omair Majid's Java debug
+ info test from Fedora RPM to IcedTea.
+ (clean-check-java-debug): Cleanup target for
+ check-java-debug.
+ (check-java-src): Adapt Omair Majid's Java source
+ file test from Fedora RPM to IcedTea.
+ (clean-check-java-src): Cleanup target for
+ check-java-src.
+
+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-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 dcf569e8e778 -r 8746fd545d78 Makefile.am
--- a/Makefile.am Tue May 24 17:57:12 2016 +0100
+++ b/Makefile.am Tue Aug 16 04:13:50 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
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
+MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build
# Source directories
@@ -260,6 +268,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
@@ -627,7 +636,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 += \
@@ -833,8 +847,8 @@
VERBOSE="$(VERBOSE)" \
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
STATIC_CXX="false" \
- BUILD_GCC=gcc$(GCC_SUFFIX) \
- BUILD_CXX=g++$(GCC_SUFFIX) \
+ CC=$(CC)$(GCC_SUFFIX) \
+ CXX=$(CXX)$(GCC_SUFFIX) \
COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
UNLIMITED_CRYPTO="true"
@@ -967,21 +981,19 @@
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
- if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
- if [ -e test ] ; then \
- rmdir test ; \
- fi \
- fi
+check-local: jtregcheck check-tapset check-mimetype \
+ check-java-debug check-java-src
+
+clean-tests: clean-jtreg clean-tapset-report clean-check-mimetype \
+ clean-check-java-debug clean-check-java-src clean-cryptocheck clean-mimetypecheck
clean-local: clean-tests $(PULSE_JAVA_CLEAN_TARGET) \
clean-icedtea clean-icedtea-debug clean-icedtea-ecj clean-extract clean-ports \
@@ -989,7 +1001,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
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -1018,7 +1030,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 \
@@ -1029,7 +1041,9 @@
clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
clean-download-hotspot clean-tests clean-tapset-report jtregcheck clean-pax-mark-vm \
clean-pax-mark-vm-debug clean-pax-mark-vm-ecj clean-check-crypto clean-check-crypto-debug \
- clean-check-crypto-boot clean-cryptocheck
+ clean-check-crypto-boot clean-cryptocheck clean-add-mime-types-file \
+ clean-add-mime-types-file-debug clean-add-mime-types-file-boot clean-check-java-src \
+ clean-check-java-debug
env:
@echo 'unset JAVA_HOME'
@@ -1743,27 +1757,28 @@
stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/pax-mark-vm.stamp \
- stamps/check-crypto.stamp
+ stamps/check-crypto.stamp stamps/add-mime-types-file.stamp
mkdir -p stamps
touch $@
clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
- clean-add-archive clean-pax-mark-vm clean-check-crypto
+ clean-add-archive clean-pax-mark-vm clean-check-crypto clean-add-mime-types-file
rm -f stamps/icedtea-against-icedtea.stamp
stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp \
- stamps/pax-mark-vm-debug.stamp stamps/check-crypto-debug.stamp
+ stamps/pax-mark-vm-debug.stamp stamps/check-crypto-debug.stamp stamps/add-mime-types-file-debug.stamp
mkdir -p stamps
touch $@
clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
- clean-add-archive-debug clean-pax-mark-vm-debug clean-check-crypto-debug
+ clean-add-archive-debug clean-pax-mark-vm-debug clean-check-crypto-debug \
+ clean-add-mime-types-file-debug
rm -f stamps/icedtea-debug-against-icedtea.stamp
stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -2039,7 +2054,7 @@
stamps/pax-mark-vm.stamp: stamps/icedtea.stamp
if WITH_PAX
- $(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_SDK_DIR) true
endif
touch $@
@@ -2048,7 +2063,7 @@
stamps/pax-mark-vm-debug.stamp: stamps/icedtea-debug.stamp
if WITH_PAX
- $(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_SDK_DIR) true
endif
touch $@
@@ -2075,6 +2090,34 @@
clean-check-crypto-debug:
rm -f stamps/check-crypto-debug.stamp
+stamps/add-mime-types-file.stamp: stamps/icedtea.stamp
+if MIME_TYPES_FILE_FOUND
+ if [ -e $(BUILD_SDK_DIR)/jre/lib ] ; then \
+ ln -sf $(MIME_TYPES_FILE) $(BUILD_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+endif
+ touch $@
+
+clean-add-mime-types-file:
+ if [ -e $(BUILD_SDK_DIR)/jre/lib/mime.types ] ; then \
+ rm -vf $(BUILD_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+ rm -f stamps/add-mime-types-file.stamp
+
+stamps/add-mime-types-file-debug.stamp: stamps/icedtea-debug.stamp
+if MIME_TYPES_FILE_FOUND
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib ] ; then \
+ ln -sf $(MIME_TYPES_FILE) $(BUILD_DEBUG_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+endif
+ touch $@
+
+clean-add-mime-types-file-debug:
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib/mime.types ] ; then \
+ rm -vf $(BUILD_DEBUG_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+ rm -f stamps/add-mime-types-file-debug.stamp
+
# OpenJDK ecj Targets
# ===================
@@ -2096,12 +2139,14 @@
stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
- stamps/add-archive-ecj.stamp stamps/pax-mark-vm-ecj.stamp stamps/check-crypto-boot.stamp
+ stamps/add-archive-ecj.stamp stamps/pax-mark-vm-ecj.stamp stamps/check-crypto-boot.stamp \
+ stamps/add-mime-types-file-boot.stamp
mkdir -p stamps
touch $@
clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \
- clean-add-tzdata-support-ecj clean-add-archive-ecj clean-pax-mark-vm-ecj clean-check-crypto-boot
+ clean-add-tzdata-support-ecj clean-add-archive-ecj clean-pax-mark-vm-ecj clean-check-crypto-boot \
+ clean-add-mime-types-file-boot
rm -f stamps/icedtea-against-ecj.stamp
stamps/add-systemtap-ecj.stamp: stamps/icedtea-ecj.stamp
@@ -2242,7 +2287,7 @@
stamps/pax-mark-vm-ecj.stamp: stamps/icedtea-ecj.stamp
if WITH_PAX
- $(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+ $(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR) true
endif
touch $@
@@ -2259,6 +2304,20 @@
clean-check-crypto-boot:
rm -f stamps/check-crypto-boot.stamp
+stamps/add-mime-types-file-boot.stamp: stamps/icedtea-ecj.stamp
+if MIME_TYPES_FILE_FOUND
+ if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib ] ; then \
+ ln -sf $(MIME_TYPES_FILE) $(BUILD_BOOT_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+endif
+ touch $@
+
+clean-add-mime-types-file-boot:
+ if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib/mime.types ] ; then \
+ rm -vf $(BUILD_BOOT_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+ rm -f stamps/add-mime-types-file-boot.stamp
+
# Rebuild targets
rebuild:
@@ -2677,7 +2736,7 @@
# end additional VMs
-# jtreg
+# Test cases
stamps/jtreg.stamp: stamps/icedtea-against-icedtea.stamp
rm -rf test/jtreg/classes
@@ -2812,6 +2871,62 @@
rm -f test/check-stap.log
endif
+stamps/check-mimetype.stamp: stamps/mimetypecheck.stamp stamps/icedtea.stamp
+ if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
+ echo "<html><head/><body/></html>" > $(MIME_TYPE_CHECK_BUILD_DIR)/test.html ; \
+ expected="text/html" ; \
More information about the distro-pkg-dev
mailing list