Merge hdf5 1 10 8 (#1154)hdf5-1_10_8

Merge HDF5 1.10.8 release files to 1.10/master
author: Larry Knox <lrknox@hdfgroup.org> 2021-10-29 22:10:31 (GMT)
committer: GitHub <noreply@github.com> 2021-10-29 22:10:31 (GMT)
commit: 111c7ae9ac2efc29e8b399e6951253af9110b81a (patch)
tree: f69fa03253bdab97d7cf3615baff02cd936323f9 /bin
parent: db30c2da68ece4a155e9e50c28ec16d6057509b2 (diff)
download: hdf5-hdf5-1_10_8.zip
hdf5-hdf5-1_10_8.tar.gz
hdf5-hdf5-1_10_8.tar.bz2
43 files changed, 336 insertions, 160 deletions
diff --git a/bin/COPYING b/bin/COPYING
deleted file mode 100755
index 6497ace..0000000
--- a/bin/COPYING
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Copyright by  The HDF Group and 
-                The Board of Trustees of the University of Illinois. 
-  All rights reserved. 
-
-  The files and subdirectories in this directory are part of HDF5.  
-  The full HDF5 copyright notice, including terms governing use, 
-  modification, and redistribution, is contained in the COPYING file
-  which can be found at the root of the source code distribution tree
-  or in https://support.hdfgroup.org/ftp/HDF5/releases.  If you do
-  not have access to either file, you may request a copy from 
-  help@hdfgroup.org. 
-
diff --git a/bin/Makefile.am b/bin/Makefile.am
index a39b695..25df36f 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -6,7 +6,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
diff --git a/bin/Makefile.in b/bin/Makefile.in
index f5c2e3d..df11fd6 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -22,7 +22,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -114,6 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
 	$(top_srcdir)/m4/ax_check_junit.m4 \
 	$(top_srcdir)/m4/ax_java_options.m4 \
 	$(top_srcdir)/m4/ax_jni_include_dir.m4 \
+	$(top_srcdir)/m4/ax_prog_doxygen.m4 \
 	$(top_srcdir)/m4/ax_prog_jar.m4 \
 	$(top_srcdir)/m4/ax_prog_java.m4 \
 	$(top_srcdir)/m4/ax_prog_java_works.m4 \
@@ -356,9 +357,8 @@ am__set_b = \
   esac
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/h5cc.in \
 	$(top_srcdir)/config/commence.am \
-	$(top_srcdir)/config/conclude.am COPYING README compile \
-	config.guess config.sub install-sh ltmain.sh missing \
-	test-driver
+	$(top_srcdir)/config/conclude.am README compile config.guess \
+	config.sub install-sh ltmain.sh missing test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
@@ -369,12 +369,12 @@ AMTAR = @AMTAR@
 # AM_CFLAGS is an automake construct which should be used by Makefiles
 # instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
 # This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well.
-AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ @H5_ECFLAGS@
+AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@
 
 # Include src directory
 AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \
 	-I$(top_srcdir)/tools/lib
-AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ @H5_ECXXFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@
 AM_JAVACFLAGS = @AM_JAVACFLAGS@
@@ -412,11 +412,56 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DESIRED_FILE_LOCKING = @DESIRED_FILE_LOCKING@
-DEV_WARNINGS = @DEV_WARNINGS@
+DIAGS = @DIAGS@
 DIRECT_VFD = @DIRECT_VFD@
 DLLTOOL = @DLLTOOL@
+DOXYGEN_EXAMPLES_DIRECTORY = @DOXYGEN_EXAMPLES_DIRECTORY@
+DOXYGEN_EXTERNAL_SEARCH = @DOXYGEN_EXTERNAL_SEARCH@
+DOXYGEN_HTML_EXTRA_FILES = @DOXYGEN_HTML_EXTRA_FILES@
+DOXYGEN_HTML_EXTRA_STYLESHEET = @DOXYGEN_HTML_EXTRA_STYLESHEET@
+DOXYGEN_HTML_FOOTER = @DOXYGEN_HTML_FOOTER@
+DOXYGEN_HTML_HEADER = @DOXYGEN_HTML_HEADER@
+DOXYGEN_INCLUDE_ALIASES = @DOXYGEN_INCLUDE_ALIASES@
+DOXYGEN_INPUT_DIRECTORY = @DOXYGEN_INPUT_DIRECTORY@
+DOXYGEN_LAYOUT_FILE = @DOXYGEN_LAYOUT_FILE@
+DOXYGEN_MACRO_EXPANSION = @DOXYGEN_MACRO_EXPANSION@
+DOXYGEN_OPTIMIZE_OUTPUT_FOR_C = @DOXYGEN_OPTIMIZE_OUTPUT_FOR_C@
+DOXYGEN_OUTPUT_DIRECTORY = @DOXYGEN_OUTPUT_DIRECTORY@
+DOXYGEN_PACKAGE = @DOXYGEN_PACKAGE@
+DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
+DOXYGEN_PREDEFINED = @DOXYGEN_PREDEFINED@
+DOXYGEN_PROJECT_BRIEF = @DOXYGEN_PROJECT_BRIEF@
+DOXYGEN_PROJECT_LOGO = @DOXYGEN_PROJECT_LOGO@
+DOXYGEN_SEARCHENGINE_URL = @DOXYGEN_SEARCHENGINE_URL@
+DOXYGEN_SERVER_BASED_SEARCH = @DOXYGEN_SERVER_BASED_SEARCH@
+DOXYGEN_STRIP_FROM_PATH = @DOXYGEN_STRIP_FROM_PATH@
+DOXYGEN_TAG_FILE = @DOXYGEN_TAG_FILE@
+DOXYGEN_VERSION_STRING = @DOXYGEN_VERSION_STRING@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
+DX_CONFIG = @DX_CONFIG@
+DX_DOCDIR = @DX_DOCDIR@
+DX_DOT = @DX_DOT@
+DX_DOXYGEN = @DX_DOXYGEN@
+DX_DVIPS = @DX_DVIPS@
+DX_EGREP = @DX_EGREP@
+DX_ENV = @DX_ENV@
+DX_FLAG_chi = @DX_FLAG_chi@
+DX_FLAG_chm = @DX_FLAG_chm@
+DX_FLAG_doc = @DX_FLAG_doc@
+DX_FLAG_dot = @DX_FLAG_dot@
+DX_FLAG_html = @DX_FLAG_html@
+DX_FLAG_man = @DX_FLAG_man@
+DX_FLAG_pdf = @DX_FLAG_pdf@
+DX_FLAG_ps = @DX_FLAG_ps@
+DX_FLAG_rtf = @DX_FLAG_rtf@
+DX_FLAG_xml = @DX_FLAG_xml@
+DX_HHC = @DX_HHC@
+DX_LATEX = @DX_LATEX@
+DX_MAKEINDEX = @DX_MAKEINDEX@
+DX_PDFLATEX = @DX_PDFLATEX@
+DX_PERL = @DX_PERL@
+DX_PROJECT = @DX_PROJECT@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -448,8 +493,6 @@ H5_CFLAGS = @H5_CFLAGS@
 H5_CLASSPATH = @H5_CLASSPATH@
 H5_CPPFLAGS = @H5_CPPFLAGS@
 H5_CXXFLAGS = @H5_CXXFLAGS@
-H5_ECFLAGS = @H5_ECFLAGS@
-H5_ECXXFLAGS = @H5_ECXXFLAGS@
 H5_FCFLAGS = @H5_FCFLAGS@
 H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
 H5_IS_DARWIN = @H5_IS_DARWIN@
@@ -463,7 +506,9 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
 HAVE_Fortran_INTEGER_SIZEOF_16 = @HAVE_Fortran_INTEGER_SIZEOF_16@
 HAVE_LIBHDFS = @HAVE_LIBHDFS@
 HAVE_PTHREAD = @HAVE_PTHREAD@
+HDF5_DOXYGEN = @HDF5_DOXYGEN@
 HDF5_HL = @HDF5_HL@
+HDF5_HL_TOOLS = @HDF5_HL_TOOLS@
 HDF5_INTERFACES = @HDF5_INTERFACES@
 HDF5_TESTS = @HDF5_TESTS@
 HDF5_TOOLS = @HDF5_TOOLS@
@@ -473,6 +518,7 @@ HDF_JAVA = @HDF_JAVA@
 HID_T = @HID_T@
 HL = @HL@
 HL_FOR = @HL_FOR@
+HL_TOOLS = @HL_TOOLS@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
 IGNORE_DISABLED_FILE_LOCKS = @IGNORE_DISABLED_FILE_LOCKS@
@@ -666,7 +712,7 @@ LIBH5F_HL = $(top_builddir)/hl/fortran/src/libhdf5hl_fortran.la
 LIBH5CPP_HL = $(top_builddir)/hl/c++/src/libhdf5_hl_cpp.la
 
 # Note that in svn revision 19400 the '/' after DESTDIR in H5* variables below
-# has been removed. According to the official description of DESTDIR by Gnu at
+# has been removed. According to the official description of DESTDIR by GNU at
 # http://www.gnu.org/prep/standards/html_node/DESTDIR.html, DESTDIR is
 # prepended to the normal and complete install path that it precedes for the
 # purpose of installing in a temporary directory which is useful for building
@@ -1124,8 +1170,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-local
 # commands that should be executed even if a file with the same name already
 # exists.
 .PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \
-        build-tests check-clean check-install check-p check-s check-vfd \
-        install-doc lib progs tests uninstall-doc _exec_check-s _test help
+	build-tests check-clean check-install check-p check-s check-vfd \
+	install-doc lib progs tests uninstall-doc \
+	_exec_check-s _test help trace doxygen
 
 help:
 	@$(top_srcdir)/bin/makehelp
diff --git a/bin/bbrelease b/bin/bbrelease
index 395b23c..388b9e4 100755
--- a/bin/bbrelease
+++ b/bin/bbrelease
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/buildhdf5 b/bin/buildhdf5
index 064000a..113a278 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/checkapi b/bin/checkapi
index f5dcacc..b1d17b6 100755
--- a/bin/checkapi
+++ b/bin/checkapi
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/checkposix b/bin/checkposix
index 233d15c..c913cdd 100755
--- a/bin/checkposix
+++ b/bin/checkposix
@@ -10,7 +10,7 @@ use warnings;
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -44,7 +44,7 @@ foreach $arg (@ARGV) {
     #
     # If a user specifies one file, process it no matter what so people
     # can inspect files we normally skip (like H5system.c).
-    if($#ARGV gt 0 and $filename =~ /H5FDmulti|H5FDstdio|H5VLpassthru|H5system|H5detect|H5make_libsettings/) {
+    if($#ARGV gt 0 and $filename =~ /H5FDmulti|H5FDstdio|H5system|H5detect|H5make_libsettings/) {
         print "$filename is exempt from using Standard library macro wrappers\n";
         next;
     }
@@ -84,7 +84,7 @@ foreach $arg (@ARGV) {
         # Now find all function calls on this line which don't start with 'H'
         while (($name)=/\b([a-z_A-GI-Z]\w*)\s*\(/) {
             $_ = $';
-              
+
             # Ignore C statements that look sort of like function
             # calls.
             next if $name =~ /^(if|for|offsetof|return|sizeof|switch|while|void)$/;
@@ -141,7 +141,7 @@ foreach $arg (@ARGV) {
             }
 
             # TESTING (not comprehensive - just noise reduction)
-            
+
             # Test macros and functions (testhdf5.h)
             next if $name =~ /^(AddTest|TestErrPrintf|TestSummary|TestCleanup|TestShutdown)$/;
             next if $name =~ /^(CHECK|CHECK_PTR|CHECK_PTR_NULL|CHECK_PTR_EQ|CHECK_I)$/;
diff --git a/bin/chkconfigure b/bin/chkconfigure
index d03f421..b2b53c6 100755
--- a/bin/chkconfigure
+++ b/bin/chkconfigure
@@ -6,7 +6,7 @@
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
 ## the COPYING file, which can be found at the root of the source code
-## distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+## distribution tree, or in https://www.hdfgroup.org/licenses.
 ## If you do not have access to either file, you may request a copy from
 ## help@hdfgroup.org.  
 ##
diff --git a/bin/chkcopyright b/bin/chkcopyright
index d67e030..eec371d 100755
--- a/bin/chkcopyright
+++ b/bin/chkcopyright
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/chkmanifest b/bin/chkmanifest
index 95eb8f0..08ca1fa 100755
--- a/bin/chkmanifest
+++ b/bin/chkmanifest
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/debug-ohdr b/bin/debug-ohdr
index 1363456..7becb42 100755
--- a/bin/debug-ohdr
+++ b/bin/debug-ohdr
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/dependencies b/bin/dependencies
index 367351a..1171255 100755
--- a/bin/dependencies
+++ b/bin/dependencies
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/deploy b/bin/deploy
index 73f4b25..cb9a467 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/distdep b/bin/distdep
index cd310e0..693f3a2 100755
--- a/bin/distdep
+++ b/bin/distdep
@@ -10,7 +10,7 @@ eval 'exec perl -p -x -S $0 ${1+"$@"}'
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/errors b/bin/errors
index a5bad3a..5d23cf1 100755
--- a/bin/errors
+++ b/bin/errors
@@ -13,7 +13,7 @@ use Text::Tabs;
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/format_source b/bin/format_source
new file mode 100755
index 0000000..dce34e5
--- /dev/null
+++ b/bin/format_source
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# Recursively format all C & C++ sources and header files, except those in the
+# 'config' directory and generated files, such as H5LTanalyze.c, etc.
+#
+# Note that any files or directories that are excluded here should also be
+# added to the 'exclude' list in .github/workflows/clang-format-check.yml
+#
+# (Remember to update both bin/format_source and bin/format_source_patch)
+
+find . \( -type d -path ./config -prune -and -not -path ./config \) \
+    -or \( \( \! \( \
+        -name H5LTanalyze.c \
+        -or -name H5LTparse.c \
+        -or -name H5LTparse.h \
+        -or -name H5Epubgen.h \
+        -or -name H5Einit.h \
+        -or -name H5Eterm.h \
+        -or -name H5Edefin.h \
+        -or -name H5version.h \
+        -or -name H5overflow.h \
+        \) \) \
+    -and \( -iname *.h -or -iname *.c -or -iname *.cpp -or -iname *.hpp \) \) \
+    | xargs clang-format -style=file -i -fallback-style=none
+
+exit 0
diff --git a/bin/format_source_patch b/bin/format_source_patch
new file mode 100755
index 0000000..439baf2
--- /dev/null
+++ b/bin/format_source_patch
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Recursively format all C & C++ sources and header files, except those in the
+# 'config' directory and generated files, such as H5LTanalyze.c, etc.
+#
+# Note that any files or directories that are excluded here should also be
+# added to the 'exclude' list in .github/workflows/clang-format-check.yml
+#
+# (Remember to update both bin/format_source and bin/format_source_patch)
+
+find . \( -type d -path ./config -prune -and -not -path ./config \) \
+    -or \( \( \! \( \
+        -name H5LTanalyze.c \
+        -or -name H5LTparse.c \
+        -or -name H5LTparse.h \
+        -or -name H5Epubgen.h \
+        -or -name H5Einit.h \
+        -or -name H5Eterm.h \
+        -or -name H5Edefin.h \
+        -or -name H5version.h \
+        -or -name H5overflow.h \
+        \) \) \
+    -and \( -iname *.h -or -iname *.c -or -iname *.cpp -or -iname *.hpp \) \) \
+    | xargs clang-format -style=file -i -fallback-style=none
+
+git diff > clang_format.patch
+
+# Delete if 0 size
+if [ ! -s clang_format.patch ]
+then
+    rm clang_format.patch
+fi
+
+exit 0
diff --git a/bin/gcov_script b/bin/gcov_script
index 9a6512d..679d675 100755
--- a/bin/gcov_script
+++ b/bin/gcov_script
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 
diff --git a/bin/genparser b/bin/genparser
index e6aee5b..462c2c2 100755
--- a/bin/genparser
+++ b/bin/genparser
@@ -1,12 +1,12 @@
 #! /bin/bash
 #
-# Copyright by The HDF Group.                                              
-# All rights reserved.                                                     
-#                                                                          
-# This file is part of HDF5. The full HDF5 copyright notice, including     
-# terms governing use, modification, and redistribution, is contained in   
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5. The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -200,28 +200,34 @@ if [ "$verbose" = true ] ; then
 fi
 ${HDF5_FLEX} --nounistd -PH5LTyy -o ${path_to_hl_src}/H5LTanalyze.c ${path_to_hl_src}/H5LTanalyze.l
 
-# fix H5LTparse.c to declare H5LTyyparse return type as an hid_t
-# instead of int.  Currently the generated function H5LTyyparse is
+# fix H5LTparse.c and H5LTlparse.h to declare H5LTyyparse return type as an
+# hid_t instead of int.  Currently the generated function H5LTyyparse is
 # generated with a return value of type int, which is a mapping to the
 # flex yyparse function.  The return value in the HL library should be
-# an hid_t. 
-# I propose to not use flex to generate this function, but for now I am 
+# an hid_t.
+# I propose to not use flex to generate this function, but for now I am
 # adding a perl command to find and replace this function declaration in
 # H5LTparse.c.
 perl -0777 -pi -e 's/int yyparse/hid_t yyparse/igs' ${path_to_hl_src}/H5LTparse.c
 perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' ${path_to_hl_src}/H5LTparse.c
 perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' ${path_to_hl_src}/H5LTparse.c
+perl -0777 -pi -e 's/int yyparse/hid_t yyparse/igs' ${path_to_hl_src}/H5LTparse.h
+perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' ${path_to_hl_src}/H5LTparse.h
+perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' ${path_to_hl_src}/H5LTparse.h
 
 # Add code that disables warnings in the flex/bison-generated code.
 #
 # Note that the GCC pragmas did not exist until gcc 4.2. Earlier versions
 # will simply ignore them, but we want to avoid those warnings.
+#
+# Note also that although clang defines __GNUC__, it doesn't support every
+# warning that GCC does.
 for f in ${path_to_hl_src}/H5LTparse.c ${path_to_hl_src}/H5LTanalyze.c
 do
-    echo '#if defined __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__    ' >> tmp.out
+    echo '#if defined (__GNUC__)                                            ' >> tmp.out
+    echo '#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402                    ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wconversion"                     ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"  ' >> tmp.out
-    echo '#pragma GCC diagnostic ignored "-Wlarger-than="                   ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wmissing-prototypes"             ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wnested-externs"                 ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wold-style-definition"           ' >> tmp.out
@@ -230,11 +236,19 @@ do
     echo '#pragma GCC diagnostic ignored "-Wsign-conversion"                ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wstrict-overflow"                ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wstrict-prototypes"              ' >> tmp.out
+    echo '#if !defined (__clang__)                                          ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wlarger-than="                   ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wsuggest-attribute=const"        ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"         ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wswitch-default"                 ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wunused-function"                ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wunused-macros"                  ' >> tmp.out
     echo '#pragma GCC diagnostic ignored "-Wunused-parameter"               ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
+    echo '#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 600                    ' >> tmp.out
+    echo '#pragma GCC diagnostic ignored "-Wnull-dereference"               ' >> tmp.out
+    echo '#endif                                                            ' >> tmp.out
     echo '#elif defined __SUNPRO_CC                                         ' >> tmp.out
     echo '#pragma disable_warn                                              ' >> tmp.out
     echo '#elif defined _MSC_VER                                            ' >> tmp.out
diff --git a/bin/h5cc.in b/bin/h5cc.in
index 62a0884..6024b4d 100644
--- a/bin/h5cc.in
+++ b/bin/h5cc.in
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
diff --git a/bin/h5redeploy.in b/bin/h5redeploy.in
index 242459a..86183e8 100644
--- a/bin/h5redeploy.in
+++ b/bin/h5redeploy.in
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/h5vers b/bin/h5vers
index 6093eb0..8f75df1 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -13,7 +13,7 @@ use strict;
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/iostats b/bin/iostats
index e389992..c42a1f9 100755
--- a/bin/iostats
+++ b/bin/iostats
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/locate_sw b/bin/locate_sw
index bab7bd2..1cf84e2 100755
--- a/bin/locate_sw
+++ b/bin/locate_sw
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/make_err b/bin/make_err
index 7f38591..f2b044a 100755
--- a/bin/make_err
+++ b/bin/make_err
@@ -11,7 +11,7 @@ use warnings;
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -38,7 +38,7 @@ sub print_copyright ($) {
     print $fh " * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n";
     print $fh " * terms governing use, modification, and redistribution, is contained in    *\n";
     print $fh " * the COPYING file, which can be found at the root of the source code       *\n";
-    print $fh " * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *\n";
+    print $fh " * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n";
     print $fh " * If you do not have access to either file, you may request a copy from     *\n";
     print $fh " * help\@hdfgroup.org.                                                        *\n";
     print $fh " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n";
@@ -64,8 +64,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################
diff --git a/bin/make_overflow b/bin/make_overflow
index cee0126..37d6ded 100755
--- a/bin/make_overflow
+++ b/bin/make_overflow
@@ -16,7 +16,7 @@ my @ctypes = ( () );
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -67,7 +67,7 @@ sub print_copyright ($) {
     print $fh " * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n";
     print $fh " * terms governing use, modification, and redistribution, is contained in    *\n";
     print $fh " * the COPYING file, which can be found at the root of the source code       *\n";
-    print $fh " * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *\n";
+    print $fh " * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n";
     print $fh " * If you do not have access to either file, you may request a copy from     *\n";
     print $fh " * help\@hdfgroup.org.                                                        *\n";
     print $fh " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n";
@@ -93,8 +93,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################
diff --git a/bin/make_vers b/bin/make_vers
index 478e1df..5236e01 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -25,7 +25,7 @@ $indent = 2;
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -52,7 +52,7 @@ sub print_copyright ($) {
     print $fh " * This file is part of HDF5.  The full HDF5 copyright notice, including     *\n";
     print $fh " * terms governing use, modification, and redistribution, is contained in    *\n";
     print $fh " * the COPYING file, which can be found at the root of the source code       *\n";
-    print $fh " * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *\n";
+    print $fh " * distribution tree, or in https://www.hdfgroup.org/licenses.               *\n";
     print $fh " * If you do not have access to either file, you may request a copy from     *\n";
     print $fh " * help\@hdfgroup.org.                                                        *\n";
     print $fh " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */\n";
@@ -78,8 +78,8 @@ sub print_startprotect ($$) {
     $file =~ s/(\w*)\.h/$1/;
 
     # Print the ifdef info
-    print $fh "\n#ifndef _${file}_H\n";
-    print $fh "#define _${file}_H\n";
+    print $fh "\n#ifndef ${file}_H\n";
+    print $fh "#define ${file}_H\n";
 }
 
 ##############################################################################
diff --git a/bin/mkdirs b/bin/mkdirs
index 43972b6..3a36aa2 100755
--- a/bin/mkdirs
+++ b/bin/mkdirs
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/newer b/bin/newer
index 8083cae..e60ec45 100755
--- a/bin/newer
+++ b/bin/newer
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/output_filter.sh b/bin/output_filter.sh
index fb59dfd..ba68cb3 100644
--- a/bin/output_filter.sh
+++ b/bin/output_filter.sh
@@ -4,7 +4,7 @@
 ## This file is part of HDF5.  The full HDF5 copyright notice, including
 ## terms governing use, modification, and redistribution, is contained in
 ## the COPYING file, which can be found at the root of the source code
-## distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+## distribution tree, or in https://www.hdfgroup.org/licenses.
 ## If you do not have access to either file, you may request a copy from
 ## help@hdfgroup.org.
 
diff --git a/bin/pkgscrpts/h5rmflags b/bin/pkgscrpts/h5rmflags
index 099956c..d0f87c0 100755
--- a/bin/pkgscrpts/h5rmflags
+++ b/bin/pkgscrpts/h5rmflags
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl b/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl
index f4a9ebd..d1042dc 100755
--- a/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl
+++ b/bin/pkgscrpts/makeHDF5BinaryTarfiles.pl
@@ -8,7 +8,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/release b/bin/release
index a775faf..05fe31c 100755
--- a/bin/release
+++ b/bin/release
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
@@ -39,14 +39,14 @@ USAGE()
 {
 cat << EOF
 Usage: $0 -d <dir> [--docver BRANCHNAME] [-h] [--nocheck] [--private] <methods> ...
-   -d DIR               The name of the directory where the releas(es) should be
-                        placed.
+   -d DIR   The name of the directory where the releas(es) should be
+                placed.
    --docver BRANCHNAME  This is added for 1.8 and beyond to get the correct
                         version of documentation files from the hdf5docs
                         repository.  BRANCHNAME for v1.8 should be hdf5_1_8.
-   -h                   print the help page.
-   --nocheck            Ignore errors in MANIFEST file.
-   --private            Make a private release with today's date in version information.
+   -h           print the help page.
+   --nocheck    Ignore errors in MANIFEST file.
+   --private    Make a private release with today's date in version information.
 
 This must be run at the top level of the source directory.
 The other command-line options are the names of the programs to use
@@ -149,8 +149,8 @@ tar2zip()
     find $ztmpdir/$version | \
         while read inf; do \
             if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
-            unix2dos -q -k $inf; \
-            fi \
+                unix2dos -q -k $inf; \
+            fi\
         done
     # step 3: make zipball
     # -9 maximum compression
@@ -229,11 +229,14 @@ tar2cmakezip()
     (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201564 -C Release -V -O hdf5.log" > build-VS2015-64.bat; chmod 755 build-VS2015-64.bat)
     (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2017 -C Release -V -O hdf5.log" > build-VS2017-32.bat; chmod 755 build-VS2017-32.bat)
     (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201764 -C Release -V -O hdf5.log" > build-VS2017-64.bat; chmod 755 build-VS2017-64.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2019 -C Release -V -O hdf5.log" > build-VS2019-32.bat; chmod 755 build-VS2019-32.bat)
+    (cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201964 -C Release -V -O hdf5.log" > build-VS2019-64.bat; chmod 755 build-VS2019-64.bat)
 
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmziptmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.15-Source.zip $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.17-Source.zip $cmziptmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_10_8.zip $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
     cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
@@ -248,7 +251,7 @@ tar2cmakezip()
         while read inf; do \
             if file $inf | grep "$inf\: .*text" > /dev/null 2>&1 ; then \
                 unix2dos -q -k $inf; \
-            fi \
+            fi\
         done
 
     # step 3: make zipball
@@ -328,7 +331,8 @@ tar2cmaketgz()
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.15-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.17-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_10_8.tar.gz $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
@@ -411,7 +415,8 @@ tar2hpccmaketgz()
     # step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
     cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
     cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
-    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.15-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-1.10.17-Source.tar.gz $cmgztmpsubdir
+    cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_10_8.tar.gz $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
     cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
 
@@ -442,7 +447,7 @@ check=yes
 release_date=`date +%F`
 today=`date +%Y%m%d`
 pmode='no'
-tmpdir="../#release_tmp.$$"    # tmp work directory
+tmpdir="../#release_tmp.$$"     # tmp work directory
 DOC_URL=https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5doc.git
 CPPLUS_RM_NAME=cpplus_RM
 MAINT_MODE_ENABLED=""
@@ -597,32 +602,32 @@ for comp in $methods; do
     case $comp in
         tar)
             cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar
-            (cd $DEST; md5sum $HDF5_VERS.tar >> $MD5file) 
+            (cd $DEST; md5sum $HDF5_VERS.tar >> $MD5file)
             ;;
         gzip)
             test "$verbose" && echo "   Running gzip..." 1>&2
             gzip -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.gz
-            (cd $DEST; md5sum $HDF5_VERS.tar.gz >> $MD5file) 
+            (cd $DEST; md5sum $HDF5_VERS.tar.gz >> $MD5file)
             ;;
         cmake-tgz)
             test "$verbose" && echo "   Creating CMake tar.gz file..." 1>&2
             tar2cmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.tar.gz 1>&2
-            (cd $DEST; md5sum CMake-$HDF5_VERS.tar.gz >> $MD5file) 
+            (cd $DEST; md5sum CMake-$HDF5_VERS.tar.gz >> $MD5file)
             ;;
         hpc-cmake-tgz)
             test "$verbose" && echo "   Creating HPC-CMake tar.gz file..." 1>&2
             tar2hpccmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/HPC-CMake-$HDF5_VERS.tar.gz 1>&2
-            (cd $DEST; md5sum HPC-CMake-$HDF5_VERS.tar.gz >> $MD5file) 
+            (cd $DEST; md5sum HPC-CMake-$HDF5_VERS.tar.gz >> $MD5file)
             ;;
         bzip2)
             test "$verbose" && echo "   Running bzip2..." 1>&2
             bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2
-            (cd $DEST; md5sum $HDF5_VERS.tar.bz2 >> $MD5file) 
+            (cd $DEST; md5sum $HDF5_VERS.tar.bz2 >> $MD5file)
             ;;
         zip)
             test "$verbose" && echo "   Creating zip ball..." 1>&2
             tar2zip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.zip 1>&2
-            (cd $DEST; md5sum $HDF5_VERS.zip >> $MD5file) 
+            (cd $DEST; md5sum $HDF5_VERS.zip >> $MD5file)
             ;;
         cmake-zip)
             test "$verbose" && echo "   Creating CMake-zip ball..." 1>&2
diff --git a/bin/restore.sh b/bin/restore.sh
index 60ac661..47dde11 100755
--- a/bin/restore.sh
+++ b/bin/restore.sh
@@ -6,7 +6,7 @@
 # This file is part of HDF5. The full HDF5 copyright notice, including     
 # terms governing use, modification, and redistribution, is contained in   
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/runbkgprog b/bin/runbkgprog
index f04ea89..b0d4b73 100644
--- a/bin/runbkgprog
+++ b/bin/runbkgprog
@@ -11,7 +11,7 @@ $indent=4;
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/runtest b/bin/runtest
index 2611f09..50acb76 100755
--- a/bin/runtest
+++ b/bin/runtest
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/snapshot b/bin/snapshot
index bde68a5..bc9ba1d 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 
diff --git a/bin/snapshot_version b/bin/snapshot_version
index 8aad05d..da2e190 100644
--- a/bin/snapshot_version
+++ b/bin/snapshot_version
@@ -6,7 +6,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/switch_maint_mode b/bin/switch_maint_mode
index fb1568b..af63d6a 100755
--- a/bin/switch_maint_mode
+++ b/bin/switch_maint_mode
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
diff --git a/bin/timekeeper b/bin/timekeeper
index 14adf2c..03bc8d5 100755
--- a/bin/timekeeper
+++ b/bin/timekeeper
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
diff --git a/bin/trace b/bin/trace
index 42b89b5..090b558 100755
--- a/bin/trace
+++ b/bin/trace
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 ##
@@ -165,6 +165,14 @@ $Source = "";
                "ssize_t"                    => "Zs",
               );
 
+
+##############################################################################
+# Maximum length of H5TRACE macro line
+# If the ColumnLimit in .clang-format is changed, this value will need to be updated
+#
+my $max_trace_macro_line_len = 110;
+
+
 ##############################################################################
 # Print an error message.
 #
@@ -242,7 +250,7 @@ sub rewrite_func ($$$$$) {
 
   # Parse arguments
   if ($args eq "void") {
-    $trace = "H5TRACE0(\"$rettype\",\"\");\n";
+    $trace = "H5TRACE0(\"$rettype\", \"\");\n";
   } else {
     # Split arguments.  First convert `/*in,out*/' to get rid of the
     # comma, then split the arguments on commas.
@@ -286,18 +294,60 @@ sub rewrite_func ($$$$$) {
         }
       }
     }
+
+    # Compose the trace macro
     $trace = "H5TRACE" . scalar(@arg_str) . "(\"$rettype\", \"";
     $trace .= join("", @arg_str) . "\"";
-    my $len = 4 + length $trace;
-    for (@arg_name) {
-      if ($len + length >= 77) {
-        $trace .= ",\n             $_";
-        $len = 13 + length;
+    $argtrace .= join("", @arg_str) . "\"";
+
+    # Add 4 for indenting the line
+    my $len = 4 + length($trace);
+
+    for my $i (0 .. $#arg_name) {
+      # Handle wrapping
+
+      # Be VERY careful here! clang-format and this script MUST agree
+      # on which lines get wrapped or there will be churn as each tries
+      # to undo the other's output.
+      #
+      # TWO cases must be handled:
+      # 1) The argument is that last one and ');' will be appended
+      # 2) The argument is NOT the last one and ',' will be appended
+      #
+      # NB: clang-format does NOT consider terminal newlines when
+      #     counting columns for the ColumnLimit
+      #
+      # The extra '2' added after $len includes the ', ' that would be
+      # added BEFORE the argument.
+      #
+      my $adjust = ($i + 1 == scalar(@arg_str)) ? 2 : 1;
+      my $len_if_added = $len + 2 + length($arg_name[$i]) + $adjust;
+
+      # Wrap lines that will be longer than the limit
+      if ($len_if_added > $max_trace_macro_line_len) {
+        # Wrap line, with indention
+        $trace .= ",\n             ";
+        $len = 13;              # Set to 13, for indention
+
+        # Indent an extra space to account for extra digit in 'H5TRACE' macro
+        if (scalar(@arg_str) >= 10) {
+          $trace .= " ";
+          $len++;
+        }
       } else {
-        $trace .= ", $_";
-        $len += 1 + length;
+        $trace .= ", ";
+        $len += 2;     # Add 2, for ', '
       }
+
+      # Append argument
+      $trace .= "$arg_name[$i]";
+      $argtrace .= ", $arg_name[$i]";
+
+      # Add length of appended argument name
+      $len += length($arg_name[$i]);
     }
+
+    # Append final ');' for macro
     $trace .= ");\n";
   }
   goto error if grep {/!/} @arg_str;
diff --git a/bin/warnhist b/bin/warnhist
index 3b2cec6..742a6b5 100755
--- a/bin/warnhist
+++ b/bin/warnhist
@@ -30,10 +30,13 @@ use Getopt::Std;
 
 # Global variables, for accumulating information
 my $totalcount = 0;
+my $notecount = 0;
+my $dupcount = 0;
 my %warn_count = ();
 my $warncount;
 my %warn_file = ();
 my %warn_file_line = ();
+my %warn_file_line_offset = ();
 my %file_count = ();
 my $filecount;
 my $ignorecount = 0;
@@ -48,10 +51,13 @@ my %file_warn_line = ();
 my $current_warning = 0;
 my $current_file = 0;
 my $warn_index;
+my $genericize = 1;
+
+# Info about last name / line / offset for file
 my $last_c_name;
 my $last_fort_name;
 my $last_fort_line;
-my $genericize = 1;
+my $last_fort_offset;
 
 # Display usage
 sub do_help {
@@ -98,7 +104,7 @@ if($options{h}) {
 # Parse list of file names to ignore
 if(exists $options{i}) {
     @ignorenames = split /,/, $options{i};
-#print @ignorenames;
+#print STDERR @ignorenames;
 }
 
 # Parse list of warning indices to expand file names
@@ -106,18 +112,18 @@ if(exists $options{w}) {
     my @tmp_indices;
 
     @tmp_indices = split /,/, $options{w};
-#print @tmp_indices;
+#print STDERR @tmp_indices;
     for my $x (@tmp_indices) {
-#print "x = '$x'\n";
+#print STDERR "x = '$x'\n";
         if($x =~ /\-/) {
             my $start_index;
             my $end_index;
 
-#print "matched = '$x'\n";
+#print STDERR "matched = '$x'\n";
             ($start_index, $end_index) = split /\-/, $x;
-#print "start_index = '$start_index', end_index = '$end_index'\n";
+#print STDERR "start_index = '$start_index', end_index = '$end_index'\n";
             for my $y ($start_index..$end_index) {
-#print "y = '$y'\n";
+#print STDERR "y = '$y'\n";
                 if(!exists $warn_file_indices{$y}) {
                     $warn_file_indices{$y} = $y;
                 }
@@ -130,14 +136,14 @@ if(exists $options{w}) {
         }
     }
 #foreach (sort keys %warn_file_indices) {
-#    print "$_ : $warn_file_indices{$_}\n";
+#    print STDERR "$_ : $warn_file_indices{$_}\n";
 #}
 }
 
 # Parse list of warning strings to expand file names
 if(exists $options{s}) {
     @warn_match_strings = split /,/, $options{s};
-# print @warn_match_strings;
+# print STDERR @warn_match_strings;
 }
 
 # Parse list of file indices to expand warnings
@@ -145,18 +151,18 @@ if(exists $options{f}) {
     my @tmp_indices;
 
     @tmp_indices = split /,/, $options{f};
-#print @tmp_indices;
+#print STDERR @tmp_indices;
     for my $x (@tmp_indices) {
-#print "x = '$x'\n";
+#print STDERR "x = '$x'\n";
         if($x =~ /\-/) {
             my $start_index;
             my $end_index;
 
-#print "matched = '$x'\n";
+#print STDERR "matched = '$x'\n";
             ($start_index, $end_index) = split /\-/, $x;
-#print "start_index = '$start_index', end_index = '$end_index'\n";
+#print STDERR "start_index = '$start_index', end_index = '$end_index'\n";
             for my $y ($start_index..$end_index) {
-#print "y = '$y'\n";
+#print STDERR "y = '$y'\n";
                 if(!exists $file_warn_indices{$y}) {
                     $file_warn_indices{$y} = $y;
                 }
@@ -169,14 +175,14 @@ if(exists $options{f}) {
         }
     }
 #foreach (sort keys %warn_file_indices) {
-#    print "$_ : $warn_file_indices{$_}\n";
+#    print STDERR "$_ : $warn_file_indices{$_}\n";
 #}
 }
 
 # Parse list of warning strings for files to expand warnings
 if(exists $options{S}) {
     @file_match_strings = split /,/, $options{S};
-# print @file_match_strings;
+# print STDERR @file_match_strings;
 }
 
 # Check if warnings should stay unique and not be "genericized"
@@ -197,7 +203,7 @@ while (<>) {
 
     # Retain last FORTRAN compile line, which comes a few lines before warning
     if($_ =~ /.*\.[fF]90:.*/) {
-        ($last_fort_name, $last_fort_line, $toss) = split /\:/, $_;
+        ($last_fort_name, $last_fort_line, $last_fort_offset) = split /\:/, $_;
         ($last_fort_line, $toss) = split /\./, $last_fort_line;
     }
 
@@ -217,38 +223,34 @@ while (<>) {
     # Skip warnings from linker
     next if $_ =~ /ld: warning:/;
 
-    # Skip warnings from build_py and install_lib 
+    # Skip warnings from build_py and install_lib
     next if $_ =~ /warning: (build_py|install_lib)/;
 
+    # Skip variables with the word 'warning' in them
+    next if $_ =~ /_warning_/;
+
     # "Hide" the C++ '::' symbol until we've parsed out the parts of the line
     while($_ =~ /\:\:/) {
 	$_ =~ s/\:\:/@@@@/g;
     }
 
     # Check for weird formatting of warning message
+    $line = "??";
+    $offset = "??";
     if($_ =~ /^cc1: warning:.*/) {
         $name = $last_c_name;
-        $line = "??";
         ($toss, $toss, $warning, $extra, $extra2) = split /\:/, $_;
     # Check for CMAKE build with warning on first line and no filename
     } elsif($_ =~ /^\s*[Ww]arning:.*/) {
         $name = $last_c_name;
-        $line = "??";
         ($toss, $warning, $extra, $extra2) = split /\:/, $_;
     # Check for FORTRAN warning output
     } elsif($_ =~ /^Warning:.*/) {
         $name = $last_fort_name;
         $line = $last_fort_line;
+        $offset = $last_fort_offset;
         ($toss, $warning, $extra, $extra2) = split /\:/, $_;
-#print "1:",$.,":",$_;
-#        $_ = <>;
-#print "2:",$.,":",$_;
-#        if($_ =~ /^\sFC.*/) {
-#            $_ = <>;
-#print "3:",$.,":",$_;
-#        }
-#        ($name, $line, $toss) = split /\:/, $_;
-#print "4:","'",$name,"'","-","'",$line,"'","\n";
+
         # Check for improperly parsed filename or line
         if($name =~ /^$/) {
             print "Filename is a null string! Input line #$. is: '$_'";
@@ -265,8 +267,6 @@ while (<>) {
 	    $name =~ s/^\"//g;
 	    $name =~ s/\"$//g;
 	    $line =~ s/^\s*line\s*//g;
-# print "name:'", $name, "'-'", $line, "'\n";
-# print "warning:'", $warning, "'\n";
     # Check for Intel icc warning
     } elsif($_ =~ /.*[A-Za-z0-9_]\.[chC]\(.*[0-9]\):.*#.*/) {
         ($last_c_name, $toss, $warning) = split /\:/, $last_c_name;
@@ -310,9 +310,7 @@ while (<>) {
     # Check for ignored file
     if(exists $options{i}) {
         for my $x (@ignorenames) {
-#print "x = '$x'\n";
             if($name =~ /$x/) {
-# print "matched name = '$name'\n";
                 $ignorecount++;
                 if(!(exists $ignored_files{$name})) {
                     $ignored_files{$name} = $name;
@@ -347,13 +345,22 @@ while (<>) {
 # These skipped messages & "genericizations" may be specific to GCC
 
     # Skip supplemental warning message
-    next if $warning =~ /near initialization for/;
+    if($warning =~ /near initialization for/) {
+	$notecount++;
+        next
+    }
 
     # Skip C++ supplemental warning message
-    next if $warning =~ /in call to/;
+    if($warning =~ /in call to/) {
+	$notecount++;
+        next
+    }
 
     # Skip GCC warning that should be a note
-    next if $_ =~ /\(this will be reported only once per input file\)/;
+    if($_ =~ /\(this will be reported only once per input file\)/) {
+	$notecount++;
+        next
+    }
 
     if($genericize) {
 	# Eliminate C/C++ "{aka <some type>}" and "{aka '<some type>'}" info
@@ -402,16 +409,16 @@ while (<>) {
 	    $warning =~ s/[A-Za-z_0-9]*\([A-Za-z_,0-9]*\) in [A-Za-z_0-9]*/-\(-\) in -/g;
 	}
     }
-# print "warning = $warning\n";
 # <end possible GCC-specific code>
 
     # Check if we've already seen this warning on this line in this file
     # (Can happen for warnings from inside header files)
-    if( !exists $warn_file_line{$warning}{$name}{$line} ) {
+    if( !exists $warn_file_line_offset{$warning}{$name}{$line}{$offset} ) {
 	# Increment count for [generic] warning
 	$warn_count{$warning}++;
 	$warn_file{$warning}{$name}++;
 	$warn_file_line{$warning}{$name}{$line}++;
+	$warn_file_line_offset{$warning}{$name}{$line}{$offset}++;
 
 	# Increment count for filename
 	$file_count{$name}++;
@@ -421,14 +428,20 @@ while (<>) {
 	# Increment total count of warnings
 	$totalcount++;
     }
+    else {
+	# Increment count of duplicate warnings
+	$dupcount++;
+    }
 
-#    print "name = $name\n";
-#    print "line = $line\n";
-#    print "offset = $offset\n";
-#    print "warning = \"$warning\"\n";
+#    print STDERR "name = $name\n";
+#    print STDERR "line = $line\n";
+#    print STDERR "offset = $offset\n";
+#    print STDERR "warning = \"$warning\"\n";
 }
 
 print "Total unique [non-ignored] warnings: $totalcount\n";
+print "Ignored notes / supplemental warning lines [not counted in unique warnings]: $notecount\n";
+print "Duplicated warning lines [not counted in unique warnings]: $dupcount\n";
 print "Total ignored warnings: $ignorecount\n";
 $warncount = keys %warn_count;
 print "Total unique kinds of warnings: $warncount\n";
@@ -439,7 +452,7 @@ print "Total files with warnings: $filecount\n\n";
 print "# of Warnings by frequency (file count)\n";
 print "=======================================\n";
 for my $x (sort {$warn_count{$b} <=> $warn_count{$a}} keys(%warn_count)) {
-    printf ("[%2d] %4d (%2d) - %s\n", $current_warning++, $warn_count{$x}, scalar(keys %{$warn_file_line{$x}}), $x);
+    printf ("[%2d] %4d (%2d) - %s\n", $current_warning++, $warn_count{$x}, scalar(keys %{$warn_file{$x}}), $x);
     if((exists $options{W}) || (exists $options{w}) || (exists $options{s})) {
         my $curr_index = $current_warning - 1;
 	my $match = 0;
@@ -447,9 +460,9 @@ for my $x (sort {$warn_count{$b} <=> $warn_count{$a}} keys(%warn_count)) {
 	# Check for string from list in current warning
 	if(exists $options{s}) {
 	    for my $y (@warn_match_strings) {
-# print "y = '$y'\n";
+# print STDERR "y = '$y'\n";
 		if($x =~ /$y/) {
-# print "matched warning = '$x'\n";
+# print STDERR "matched warning = '$x'\n";
 		    $match = 1;
 		    last;
 		}
@@ -477,7 +490,7 @@ for my $x (sort {$warn_count{$b} <=> $warn_count{$a}} keys(%warn_count)) {
 print "\n# of Warnings by filename (warning type)\n";
 print   "========================================\n";
 for my $x (sort {$file_count{$b} <=> $file_count{$a}} keys(%file_count)) {
-    printf ("[%3d] %4d (%2d) - %s\n", $current_file++, $file_count{$x}, scalar(keys %{$file_warn_line{$x}}), $x);
+    printf ("[%3d] %4d (%2d) - %s\n", $current_file++, $file_count{$x}, scalar(keys %{$file_warn{$x}}), $x);
     if((exists $options{F}) || (exists $options{f}) || (exists $options{S})) {
         my $curr_index = $current_file - 1;
 	my $match = 0;
@@ -485,9 +498,9 @@ for my $x (sort {$file_count{$b} <=> $file_count{$a}} keys(%file_count)) {
 	# Check for string from list in current file
 	if(exists $options{S}) {
 	    for my $y (@file_match_strings) {
-# print "y = '$y'\n";
+# print STDERR "y = '$y'\n";
 		if($x =~ /$y/) {
-# print "matched warning = '$x'\n";
+# print STDERR "matched warning = '$x'\n";
 		    $match = 1;
 		    last;
 		}
diff --git a/bin/yodconfigure b/bin/yodconfigure
index 44d7d99..a91507d 100755
--- a/bin/yodconfigure
+++ b/bin/yodconfigure
@@ -7,7 +7,7 @@
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
 # the COPYING file, which can be found at the root of the source code
-# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# distribution tree, or in https://www.hdfgroup.org/licenses.
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
author	Larry Knox <lrknox@hdfgroup.org>	2021-10-29 22:10:31 (GMT)
committer	GitHub <noreply@github.com>	2021-10-29 22:10:31 (GMT)
commit	111c7ae9ac2efc29e8b399e6951253af9110b81a (patch)
tree	f69fa03253bdab97d7cf3615baff02cd936323f9 /bin
parent	db30c2da68ece4a155e9e50c28ec16d6057509b2 (diff)
download	hdf5-hdf5-1_10_8.zip hdf5-hdf5-1_10_8.tar.gz hdf5-hdf5-1_10_8.tar.bz2