Skip to content

Commit

Permalink
Update version to 1.8.22-12.
Browse files Browse the repository at this point in the history
  • Loading branch information
lrknox committed Dec 16, 2020
1 parent 4a9b02f commit 17acf19
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.8.22-snap12 currently under development
HDF5 version 1.8.22-12 currently under development

------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.
Expand Down
2 changes: 1 addition & 1 deletion bin/h5vers
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion c++/src/cpp_doc_config
Original file line number Diff line number Diff line change
Expand Up @@ -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.22-12, 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
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/scripts/HDF5config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.12)
##############################################################################

set (CTEST_SOURCE_VERSION "1.8.22")
set (CTEST_SOURCE_VERSEXT "-snap12")
set (CTEST_SOURCE_VERSEXT "-12")

##############################################################################
# handle input parameters to script.
Expand Down
22 changes: 11 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -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.22-12.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -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.22-12'
PACKAGE_STRING='HDF5 1.8.22-12'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -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.22-12 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -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.22-12:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -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.22-12
generated by GNU Autoconf 2.69

Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -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.22-12, which was
generated by GNU Autoconf 2.69. Invocation command line was

$ $0 $@
Expand Down Expand Up @@ -3631,7 +3631,7 @@ fi

# Define the identity of the package.
PACKAGE='hdf5'
VERSION='1.8.22-snap12'
VERSION='1.8.22-12'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -30253,7 +30253,7 @@ Usage: $0 [OPTIONS]
Report bugs to <[email protected]>."

lt_cl_version="\
HDF5 config.lt 1.8.22-snap12
HDF5 config.lt 1.8.22-12
configured by $0, generated by GNU Autoconf 2.69.

Copyright (C) 2011 Free Software Foundation, Inc.
Expand Down Expand Up @@ -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.22-12, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -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.22-12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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], [[email protected]])
AC_INIT([HDF5], [1.8.22-12], [[email protected]])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])

Expand Down
2 changes: 1 addition & 1 deletion release_docs/RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.8.22-snap12 currently under development
HDF5 version 1.8.22-12 currently under development
================================================================================

INTRODUCTION
Expand Down
2 changes: 2 additions & 0 deletions src/H5FDhdfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions src/H5public.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ extern "C" {
#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_SUBRELEASE "12" /* 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.22-12" /* Full version string */

#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)

Expand Down

0 comments on commit 17acf19

Please sign in to comment.