Mercurial > hg > icedtea8-forest

changeset 2685:aedccd51873f icedtea-3.17.0pre02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk8u272-b04
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sat, 24 Oct 2020 01:11:47 +0100
parents d7694b240da4 (current diff) a0dd128191fd (diff)
children 62b39c4669fc
files .hgtags common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4
diffstat 6 files changed, 90 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 14 02:12:45 2020 +0100
+++ b/.hgtags	Sat Oct 24 01:11:47 2020 +0100
@@ -1076,7 +1076,16 @@
 908e7985b3393370a417db1254ab4585ea954b2f jdk8u262-b03
 e1a42471eb39cb9340608238cd67b1938f73632e jdk8u262-b04
 ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u262-b05
+ecb485e1572c2f4964a943704fa6a79f8d5ee34c jdk8u272-b00
 2f973e405849e5e5fbe1b95ad1f37dc19cd046bc jdk8u262-b06
 4f5c1e68c85ec157a86505613e1aec3f4528957b jdk8u262-b07
 59b2de0b2c60f7ae444a43c76fc96260351172a3 jdk8u262-b08
 2bab25ddc567a2fe5038cb49cf5586dfb4c32ff2 jdk8u262-b09
+94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-b10
+94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u262-ga
+94d3d8c74ed6df79b04a2fa64454f67d8729c8d8 jdk8u265-b00
+6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-b01
+6cc620acc6841a193a76ea2510381d5189e7ee74 jdk8u265-ga
+1bda51d3d528f884afe13b4a810390e3aa2464a8 jdk8u272-b01
+1059e4b7426a1ab9c52ce9aa55daf11d97b13607 jdk8u272-b02
+fbad06cacb73f4ca1701c789f7c1bc3f5c6f08c9 jdk8u272-b03
--- a/THIRD_PARTY_README	Wed Oct 14 02:12:45 2020 +0100
+++ b/THIRD_PARTY_README	Sat Oct 24 01:11:47 2020 +0100
@@ -3028,8 +3028,7 @@
   Apache Commons Math 3.2
   Apache Derby 10.11.1.2
   Apache Jakarta BCEL 5.1 
-  Apache Jakarta Regexp 1.4 
-  Apache Santuario XML Security for Java 1.5.4
+  Apache Santuario XML Security for Java 2.1.1
   Apache Xalan-Java 2.7.2
   Apache Xerces Java 2.10.0 
   Apache XML Resolver 1.1 
--- a/common/autoconf/generated-configure.sh	Wed Oct 14 02:12:45 2020 +0100
+++ b/common/autoconf/generated-configure.sh	Sat Oct 24 01:11:47 2020 +0100
@@ -1902,7 +1902,7 @@
                           run the Queens test after Hotspot build [disabled]
   --enable-unlimited-crypto
                           Enable unlimited crypto policy [disabled]
-  --enable-jfr            Enable Java Flight Recorder support [disabled]
+  --disable-jfr           Disable Java Flight Recorder support [enabled]
   --disable-warnings-as-errors
                           consider native warnings to be an error [disabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
@@ -19953,8 +19953,8 @@
   #
   # Enable or disable JFR
   #
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build jfr" >&5
-$as_echo_n "checking whether to build jfr... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build JFR" >&5
+$as_echo_n "checking whether to build JFR... " >&6; }
   # Check whether --enable-jfr was given.
 if test "${enable_jfr+set}" = set; then :
   enableval=$enable_jfr;
@@ -19962,18 +19962,26 @@
   enable_jfr=auto
 fi
 
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
+      if test "x$enable_jfr" = "xyes"; then
+        as_fn_error $? "cannot enable JFR on minimal1 VM or zero build" "$LINENO" 5
+      else
+        ENABLE_JFR=false
+      fi
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+      if test "x$enable_jfr" = "xyes"; then
+        as_fn_error $? "AIX does not support JFR" "$LINENO" 5
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    as_fn_error $? "--enable-jfr must either be set to yes or no" "$LINENO" 5
+    as_fn_error $? "--enable-jfr must be set to either yes or no" "$LINENO" 5
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_JFR" >&5
 $as_echo "$ENABLE_JFR" >&6; }
--- a/common/autoconf/jdk-options.m4	Wed Oct 14 02:12:45 2020 +0100
+++ b/common/autoconf/jdk-options.m4	Sat Oct 24 01:11:47 2020 +0100
@@ -463,22 +463,30 @@
   #
   # Enable or disable JFR
   #
-  AC_MSG_CHECKING([whether to build jfr])
-  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--enable-jfr],
-      [Enable Java Flight Recorder support @<:@disabled@:>@])],,
+  AC_MSG_CHECKING([whether to build JFR])
+  AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
+      [Disable Java Flight Recorder support @<:@enabled@:>@])],,
       [enable_jfr=auto])
-  if test "x$enable_jfr" = "xno" -o "x$enable_jfr" = "xauto"; then
+  if test "x$enable_jfr" = "xno"; then
     ENABLE_JFR=false
