diff options
| -rw-r--r-- | README.txt | 2 | ||||
| -rwxr-xr-x | bin/pkgscrpts/makeInternalREADME.pl | 26 | ||||
| -rwxr-xr-x | bin/pkgscrpts/makeOuterREADME.pl | 46 | ||||
| -rw-r--r-- | c++/src/cpp_doc_config | 2 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 | ||||
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 11 | ||||
| -rw-r--r-- | src/H5public.h | 4 |
9 files changed, 54 insertions, 63 deletions
@@ -1,4 +1,4 @@ -HDF5 version 1.10.7-1 currently under development +HDF5 version 1.10.7-2 currently under development ------------------------------------------------------------------------------ Please refer to the release_docs/INSTALL file for installation instructions. diff --git a/bin/pkgscrpts/makeInternalREADME.pl b/bin/pkgscrpts/makeInternalREADME.pl index 355036f..ecaf82b 100755 --- a/bin/pkgscrpts/makeInternalREADME.pl +++ b/bin/pkgscrpts/makeInternalREADME.pl @@ -4,14 +4,12 @@ # Copyright by The HDF Group. # All rights reserved. # -# This file is part of HDF4. The full HDF4 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the files COPYING and Copyright.html. COPYING can be found at the root -# of the source code distribution tree; Copyright.html can be found at the -# root level of an installed copy of the electronic HDF4 document set and -# is linked from the top-level documents page. It can also be found at -# http://hdfgroup.org/HDF4/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from help@hdfgroup.org. +# 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. +# # If you do not have access to either file, you may request a copy from +# # help@hdfgroup.org. # use warnings; @@ -41,14 +39,12 @@ These binaries were built with the ZLIB and SZIP (version 2.1, Encoder ENABLED) external libraries which are included in the lib directory for convenience. -We also provide the ZLIB and SZIP source code on our ftp server at: - - ftp://ftp.hdfgroup.org/lib-external/ - The official ZLIB and SZIP pages are at: ZLIB: http://www.zlib.net/ + http://www.zlib.net/zlib_license.html SZIP: http://hdfgroup.org/doc_resource/SZIP/ + https://gitlab.dkrz.de/k202009/libaec/-/blob/master/Copyright.txt "; @@ -76,9 +72,9 @@ to check: LIBS - Libraries your application will link with For further details refer to the INSTALL files in - ftp://ftp.hdfgroup.org/HDF5/current/src/unpacked/release_docs/ -or in the ./release_docs/ directory of the HDF5 source code, which can be found -on the HDF Group ftp server at ftp://ftp.hdfgroup.org/HDF5/current/src/. +the ./release_docs/ directory of the HDF5 source code, which can be found +at https://support.hdfgroup.org/ftp/HDF5/current/src/. + Please send questions, comments, and suggestions to the appropriate contact address from http://www.hdfgroup.org/about/contact.html diff --git a/bin/pkgscrpts/makeOuterREADME.pl b/bin/pkgscrpts/makeOuterREADME.pl index 602ad28..f28677f 100755 --- a/bin/pkgscrpts/makeOuterREADME.pl +++ b/bin/pkgscrpts/makeOuterREADME.pl @@ -4,14 +4,12 @@ # Copyright by The HDF Group. # All rights reserved. # -# This file is part of HDF4. The full HDF4 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the files COPYING and Copyright.html. COPYING can be found at the root -# of the source code distribution tree; Copyright.html can be found at the -# root level of an installed copy of the electronic HDF4 document set and -# is linked from the top-level documents page. It can also be found at -# http://hdfgroup.org/HDF4/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from help@hdfgroup.org. +# 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. +# # If you do not have access to either file, you may request a copy from +# # help@hdfgroup.org. # use warnings; @@ -91,7 +89,7 @@ elsif ($indirectory =~ /platypus/) { $compilerstring2 = " gcc, g++, and gfortran 4.4.7)\n"; } else { $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; - $compilerstring2 = " gcc, g++, and gfortran 4.4.7 and java 1.8.0_51)\n"; + $compilerstring2 = " gcc, g++, and gfortran 4.4.7 and java 1.7.0_99)\n"; } } elsif ($indirectory =~ /moohan/) { @@ -100,10 +98,10 @@ elsif ($indirectory =~ /moohan/) { $compilerstring1 = " gcc, g++, and gfortran 4.8.5)\n"; if ($indirectory =~ /32/) { $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; - $compilerstring2 = " gcc, g++, and gfortran 4.4.7)\n"; + $compilerstring2 = " gcc, g++, and gfortran 4.8.5)\n"; } else { $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 and Java APIs (using"; - $compilerstring2 = " gcc, g++, and gfortran 4.8.5 and java 1.8.0_51)\n"; + $compilerstring2 = " gcc, g++, and gfortran 4.8.5 and java 1.8.0_181)\n"; } } elsif ($indirectory =~ /emu/) { @@ -112,30 +110,18 @@ elsif ($indirectory =~ /emu/) { $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; $compilerstring = " Sun C and C++ 5.12, Sun Fortran 95 8.6)\n"; } -elsif ($indirectory =~ /kite/) { - $line3 = " hfd5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; - $line5 = " hfd5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; - $compilerstring = " Apple clang/clang++ 5.1 from Xcode 5.0.2, - gfortran 4.8.2)\n"; -} -elsif ($indirectory =~ /quail/) { - $line3 = " hfd5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; - $line5 = " hfd5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; - $compilerstring = " Apple clang/clang++ 6.0 from Xcode 5.1, - gfortran 4.9.2)\n"; -} -elsif ($indirectory =~ /osx1010test/) { - $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; - $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; - $compilerstring = " Apple clang/clang++ 6.1 from Xcode 6.1, - gfortran 4.9.2)\n"; -} elsif ($indirectory =~ /osx1011test/) { $line3 = " hdf5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; $line5 = " hdf5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; - $compilerstring = " Apple clang/clang++ 7.0.2 from Xcode 7.0, + $compilerstring = " Apple clang/clang++ 7.3.0 from Xcode 7.3, gfortran 5.2.0)\n"; } +elsif ($indirectory =~ /kite/) { + $line3 = " hfd5-$version-$outsubdir-static.tar.gz - Includes C, C++, F90 APIs (using"; + $line5 = " hfd5-$version-$outsubdir-shared.tar.gz - Includes C, C++, F90 APIs (using"; + $compilerstring = " Apple LLVM version 9.0.0 clang-900.39.2, + gfortran 7.4.0)\n"; +} print OUTFILE $line3; print OUTFILE $compilerstring1."\n"; diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 59625e0..67ceca5 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -38,7 +38,7 @@ PROJECT_NAME = # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.10.7-1, currently under development" +PROJECT_NUMBER = "1.10.7-2, currently under development" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index fe19e1a..d112c5a 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.12) ############################################################################## set (CTEST_SOURCE_VERSION "1.10.7") -set (CTEST_SOURCE_VERSEXT "-1") +set (CTEST_SOURCE_VERSEXT "-2") ############################################################################## # handle input parameters to script. @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HDF5 1.10.7-1. +# Generated by GNU Autoconf 2.69 for HDF5 1.10.7-2. # # Report bugs to <help@hdfgroup.org>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.10.7-1' -PACKAGE_STRING='HDF5 1.10.7-1' +PACKAGE_VERSION='1.10.7-2' +PACKAGE_STRING='HDF5 1.10.7-2' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1559,7 +1559,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.10.7-1 to adapt to many kinds of systems. +\`configure' configures HDF5 1.10.7-2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1629,7 +1629,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.10.7-1:";; + short | recursive ) echo "Configuration of HDF5 1.10.7-2:";; esac cat <<\_ACEOF @@ -1912,7 +1912,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.10.7-1 +HDF5 configure 1.10.7-2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2827,7 +2827,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.10.7-1, which was +It was created by HDF5 $as_me 1.10.7-2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3699,7 +3699,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.10.7-1' + VERSION='1.10.7-2' cat >>confdefs.h <<_ACEOF @@ -32208,7 +32208,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -HDF5 config.lt 1.10.7-1 +HDF5 config.lt 1.10.7-2 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -34276,7 +34276,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.10.7-1, which was +This file was extended by HDF5 $as_me 1.10.7-2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -34342,7 +34342,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HDF5 config.status 1.10.7-1 +HDF5 config.status 1.10.7-2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 25ba5c0..c688d69 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.10.7-1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.10.7-2], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index f04bf64..663d440 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.10.7-1 currently under development +HDF5 version 1.10.7-2 currently under development ================================================================================ @@ -20,6 +20,15 @@ The official HDF5 releases can be obtained from: https://www.hdfgroup.org/downloads/hdf5/ + HDF5 binaries provided are fully tested with ZLIB and the free + Open Source SZIP successor Libaec (with BSD license). + The official ZLIB and Libaec pages are at: + + ZLIB: http://www.zlib.net/ + http://www.zlib.net/zlib_license.html + Libaec: https://gitlab.dkrz.de/k202009/libaec + https://gitlab.dkrz.de/k202009/libaec/-/blob/master/Copyright.txt + Changes from Release to Release and New Features in the HDF5-1.10.x release series can be found at: diff --git a/src/H5public.h b/src/H5public.h index e451905..c4e2e2c 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -97,9 +97,9 @@ extern "C" { #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 10 /* For minor interface/format changes */ #define H5_VERS_RELEASE 7 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "1" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "2" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.10.7-1" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.10.7-2" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) |