From 003a6eac48745a420b74147415db98f50109b366 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Wed, 16 Dec 2020 22:16:35 -0600 Subject: Update version to 1.8.23-0 after creating release branch for 1.8.22. --- README.txt | 2 +- bin/h5vers | 2 +- c++/src/cpp_doc_config | 2 +- config/cmake/scripts/HDF5config.cmake | 4 ++-- configure | 22 +++++++++++----------- configure.ac | 2 +- release_docs/RELEASE.txt | 2 +- src/H5FDhdfs.c | 2 ++ src/H5public.h | 6 +++--- .../h5repack_layout.h5-plugin_version_test.ddl | 14 +++++++------- 10 files changed, 30 insertions(+), 28 deletions(-) diff --git a/README.txt b/README.txt index 1194b72..4cfefc7 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.22-snap12 currently under development +HDF5 version 1.8.23-0 currently under development ------------------------------------------------------------------------------ Please refer to the release_docs/INSTALL file for installation instructions. diff --git a/bin/h5vers b/bin/h5vers index 960cd97..adaef6c 100755 --- a/bin/h5vers +++ b/bin/h5vers @@ -207,7 +207,7 @@ my (@curver) = getvers $contents; # Determine the new version number. my @newver; #new version if ($set) { - if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([a-zA-Z]\w*))?/) { + if ($set =~ /(\d+)\.(\d+)\.(\d+)(-([\da-zA-Z]\w*))?/) { @newver = ($1, $2, $3, $5); } elsif ($set =~ /(\d+)\D+(\d+)\D+(\d+)(\s*\(([a-zA-Z]\w*)\))?\D*$/) { @newver = ($1, $2, $3, $5); diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 55d85af..67a9e89 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -49,7 +49,7 @@ PROJECT_NAME = "HDF5 C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.8.22-snap12, currently under development" +PROJECT_NUMBER = "1.8.23-0, 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 6b6984a..e46a78d 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -37,8 +37,8 @@ cmake_minimum_required (VERSION 3.12) # CTEST_SOURCE_NAME - source folder ############################################################################## -set (CTEST_SOURCE_VERSION "1.8.22") -set (CTEST_SOURCE_VERSEXT "-snap12") +set (CTEST_SOURCE_VERSION "1.8.23") +set (CTEST_SOURCE_VERSEXT "-0") ############################################################################## # handle input parameters to script. diff --git a/configure b/configure index 236524a..bda048b 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HDF5 1.8.22-snap12. +# Generated by GNU Autoconf 2.69 for HDF5 1.8.23-0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.8.22-snap12' -PACKAGE_STRING='HDF5 1.8.22-snap12' +PACKAGE_VERSION='1.8.23-0' +PACKAGE_STRING='HDF5 1.8.23-0' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1511,7 +1511,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.8.22-snap12 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.23-0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1581,7 +1581,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.22-snap12:";; + short | recursive ) echo "Configuration of HDF5 1.8.23-0:";; esac cat <<\_ACEOF @@ -1823,7 +1823,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.22-snap12 +HDF5 configure 1.8.23-0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2760,7 +2760,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.8.22-snap12, which was +It was created by HDF5 $as_me 1.8.23-0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3631,7 +3631,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.22-snap12' + VERSION='1.8.23-0' cat >>confdefs.h <<_ACEOF @@ -30253,7 +30253,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -HDF5 config.lt 1.8.22-snap12 +HDF5 config.lt 1.8.23-0 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -32329,7 +32329,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.8.22-snap12, which was +This file was extended by HDF5 $as_me 1.8.23-0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32395,7 +32395,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.8.22-snap12 +HDF5 config.status 1.8.23-0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9da4bfa..3f6bdd3 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.8.22-snap12], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.23-0], [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 3caf217..3940467 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.22-snap12 currently under development +HDF5 version 1.8.23-0 currently under development ================================================================================ INTRODUCTION diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 14347f7..31e92b8 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -1730,6 +1730,7 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out) herr_t ret_value = FAIL; FUNC_ENTER_NOAPI_NOINIT + H5TRACE2("e", "i*x", fapl_id, fa_out); HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "HDFS VFD not included in the HDF5 library") @@ -1743,6 +1744,7 @@ H5Pset_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa) herr_t ret_value = FAIL; FUNC_ENTER_NOAPI_NOINIT + H5TRACE2("e", "i*x", fapl_id, fa); HGOTO_ERROR(H5E_VFL, H5E_UNSUPPORTED, FAIL, "HDFS VFD not included in the HDF5 library") diff --git a/src/H5public.h b/src/H5public.h index dc90330..eb447e1 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -94,10 +94,10 @@ extern "C" { /* Version numbers */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MINOR 8 /* For minor interface/format changes */ -#define H5_VERS_RELEASE 22 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "snap12" /* For pre-releases like snap0 */ +#define H5_VERS_RELEASE 23 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_SUBRELEASE "0" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.8.22-snap12" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.8.230" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE) diff --git a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl index 08fd4aa..5f1fae0 100644 --- a/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl +++ b/tools/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl @@ -11,7 +11,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { @@ -33,7 +33,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { @@ -55,7 +55,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { @@ -77,7 +77,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { @@ -99,7 +99,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { @@ -121,7 +121,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { @@ -143,7 +143,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 8 22 } + PARAMS { 9 1 8 23 } } } FILLVALUE { -- cgit v0.12