-  elif test "x$enable_jfr" = "xyes" ; then
+  elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
     if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
-      AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
+      else
+        ENABLE_JFR=false
+      fi
     elif test "x$OPENJDK_TARGET_OS" = xaix; then
-      AC_MSG_ERROR([AIX does not support JFR])
+      if test "x$enable_jfr" = "xyes"; then
+        AC_MSG_ERROR([AIX does not support JFR])
+      else
+        ENABLE_JFR=false
+      fi
     else
       ENABLE_JFR=true
     fi
   else
-    AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
+    AC_MSG_ERROR([--enable-jfr must be set to either yes or no])
   fi
   AC_MSG_RESULT([$ENABLE_JFR])
   AC_SUBST(ENABLE_JFR)
--- a/make/Javadoc.gmk	Wed Oct 14 02:12:45 2020 +0100
+++ b/make/Javadoc.gmk	Sat Oct 24 01:11:47 2020 +0100
@@ -221,6 +221,11 @@
 JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
 PLATFORM_DOCSDIR = $(DOCSDIR)/platform
 
+JAVADOC_ARCHIVE_NAME := jdk-$(FULL_VERSION)-docs.zip
+JAVADOC_ARCHIVE_ASSEMBLY_DIR :=  $(DOCSTMPDIR)/docs-zip
+JAVADOC_ARCHIVE_DIR := $(OUTPUT_ROOT)/bundles
+JAVADOC_ARCHIVE := $(JAVADOC_ARCHIVE_DIR)/$(JAVADOC_ARCHIVE_NAME)
+
 # The non-core api javadocs need to be able to access the root of the core
 # api directory, so for jdk/api or jre/api to get to the core api/
 # directory we would use this:
@@ -329,6 +334,37 @@
 all: docs
 docs: coredocs otherdocs
 
+#
+# Optional target which bundles all generated javadocs into a zip 
+# archive. The dependency on docs is handled in Main.gmk. Incremental 
+# building of docs is currently broken so if you invoke docs-zip after 
+# docs, the docs are always rebuilt.
+#
+
+docs-zip: $(JAVADOC_ARCHIVE)
+
+#
+# Add the core docs as prerequisite to the archive to trigger a rebuild
+# if the core docs were rebuilt. Ideally any doc rebuild should trigger
+# this, but the way prerequisites are currently setup in this file, that
+# is hard to achieve.
+#
+
+$(JAVADOC_ARCHIVE): $(COREAPI_INDEX_FILE)
+	@$(ECHO) $(LOG_INFO) "Compressing javadoc to single $(JAVADOC_ARCHIVE_NAME)"
+	$(MKDIR) -p $(JAVADOC_ARCHIVE_DIR)
+	$(RM) -r $(JAVADOC_ARCHIVE_ASSEMBLY_DIR)
+	$(MKDIR) -p $(JAVADOC_ARCHIVE_ASSEMBLY_DIR)
+	all_roots=`$(FIND) $(DOCSDIR) | $(GREP) index.html | grep -v old/doclet `; \
+	pushd $(JAVADOC_ARCHIVE_ASSEMBLY_DIR); \
+	for index_file in $${all_roots} ; do \
+	  target_dir=`dirname $${index_file}`; \
+	  name=`$(ECHO) $${target_dir} | $(SED) "s;/spec;;" | $(SED) "s;.*/;;"`; \
+	  $(LN) -s $${target_dir}  $${name}; \
+	done; \
+	$(ZIP) -q -r $(JAVADOC_ARCHIVE) * ; \
+	popd ;
+
 #################################################################
 # Production Targets -- USE THESE TARGETS WHEN:
 # a) You're generating docs outside of release engineering's
@@ -1372,4 +1408,4 @@
 
 #############################################################
 .PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
-    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
+    sanitycheckcoredocs $(ALL_OTHER_TARGETS) docs-zip
--- a/make/Main.gmk	Wed Oct 14 02:12:45 2020 +0100
+++ b/make/Main.gmk	Sat Oct 24 01:11:47 2020 +0100
@@ -161,6 +161,12 @@
 	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
 	@$(call TargetExit)
 
+docs-zip: docs docs-zip-only
+docs-zip-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs-zip)
+	@$(call TargetExit)
+
 sign-jars: jdk sign-jars-only
 sign-jars-only: start-make
 	@$(call TargetEnter)
@@ -235,6 +241,8 @@
 clean-docs:
 	$(call CleanComponent,docs)
 	$(call CleanComponent,docstemp)
+clean-docs-zip:
+	$(call CleanComponent,bundles/jdk-*-docs.zip)
 clean-test:
 	$(call CleanComponent,testoutput)
 	
@@ -246,10 +254,10 @@
         endif
 	@( cd $(OUTPUT_ROOT) && $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
 
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs docs-zip
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only docs-zip-only
 .PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-docs-zip clean-test clean-overlay-images clean-bootcycle-build
 .PHONY: profiles profiles-only
 
 include $(root_dir)/make/Jprt.gmk