summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsource.local/l/openjdk/openjdk.SlackBuild10
-rw-r--r--source.local/l/openjdk/sources/BUILDING.txt27
-rw-r--r--source.local/l/openjdk/sources/Makefile.in623
-rw-r--r--source.local/l/openjdk/sources/hotspot.map3
4 files changed, 459 insertions, 204 deletions
diff --git a/source.local/l/openjdk/openjdk.SlackBuild b/source.local/l/openjdk/openjdk.SlackBuild
index db79e7d..daa9c4c 100755
--- a/source.local/l/openjdk/openjdk.SlackBuild
+++ b/source.local/l/openjdk/openjdk.SlackBuild
@@ -23,9 +23,9 @@
PKGNAM1=openjdk
PKGNAM2=openjre
-JAVAVER=7u21
-JAVABLD=b02
-ICEDTEA=2.3.9
+JAVAVER=7u40
+JAVABLD=b20
+ICEDTEA=2.4.0
VERSION="${JAVAVER}_${JAVABLD}"
BUILD=${BUILD:-1}
@@ -51,8 +51,8 @@ DEBUGBUILD=${DEBUGBUILD:-"NO"}
# for all of these tarballs; if the tarball does not verify then it will be
# downloaded again:
-SRC_CACAO=cacao-a567bcb7f589.tar.gz
-SRC_JAMVM=jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
+SRC_CACAO=cacao-e215e36be9fc.tar.gz
+SRC_JAMVM=jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz
SRC_CORBA=corba.tar.gz
SRC_HOTSPOT=hotspot.tar.gz
SRC_JAXP=jaxp.tar.gz
diff --git a/source.local/l/openjdk/sources/BUILDING.txt b/source.local/l/openjdk/sources/BUILDING.txt
index f55d75d..2c19e56 100644
--- a/source.local/l/openjdk/sources/BUILDING.txt
+++ b/source.local/l/openjdk/sources/BUILDING.txt
@@ -1,23 +1,26 @@
# You can run this script in the sources/ subdirectory to download the sources.
-# For icedtea-2.3.9 the tarballs are:
-wget http://icedtea.classpath.org/download/source/icedtea-2.3.9.tar.gz
+# For icedtea-2.4.0 the tarballs are:
+wget http://icedtea.classpath.org/download/source/icedtea-2.4.0.tar.gz
+
#
# These source URLs are constructed from reading the Makefile.in of icedtea:
# egrep '(^OPENJDK_VERSION|^JDK_UPDATE_VERSION|^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL)' Makefile.in
#
-# In icedtea-2.3.8 you can choose between "default" and "zero" versions
+# In icedtea you can choose between "default" and "zero" versions
# of the VM. The zero vm is meant for ARM based systems.
# Use this command to find out the hash of the hopspot.zip
# grep default hotspot.map
#
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/archive/12b96a57263c.tar.gz -O openjdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba/archive/47a6bf94ce11.tar.gz -O corba.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxp/archive/d2142901bcb7.tar.gz -O jaxp.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jdk/archive/8e91101e36f0.tar.gz -O jdk.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/langtools/archive/fd956199cb82.tar.gz -O langtools.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws/archive/b1877762d45c.tar.gz -O jaxws.tar.gz
-wget http://icedtea.classpath.org/download/drops/cacao/a567bcb7f589.tar.gz -O cacao-a567bcb7f589.tar.gz
-wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
-wget http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot/archive/ad5a321edea2.tar.gz -O hotspot.tar.gz
+FORESTURL="http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4"
+
+wget ${FORESTURL}/archive/9c74cb4a3ae8.tar.gz -O openjdk.tar.gz
+wget ${FORESTURL}/corba/archive/71d5ec2f3dfb.tar.gz -O corba.tar.gz
+wget ${FORESTURL}/jaxp/archive/5eaf3bca7f68.tar.gz -O jaxp.tar.gz
+wget ${FORESTURL}/jdk/archive/29ce11184945.tar.gz -O jdk.tar.gz
+wget ${FORESTURL}/langtools/archive/ffb1b6bc4750.tar.gz -O langtools.tar.gz
+wget ${FORESTURL}/jaxws/archive/9d2007a13c02.tar.gz -O jaxws.tar.gz
+wget ${FORESTURL}/hotspot/archive/c67fd7874b1a.tar.gz -O hotspot.tar.gz
+wget http://icedtea.classpath.org/download/drops/cacao/e215e36be9fc.tar.gz -O cacao-e215e36be9fc.tar.gz
+wget http://icedtea.classpath.org/download/drops/jamvm/jamvm-7c8dceb90880616b7dd670f257961a1f5f371ec3.tar.gz
diff --git a/source.local/l/openjdk/sources/Makefile.in b/source.local/l/openjdk/sources/Makefile.in
index db53d48..a50a62f 100644
--- a/source.local/l/openjdk/sources/Makefile.in
+++ b/source.local/l/openjdk/sources/Makefile.in
@@ -86,124 +86,117 @@ host_triplet = @host@
# Conditional patches
-@WITH_ALT_HSBUILD_TRUE@am__append_8 = \
-@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7089790-bsd_port.patch \
-@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7098194-macosx_port.patch \
-@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/7116189-setnativethreadname.patch \
-@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/6924259-string_offset.patch \
-@WITH_ALT_HSBUILD_TRUE@ patches/hotspot/$(HSBUILD)/revert_arm_debug.patch
-
-@WITH_RHINO_TRUE@am__append_9 = \
+@WITH_RHINO_TRUE@am__append_8 = \
@WITH_RHINO_TRUE@ patches/rhino.patch
-@BUILD_CACAO_TRUE@am__append_10 = \
+@BUILD_CACAO_TRUE@am__append_9 = \
@BUILD_CACAO_TRUE@ patches/cacao/launcher.patch \
-@BUILD_CACAO_TRUE@ patches/cacao/jsig.patch \
@BUILD_CACAO_TRUE@ patches/cacao/memory.patch
-@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_11 = \
+@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@am__append_10 = \
@BUILD_CACAO_FALSE@@USING_CACAO_TRUE@ patches/cacao/memory.patch
-@ENABLE_CACAO_TRUE@am__append_12 = \
+@ENABLE_CACAO_TRUE@am__append_11 = \
@ENABLE_CACAO_TRUE@ patches/cacao/ignore-tests.patch
-@BUILD_JAMVM_TRUE@am__append_13 = \
-@BUILD_JAMVM_TRUE@ patches/jamvm/remove-sun.misc.Perf-debug-code.patch
-
-@ENABLE_PULSE_JAVA_TRUE@am__append_14 = \
+@ENABLE_PULSE_JAVA_TRUE@am__append_12 = \
@ENABLE_PULSE_JAVA_TRUE@ patches/pulse-soundproperties.patch
-@ENABLE_SYSTEMTAP_TRUE@am__append_15 = patches/systemtap.patch
-@ENABLE_NSS_TRUE@am__append_16 = patches/nss-config.patch
-@ENABLE_NSS_FALSE@am__append_17 = patches/nss-not-enabled-config.patch
-@WITH_PAX_TRUE@am__append_18 = \
-@WITH_PAX_TRUE@ patches/test_gamma.patch \
-@WITH_PAX_TRUE@ patches/pax-mark-rmic-java.patch
+@ENABLE_SYSTEMTAP_TRUE@am__append_13 = \
+@ENABLE_SYSTEMTAP_TRUE@ patches/systemtap_gc.patch
+
+@ENABLE_NSS_TRUE@am__append_14 = patches/nss-config.patch
+@WITH_PAX_TRUE@am__append_15 = patches/test_gamma.patch
+@DISABLE_BOOTSTRAP_TOOLS_FALSE@am__append_16 = \
+@DISABLE_BOOTSTRAP_TOOLS_FALSE@ patches/boot/bootstrap-tools.patch
+
+@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@am__append_17 = \
+@VM_SUPPORTS_XBOOTCLASSPATH_FALSE@ patches/boot/xbootclasspath.patch
-@WITH_PAX_FALSE@am__append_19 = patches/boot/test_gamma.patch
-@CP39408_JAVAH_TRUE@am__append_20 = patches/boot/pr39408.patch
-@CP40188_JAVAH_TRUE@am__append_21 = patches/boot/pr40188.patch \
+@WITH_PAX_FALSE@am__append_18 = patches/boot/test_gamma.patch
+@CP39408_JAVAH_TRUE@am__append_19 = patches/boot/pr39408.patch
+@CP40188_JAVAH_TRUE@am__append_20 = patches/boot/pr40188.patch \
@CP40188_JAVAH_TRUE@ patches/boot/javah.patch
-@CP45526_JAVAH_TRUE@am__append_22 = patches/boot/explicit-inner-class-headers.patch
-@CP40616_TRUE@am__append_23 = patches/boot/pr40616.patch
-@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_24 = $(SCANNER_PATCHES)
-@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_25 = $(SCANNER_PATCHES)
-@JAVAC_LACKS_DIAMOND_TRUE@am__append_26 = patches/boot/ecj-diamond.patch
-@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch
-@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7-cacao-mem.patch
-@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_29 = patches/boot/compile-for-7.patch
-@DTDTYPE_QNAME_TRUE@am__append_30 = patches/boot/jaxws-getdtdtype.patch
-@NO_BYTECODE7_TRUE@am__append_31 = patches/boot/use_target_6_for_bootstrap_classes.patch
-@ENABLE_CACAO_TRUE@am__append_32 = \
+@CP45526_JAVAH_TRUE@am__append_21 = patches/boot/explicit-inner-class-headers.patch
+@CP40616_TRUE@am__append_22 = patches/boot/pr40616.patch
+@LACKS_JAVA_UTIL_SCANNER_TRUE@am__append_23 = $(SCANNER_PATCHES)
+@CP40630_TRUE@@LACKS_JAVA_UTIL_SCANNER_FALSE@am__append_24 = $(SCANNER_PATCHES)
+@JAVAC_LACKS_DIAMOND_TRUE@am__append_25 = patches/boot/ecj-diamond.patch
+@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_TRUE@am__append_26 = patches/boot/compile-for-7-cacao-mem.patch
+@BUILD_CACAO_TRUE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_27 = patches/boot/compile-for-7-cacao-mem.patch
+@BUILD_CACAO_FALSE@@JAVAC_LACKS_DIAMOND_FALSE@@USING_CACAO_FALSE@am__append_28 = patches/boot/compile-for-7.patch
+@DTDTYPE_QNAME_TRUE@am__append_29 = patches/boot/jaxws-getdtdtype.patch
+@NO_BYTECODE7_TRUE@am__append_30 = patches/boot/use_target_6_for_bootstrap_classes.patch
+@ENABLE_CACAO_TRUE@am__append_31 = \
@ENABLE_CACAO_TRUE@ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-@ENABLE_JAMVM_TRUE@am__append_33 = \
+@ENABLE_JAMVM_TRUE@am__append_32 = \
@ENABLE_JAMVM_TRUE@ ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
-@DISABLE_OPTIMIZATIONS_TRUE@am__append_34 = \
+@DISABLE_OPTIMIZATIONS_TRUE@am__append_33 = \
@DISABLE_OPTIMIZATIONS_TRUE@ NO_OPTIMIZATIONS="true" \
@DISABLE_OPTIMIZATIONS_TRUE@ CC_NO_OPT="-O0 -g"
-@ENABLE_DOCS_FALSE@am__append_35 = \
+@ENABLE_DOCS_FALSE@am__append_34 = \
@ENABLE_DOCS_FALSE@ NO_DOCS="true"
-@USE_ALT_JAR_TRUE@am__append_36 = \
+@USE_ALT_JAR_TRUE@am__append_35 = \
@USE_ALT_JAR_TRUE@ ALT_JAR_CMD="$(ALT_JAR_CMD)"
-@HAS_HOTSPOT_REVISION_TRUE@am__append_37 = \
+@HAS_HOTSPOT_REVISION_TRUE@am__append_36 = \
@HAS_HOTSPOT_REVISION_TRUE@ HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
-@WITH_RHINO_TRUE@am__append_38 = \
+@WITH_RHINO_TRUE@am__append_37 = \
@WITH_RHINO_TRUE@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
-@USE_SYSTEM_ZLIB_TRUE@am__append_39 = \
-@USE_SYSTEM_ZLIB_TRUE@ USE_SYSTEM_ZLIB="true" \
+@USE_SYSTEM_ZLIB_TRUE@am__append_38 = \
+@USE_SYSTEM_ZLIB_TRUE@ SYSTEM_ZLIB="true" \
@USE_SYSTEM_ZLIB_TRUE@ ZLIB_LIBS="${ZLIB_LIBS}" \
@USE_SYSTEM_ZLIB_TRUE@ ZLIB_CFLAGS="${ZLIB_CFLAGS}"
-@USE_SYSTEM_LCMS_TRUE@am__append_40 = \
+@USE_SYSTEM_LCMS_TRUE@am__append_39 = \
@USE_SYSTEM_LCMS_TRUE@ USE_SYSTEM_LCMS="true" \
@USE_SYSTEM_LCMS_TRUE@ LCMS_LIBS="${LCMS2_LIBS}" \
@USE_SYSTEM_LCMS_TRUE@ LCMS_CFLAGS="${LCMS2_CFLAGS}"
-@USE_SYSTEM_JPEG_TRUE@am__append_41 = \
+@USE_SYSTEM_JPEG_TRUE@am__append_40 = \
@USE_SYSTEM_JPEG_TRUE@ USE_SYSTEM_JPEG="true" \
@USE_SYSTEM_JPEG_TRUE@ JPEG_LIBS="${JPEG_LIBS}" \
@USE_SYSTEM_JPEG_TRUE@ JPEG_CFLAGS="${JPEG_CFLAGS}"
-@USE_SYSTEM_PNG_TRUE@am__append_42 = \
+@USE_SYSTEM_PNG_TRUE@am__append_41 = \
@USE_SYSTEM_PNG_TRUE@ USE_SYSTEM_PNG="true" \
@USE_SYSTEM_PNG_TRUE@ PNG_LIBS="${PNG_LIBS}" \
@USE_SYSTEM_PNG_TRUE@ PNG_CFLAGS="${PNG_CFLAGS}"
-@USE_SYSTEM_GIF_TRUE@am__append_43 = \
+@USE_SYSTEM_GIF_TRUE@am__append_42 = \
@USE_SYSTEM_GIF_TRUE@ USE_SYSTEM_GIF="true" \
@USE_SYSTEM_GIF_TRUE@ GIF_LIBS="${GIF_LIBS}" \
@USE_SYSTEM_GIF_TRUE@ GIF_CFLAGS="${GIF_CFLAGS}"
-@USE_SYSTEM_GTK_TRUE@am__append_44 = \
+@USE_SYSTEM_GTK_TRUE@am__append_43 = \
@USE_SYSTEM_GTK_TRUE@ USE_SYSTEM_GTK="true" \
@USE_SYSTEM_GTK_TRUE@ GTK_LIBS="${GTK_LIBS}" \
@USE_SYSTEM_GTK_TRUE@ GTK_CFLAGS="${GTK_CFLAGS}"
-@USE_SYSTEM_GIO_TRUE@am__append_45 = \
+@USE_SYSTEM_GIO_TRUE@am__append_44 = \
@USE_SYSTEM_GIO_TRUE@ USE_SYSTEM_GIO="true" \
@USE_SYSTEM_GIO_TRUE@ GIO_LIBS="${GIO_LIBS}" \
@USE_SYSTEM_GIO_TRUE@ GIO_CFLAGS="${GIO_CFLAGS}"
-@USE_SYSTEM_FONTCONFIG_TRUE@am__append_46 = \
+@USE_SYSTEM_FONTCONFIG_TRUE@am__append_45 = \
@USE_SYSTEM_FONTCONFIG_TRUE@ USE_SYSTEM_FONTCONFIG="true" \
@USE_SYSTEM_FONTCONFIG_TRUE@ FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
@USE_SYSTEM_FONTCONFIG_TRUE@ FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
-@USE_SYSCALL_COMPILATION_TRUE@am__append_47 = \
+@USE_SYSCALL_COMPILATION_TRUE@am__append_46 = \
@USE_SYSCALL_COMPILATION_TRUE@ COMPILE_AGAINST_SYSCALLS="true"
-@ENABLE_JAR_COMPRESSION_TRUE@am__append_48 = \
+@ENABLE_JAR_COMPRESSION_TRUE@am__append_47 = \
@ENABLE_JAR_COMPRESSION_TRUE@ COMPRESS_JARS="true"
-@ADD_SHARK_BUILD_TRUE@am__append_49 = \
+@ADD_SHARK_BUILD_TRUE@am__append_48 = \
@ADD_SHARK_BUILD_TRUE@ --enable-shark
subdir = .
@@ -214,6 +207,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/remove-intree-libraries.sh.in \
$(srcdir)/tz.properties.in $(top_srcdir)/configure \
$(top_srcdir)/tapset/hotspot.stp.in \
+ $(top_srcdir)/tapset/hotspot_gc.stp.in \
$(top_srcdir)/tapset/hotspot_jni.stp.in \
$(top_srcdir)/tapset/jstack.stp.in AUTHORS COPYING ChangeLog \
INSTALL NEWS config.guess config.sub install-sh missing
@@ -227,7 +221,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = nss.cfg javac javap javah tz.properties \
pax-mark-vm remove-intree-libraries.sh tapset/hotspot.stp \
- tapset/hotspot_jni.stp tapset/jstack.stp
+ tapset/hotspot_jni.stp tapset/jstack.stp tapset/hotspot_gc.stp
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -259,6 +253,7 @@ ABS_SERVER_LIBJVM_SO = @ABS_SERVER_LIBJVM_SO@
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
+ALT_CACAO_SRC_DIR = @ALT_CACAO_SRC_DIR@
ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
ALT_CORBA_SRC_ZIP = @ALT_CORBA_SRC_ZIP@
ALT_HOTSPOT_SRC_ZIP = @ALT_HOTSPOT_SRC_ZIP@
@@ -493,32 +488,32 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-OPENJDK_VERSION = b02
-JDK_UPDATE_VERSION = 21
+OPENJDK_VERSION = b20
+JDK_UPDATE_VERSION = 40
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 47a6bf94ce11
-JAXP_CHANGESET = d2142901bcb7
-JAXWS_CHANGESET = b1877762d45c
-JDK_CHANGESET = 8e91101e36f0
-LANGTOOLS_CHANGESET = fd956199cb82
-OPENJDK_CHANGESET = 12b96a57263c
-CORBA_SHA256SUM = 7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934
-JAXP_SHA256SUM = 8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6
-JAXWS_SHA256SUM = b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc
-JDK_SHA256SUM = 349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e
-LANGTOOLS_SHA256SUM = 2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12
-OPENJDK_SHA256SUM = 651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc
-CACAO_VERSION = a567bcb7f589
-CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
+CORBA_CHANGESET = 71d5ec2f3dfb
+JAXP_CHANGESET = 5eaf3bca7f68
+JAXWS_CHANGESET = 9d2007a13c02
+JDK_CHANGESET = 29ce11184945
+LANGTOOLS_CHANGESET = ffb1b6bc4750
+OPENJDK_CHANGESET = 9c74cb4a3ae8
+CORBA_SHA256SUM = 0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c
+JAXP_SHA256SUM = 25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd
+JAXWS_SHA256SUM = 4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456
+JDK_SHA256SUM = 13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352
+LANGTOOLS_SHA256SUM = 80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3
+OPENJDK_SHA256SUM = 4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579
+CACAO_VERSION = e215e36be9fc
+CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
-JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82
-JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03
+JAMVM_VERSION = 7c8dceb90880616b7dd670f257961a1f5f371ec3
+JAMVM_SHA256SUM = 1584d8599bfd799a71baac0694bb3ed9b9fcd14a8548234b24266571e0acfc97
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
-ICEDTEA_PREFIX = icedtea7-forest-2.3
+ICEDTEA_PREFIX = icedtea7-forest-2.4
ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/release/$(ICEDTEA_PREFIX)
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
@@ -551,13 +546,14 @@ REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
# Source directories
SHARE = openjdk-boot/jdk/src/share/classes
SOLARIS = openjdk-boot/jdk/src/solaris/classes
LANGTOOLS = openjdk-boot/langtools/src/share/classes
CORBA = openjdk-boot/corba/src/share/classes
-JAXWS = openjdk-boot/jaxws/sources/jaxws_src/src
+JAXWS = openjdk-boot/jaxws/src/share/jaxws_classes:openjdk-boot/jaxws/src/share/jaf_classes
PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
@@ -568,10 +564,8 @@ PULSE_JAVA_NATIVE_OBJECTS = \
PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-@DTDTYPE_QNAME_TRUE@JAXWS_COND = $(JAXWS)
-@LACKS_JAVAX_ANNOTATION_RESOURCE_TRUE@JAXWS_COND = $(JAXWS)
OPENJDK_SOURCEPATH_DIRS = \
- $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS_COND)
+ $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA):$(JAXWS)
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
@@ -639,7 +633,7 @@ IT_CFLAGS = $(CFLAGS) $(ARCHFLAG)
# 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
+OPENJDK_TREE = stamps/overlay.stamp stamps/add-nss.stamp
# Target to ensure a patched OpenJDK bootstrap tree containing
# Zero & Shark, any other overlays and the bootstrapping patches
@@ -648,25 +642,24 @@ OPENJDK_BOOT_TREE = stamps/patch-boot.stamp
# Sources list
REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
+CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
# Patch list
-ICEDTEA_PATCHES = patches/hotspot/$(HSBUILD)/revert-7017193.patch \
- $(am__append_8) $(am__append_9) $(am__append_10) \
+ICEDTEA_PATCHES = $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11) $(am__append_12) $(am__append_13) \
- $(am__append_14) $(am__append_15) $(am__append_16) \
- $(am__append_17) $(am__append_18) $(DISTRIBUTION_PATCHES)
+ $(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
- patches/boot/demos.patch patches/boot/ecj-fphexconstants.patch \
+ patches/boot/demos.patch patches/boot/fphexconstants.patch \
patches/boot/fontconfig.patch \
patches/boot/generated-comments.patch \
- patches/boot/xbootclasspath.patch patches/boot/icedteart.patch \
- patches/boot/jar.patch patches/boot/symbols.patch \
- patches/boot/tobin.patch patches/boot/tools.jar.patch \
- patches/boot/jopt.patch patches/boot/jaxp-dependency.patch \
+ patches/boot/icedteart.patch patches/boot/jar.patch \
+ patches/boot/symbols.patch patches/boot/tobin.patch \
+ patches/boot/tools.jar.patch patches/boot/jopt.patch \
+ patches/boot/jaxp-dependency.patch \
patches/boot/genstubs-nofork.patch \
patches/boot/getannotation-cast.patch \
patches/boot/break-processbuilder-dependency.patch \
@@ -681,11 +674,12 @@ ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch patches/boot/xsltproc.patch \
- $(am__append_19) $(am__append_20) $(am__append_21) \
- $(am__append_22) $(am__append_23) $(am__append_24) \
- $(am__append_25) $(am__append_26) $(am__append_27) \
- $(am__append_28) $(am__append_29) $(am__append_30) \
- $(am__append_31) $(DISTRIBUTION_BOOT_PATCHES)
+ patches/boot/ecj-odd.patch $(am__append_16) $(am__append_17) \
+ $(am__append_18) $(am__append_19) $(am__append_20) \
+ $(am__append_21) $(am__append_22) $(am__append_23) \
+ $(am__append_24) $(am__append_25) $(am__append_26) \
+ $(am__append_27) $(am__append_28) $(am__append_29) \
+ $(am__append_30) $(DISTRIBUTION_BOOT_PATCHES)
# Patches for when java.util.Scanner is missing
# or has the bug #40630 (all these classes rely
@@ -734,13 +728,13 @@ ICEDTEA_ENV = ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" ANT="$(ANT)" \
USE_SYSTEM_CUPS="true" CUPS_LIBS="${CUPS_LIBS}" \
CUPS_CFLAGS="${CUPS_CFLAGS}" STRIP_POLICY=no_strip \
JAVAC_WARNINGS_FATAL="$(WERROR_STATUS)" \
- COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" $(am__append_32) \
+ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \
+ UNLIMITED_CRYPTO="true" $(am__append_31) $(am__append_32) \
$(am__append_33) $(am__append_34) $(am__append_35) \
$(am__append_36) $(am__append_37) $(am__append_38) \
$(am__append_39) $(am__append_40) $(am__append_41) \
$(am__append_42) $(am__append_43) $(am__append_44) \
- $(am__append_45) $(am__append_46) $(am__append_47) \
- $(am__append_48)
+ $(am__append_45) $(am__append_46) $(am__append_47)
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
@@ -813,7 +807,6 @@ GENERATED_FILES = $(top_srcdir)/generated/com/sun/java/swing/plaf/gtk/resources/
$(top_srcdir)/generated/sun/util/resources/*.java \
$(top_srcdir)/generated/sun/print/resources/serviceui*.java \
$(top_srcdir)/generated/sun/tools/jar/resources/jar*.java \
- $(top_srcdir)/generated/sun/tools/jconsole/*.java \
$(top_srcdir)/generated/sun/management/resources/agent*.java \
$(top_srcdir)/generated/java/nio/*.java \
$(top_srcdir)/generated/java/nio/channels/*.java \
@@ -916,9 +909,7 @@ PULSEAUDIO_SRCS = $(top_srcdir)/pulseaudio/src/java/org/classpath/icedtea/pulsea
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
- $(top_srcdir)/patches/jamvm/*.patch \
$(top_srcdir)/patches/boot/hotspot/*/*.patch \
- $(top_srcdir)/patches/hotspot/*/*.patch \
tools-copy contrib overlays \
javaws.png javaws.desktop \
jconsole.desktop policytool.desktop \
@@ -928,15 +919,17 @@ EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
+ tapset/hotspot_gc.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
rewriter/agpl-3.0.txt \
$(REWRITER_SRCS) \
- THANKYOU test/tapset
+ test/tapset \
+ $(CRYPTO_CHECK_SRCS)
ADD_ZERO_CONFIGURE_ARGS = \
--with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
- --disable-bootstrap --enable-zero $(am__append_49) \
+ --disable-bootstrap --enable-zero $(am__append_48) \
--disable-docs $(filter-out '--with-jdk-home=% '--with-ecj=% \
'--with-java=% '--with-javah=% '--with-javac=% '--with-javac=% \
'--with-rmic=% '--with-additional-vms=% '--disable-bootstrap% \
@@ -1018,6 +1011,8 @@ tapset/hotspot_jni.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/hotsp
cd $(top_builddir) && $(SHELL) ./config.status $@
tapset/jstack.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/jstack.stp.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+tapset/hotspot_gc.stp: $(top_builddir)/config.status $(top_srcdir)/tapset/hotspot_gc.stp.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
tags: TAGS
TAGS:
@@ -1323,7 +1318,9 @@ clean-local: clean-tests clean-pulse-java \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter
+ clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
+ clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
+ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug clean-cryptocheck
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -1353,7 +1350,12 @@ install:
jtregcheck clean-remove-intree-libraries \
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-extract-hotspot clean-sanitise-openjdk \
- clean-tests clean-tapset-report
+ clean-tests clean-tapset-report clean-add-systemtap \
+ clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
+ clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
+ clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-tzdata-support-boot \
+ clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
+ clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck
env:
@echo 'unset JAVA_HOME'
@@ -1561,23 +1563,23 @@ clean-download-openjdk:
rm -f stamps/download-openjdk.stamp
stamps/download-cacao.stamp:
-@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_ZIP_TRUE@@USE_SYSTEM_CACAO_FALSE@ ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ | $(SHA256SUM) --check ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ then \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ if test "x$(enable_downloading)" = "xyes"; then \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ if [ -e $(CACAO_SRC_ZIP) ] ; then \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ fi ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ | $(SHA256SUM) --check ; then \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ echo "ERROR: Bad download of CACAO zip"; false; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ fi; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ else \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ echo "ERROR: No up-to-date CACAO zip available"; exit -1; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ fi ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ fi
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_ALT_CACAO_SRC_ZIP_TRUE@@USE_SYSTEM_CACAO_FALSE@ ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ | $(SHA256SUM) --check ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ then \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ if test "x$(enable_downloading)" = "xyes"; then \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ if [ -e $(CACAO_SRC_ZIP) ] ; then \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ fi ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ | $(SHA256SUM) --check ; then \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ echo "ERROR: Bad download of CACAO zip"; false; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ fi; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ else \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ echo "ERROR: No up-to-date CACAO zip available"; exit -1; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ fi ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ fi
mkdir -p stamps
touch $@
@@ -1748,16 +1750,21 @@ clean-sanitise-openjdk:
rm -f stamps/sanitise-openjdk.stamp
stamps/extract-cacao.stamp: stamps/download-cacao.stamp
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ set -e ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ if ! test -d cacao/cacao ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ then \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ mkdir cacao ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ dir=$$(basename cacao/cacao-*) ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ ln -s $$dir cacao/cacao ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ cd cacao/cacao ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ cd .. ; \
-@BUILD_CACAO_TRUE@@USE_SYSTEM_CACAO_FALSE@ fi
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@ if ! test -d cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@ then \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@ mkdir -p cacao/cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@ cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_TRUE@@USE_SYSTEM_CACAO_FALSE@ fi
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ set -e ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ if ! test -d cacao/cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ then \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ mkdir cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ dir=$$(basename cacao/cacao-*) ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ ln -s $$dir cacao/cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ cd cacao/cacao ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ cd .. ; \
+@BUILD_CACAO_TRUE@@USE_ALT_CACAO_SRC_DIR_FALSE@@USE_SYSTEM_CACAO_FALSE@ fi
mkdir -p stamps
touch $@
@@ -2151,8 +2158,7 @@ clean-bootstrap-directory-symlink-stage2:
# you change it in the icedtea-debug target as well.
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
- stamps/jamvm.stamp
+ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
$(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -2162,19 +2168,15 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
-@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
-@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-@ENABLE_PULSE_JAVA_TRUE@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-@ENABLE_PULSE_JAVA_TRUE@ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
@ZERO_BUILD_TRUE@ printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
@SHARK_BUILD_TRUE@ printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
@ENABLE_CACAO_TRUE@ printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+@ENABLE_JAMVM_TRUE@ printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+ @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+ touch $@
+
+stamps/add-systemtap.stamp: stamps/icedtea.stamp
@ENABLE_SYSTEMTAP_TRUE@ mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
@ENABLE_SYSTEMTAP_TRUE@ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
@ENABLE_SYSTEMTAP_TRUE@ if test $$? -eq 0; then \
@@ -2184,27 +2186,90 @@ stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
@ENABLE_SYSTEMTAP_TRUE@ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
+@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+@ENABLE_SYSTEMTAP_TRUE@ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
@ENABLE_SYSTEMTAP_TRUE@ else \
@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot.stp \
@ENABLE_SYSTEMTAP_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
@ENABLE_SYSTEMTAP_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+@ENABLE_SYSTEMTAP_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
@ENABLE_SYSTEMTAP_TRUE@ fi; \
@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
@ENABLE_SYSTEMTAP_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
- cp $(abs_top_builddir)/nss.cfg \
- $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-@WITH_TZDATA_DIR_TRUE@ cp $(abs_top_builddir)/tz.properties \
-@WITH_TZDATA_DIR_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
-@ENABLE_JAMVM_TRUE@ printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
- @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+ touch stamps/add-systemtap.stamp
+
+clean-add-systemtap:
+ rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap.stamp
+
+stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
+@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
+@ENABLE_PULSE_JAVA_TRUE@ $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+@ENABLE_PULSE_JAVA_TRUE@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+@ENABLE_PULSE_JAVA_TRUE@ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+ touch stamps/add-pulseaudio.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio:
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio.stamp
+
+stamps/add-nss.stamp: stamps/extract-openjdk.stamp
+ cp -v $(abs_top_builddir)/nss.cfg openjdk/jdk/src/share/lib/security;
+ touch stamps/add-nss.stamp
+
+clean-add-nss:
+ rm -f openjdk/jdk/src/share/lib/security/nss.cfg
+ rm -f stamps/add-nss.stamp
+
+stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
+@WITH_TZDATA_DIR_TRUE@ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+@WITH_TZDATA_DIR_TRUE@ cp -v $(abs_top_builddir)/tz.properties \
+@WITH_TZDATA_DIR_TRUE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
+@WITH_TZDATA_DIR_TRUE@ fi
+ touch stamps/add-tzdata-support.stamp
+
+clean-add-tzdata-support:
+ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+ rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ fi
+ rm -f stamps/add-tzdata-support.stamp
+
+stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp
+ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ fi
mkdir -p stamps
touch $@
+clean-check-crypto:
+ rm -f stamps/check-crypto.stamp
+
+stamps/add-archive.stamp: stamps/icedtea.stamp
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ fi
+ touch stamps/add-archive.stamp
+
+clean-add-archive:
+ rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
+ rm -f stamps/add-archive.stamp
+
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
- stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \
- stamps/jamvm.stamp
+ stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
$(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -2214,19 +2279,20 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
-@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
-@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
-@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
-@ENABLE_PULSE_JAVA_TRUE@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-@ENABLE_PULSE_JAVA_TRUE@ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
@ZERO_BUILD_TRUE@ printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
@SHARK_BUILD_TRUE@ printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
@ENABLE_CACAO_TRUE@ printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+@ENABLE_JAMVM_TRUE@ printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+ @echo "IcedTea (debug build) is served:" \
+ $(DEBUG_BUILD_OUTPUT_DIR)
+ mkdir -p stamps
+ touch $@
+
+clean-icedtea:
+ rm -rf $(BUILD_OUTPUT_DIR)
+ rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
+
+stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp
@ENABLE_SYSTEMTAP_TRUE@ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
@ENABLE_SYSTEMTAP_TRUE@ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
@ENABLE_SYSTEMTAP_TRUE@ if test $$? -eq 0; then \
@@ -2236,42 +2302,99 @@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
@ENABLE_SYSTEMTAP_TRUE@ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
+@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+@ENABLE_SYSTEMTAP_TRUE@ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
@ENABLE_SYSTEMTAP_TRUE@ else \
@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot.stp \
@ENABLE_SYSTEMTAP_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
@ENABLE_SYSTEMTAP_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+@ENABLE_SYSTEMTAP_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
@ENABLE_SYSTEMTAP_TRUE@ fi; \
@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
@ENABLE_SYSTEMTAP_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
- cp $(abs_top_builddir)/nss.cfg \
- $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
-@WITH_TZDATA_DIR_TRUE@ cp $(abs_top_builddir)/tz.properties \
-@WITH_TZDATA_DIR_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
-@ENABLE_JAMVM_TRUE@ printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
- @echo "IcedTea (debug build) is served:" \
- $(DEBUG_BUILD_OUTPUT_DIR)
+ touch stamps/add-systemtap-debug.stamp
+
+clean-add-systemtap-debug:
+ rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap-debug.stamp
+
+stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
+@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
+@ENABLE_PULSE_JAVA_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+@ENABLE_PULSE_JAVA_TRUE@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+@ENABLE_PULSE_JAVA_TRUE@ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+ touch stamps/add-pulseaudio-debug.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-debug:
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio-debug.stamp
+
+stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
+@WITH_TZDATA_DIR_TRUE@ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+@WITH_TZDATA_DIR_TRUE@ cp -v $(abs_top_builddir)/tz.properties \
+@WITH_TZDATA_DIR_TRUE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+@WITH_TZDATA_DIR_TRUE@ fi
+ touch stamps/add-tzdata-support-debug.stamp
+
+clean-add-tzdata-support-debug:
+ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+ rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ fi
+ rm -f stamps/add-tzdata-support-debug.stamp
+
+stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp
+ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ fi
mkdir -p stamps
touch $@
-clean-icedtea:
- rm -rf $(BUILD_OUTPUT_DIR)
- rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
+clean-check-crypto-debug:
+ rm -f stamps/check-crypto-debug.stamp
+
+stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ fi
+ touch stamps/add-archive-debug.stamp
+
+clean-add-archive-debug:
+ rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
+ rm -f stamps/add-archive-debug.stamp
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
- stamps/add-zero.stamp stamps/add-jamvm.stamp
+ stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
+ stamps/add-pulseaudio.stamp stamps/add-tzdata-support.stamp stamps/check-crypto.stamp \
+ stamps/add-archive.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage2: clean-add-jamvm
+clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive
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-jamvm-debug.stamp
+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
+ stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
+ stamps/add/tzdata-support-debug.stamp stamps/check-crypto-debug.stamp \
+ stamps/add-archive-debug.stamp
mkdir -p stamps
touch $@
-clean-icedtea-debug-stage2: clean-add-jamvm-debug
+clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \
+ clean-add-archive-debug
rm -f stamps/icedtea-debug-stage2.stamp
# OpenJDK boot Targets
@@ -2290,6 +2413,104 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \
mkdir -p stamps
touch $@
+clean-icedtea-boot:
+ rm -rf $(BOOT_BUILD_OUTPUT_DIR)
+ rm -f stamps/icedtea-boot.stamp
+
+stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp
+@ENABLE_SYSTEMTAP_TRUE@ mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+@ENABLE_SYSTEMTAP_TRUE@ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
+@ENABLE_SYSTEMTAP_TRUE@ if test $$? -eq 0; then \
+@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
+@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot.stp \
+@ENABLE_SYSTEMTAP_TRUE@ > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
+@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot_jni.stp \
+@ENABLE_SYSTEMTAP_TRUE@ > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ sed -e '/\/client\/libjvm.so/d' \
+@ENABLE_SYSTEMTAP_TRUE@ < $(abs_top_builddir)/tapset/hotspot_gc.stp \
+@ENABLE_SYSTEMTAP_TRUE@ > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ else \
+@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot.stp \
+@ENABLE_SYSTEMTAP_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
+@ENABLE_SYSTEMTAP_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
+@ENABLE_SYSTEMTAP_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+@ENABLE_SYSTEMTAP_TRUE@ fi; \
+@ENABLE_SYSTEMTAP_TRUE@ cp $(abs_top_builddir)/tapset/jstack.stp \
+@ENABLE_SYSTEMTAP_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+ touch stamps/add-systemtap-boot.stamp
+
+clean-add-systemtap-boot:
+ rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset
+ rm -f stamps/add-systemtap-boot.stamp
+
+stamps/add-pulseaudio-boot.stamp: stamps/icedtea-boot.stamp $(PULSE_JAVA_TARGET)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+@ENABLE_PULSE_JAVA_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
+@ENABLE_PULSE_JAVA_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
+@ENABLE_PULSE_JAVA_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
+@ENABLE_PULSE_JAVA_TRUE@ cp -pPRf pulse-java.jar \
+@ENABLE_PULSE_JAVA_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+@ENABLE_PULSE_JAVA_TRUE@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+@ENABLE_PULSE_JAVA_TRUE@ $(ZIP) -qur $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+ touch stamps/add-pulseaudio-boot.stamp
+
+# Note: for simplicity, we don't revert the update of src.zip
+clean-add-pulseaudio-boot:
+ rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so
+ rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar
+ rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar
+ rm -f stamps/add-pulseaudio-boot.stamp
+
+stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
+@WITH_TZDATA_DIR_TRUE@ if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+@WITH_TZDATA_DIR_TRUE@ cp -v $(abs_top_builddir)/tz.properties \
+@WITH_TZDATA_DIR_TRUE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+@WITH_TZDATA_DIR_TRUE@ fi
+ touch stamps/add-tzdata-support-boot.stamp
+
+clean-add-tzdata-support-boot:
+ if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+ rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+ fi
+ rm -f stamps/add-tzdata-support-boot.stamp
+
+stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp
+ if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \
+ fi
+ mkdir -p stamps
+ touch $@
+
+clean-check-crypto-boot:
+ rm -f stamps/check-crypto-boot.stamp
+
+stamps/add-archive-boot.stamp: stamps/icedtea-boot.stamp
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
+@ENABLE_CACAO_FALSE@@ENABLE_JAMVM_FALSE@@ZERO_BUILD_FALSE@ fi
+ touch $@
+
+clean-add-archive-boot:
+ rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
+ rm -f stamps/add-archive-boot.stamp
+
+stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \
+ stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \
+ stamps/add-tzdata-support-boot.stamp stamps/check-crypto-boot.stamp \
+ stamps/add-archive-boot.stamp
+ mkdir -p stamps
+ touch $@
+
+clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \
+ clean-add-tzdata-support-boot clean-check-crypto-boot clean-add-archive-boot
+ rm -f stamps/icedtea-stage1.stamp
+
# Rebuild targets
rebuild:
@@ -2320,17 +2541,6 @@ hotspot:
@BOOTSTRAPPING_FALSE@ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
@BOOTSTRAPPING_FALSE@ @echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
-clean-icedtea-boot:
- rm -rf $(BOOT_BUILD_OUTPUT_DIR)
- rm -f stamps/icedtea-boot.stamp
-
-stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp
- mkdir -p stamps
- touch $@
-
-clean-icedtea-stage1:
- rm -f stamps/icedtea-stage1.stamp
-
# PulseAudio based mixer
# (pulse-java)
@@ -2775,9 +2985,44 @@ clean-rt:
cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/jre/lib ; \
fi
+# Crypto Level Check
+
+stamps/cryptocheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
+ mkdir -p $(CRYPTO_CHECK_BUILD_DIR)
+ $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
+ -d $(CRYPTO_CHECK_BUILD_DIR) $(CRYPTO_CHECK_SRCS)
+ mkdir -p stamps
+ touch $@
+
+clean-cryptocheck:
+ rm -rf $(CRYPTO_CHECK_BUILD_DIR)
+ rm -f stamps/cryptocheck.stamp
+
# Target Aliases
# ===============
+add-archive: stamps/add-archive.stamp
+
+add-archive-boot: stamps/add-archive-ecj.stamp
+
+add-archive-debug: stamps/add-archive-debug.stamp
+
+add-nss: stamps/add-nss.stamp
+
+add-nss-debug: stamps/add-nss-debug.stamp
+
+add-pulseaudio: stamps/add-pulseaudio.stamp
+
+add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp
+
+add-systemtap: stamps/add-systemtap.stamp
+
+add-systemtap-debug: stamps/add-systemtap-debug.stamp
+
+add-tzdata-support: stamps/add-tzdata-support.stamp
+
+add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp
+
add-zero: stamps/add-zero.stamp
add-zero-debug: stamps/add-zero-debug.stamp
@@ -2792,8 +3037,16 @@ bootstrap-directory-symlink-stage2: stamps/bootstrap-directory-symlink-stage2.st
cacao: stamps/cacao.stamp
+check-crypto: stamps/check-crypto.stamp
+
+check-crypto-boot: stamps/check-crypto-boot.stamp
+
+check-crypto-debug: stamps/check-crypto-debug.stamp
+
clone-boot: stamps/clone-boot.stamp
+cryptocheck: stamps/cryptocheck.stamp
+
download: stamps/download.stamp
download-cacao: stamps/download-cacao.stamp
diff --git a/source.local/l/openjdk/sources/hotspot.map b/source.local/l/openjdk/sources/hotspot.map
index 71ae90e..41d1f9c 100644
--- a/source.local/l/openjdk/sources/hotspot.map
+++ b/source.local/l/openjdk/sources/hotspot.map
@@ -1,3 +1,2 @@
# version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot ad5a321edea2 c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 2c4981784101 977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot c67fd7874b1a 34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d