Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hdf5 1 8 22 #279

Merged
merged 27 commits into from
Jan 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
52f6744
Restores maintainer mode in the autotools (#200)
derobins Dec 18, 2020
9d1999c
Update configure for Restores maintainer mode in the autotools (#200).
lrknox Dec 18, 2020
f34233c
Update MANIFEST for switch_maint_mode script.
lrknox Dec 18, 2020
0277b7d
Update so numbers for 1.8.22 release.
lrknox Dec 21, 2020
37b5b8e
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Dec 21, 2020
a008cd0
Add so numbers changes in Makefile.ins for 1.8.22 release.
lrknox Dec 21, 2020
57df34d
Update pkgconfig settings with version - #218 (#223)
byrnHDF Dec 22, 2020
10dbac8
Add notice of final HDFF5 1.8 release.
lrknox Dec 22, 2020
c4fcff1
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Dec 22, 2020
458be32
Update 1.8 final release notice.
lrknox Dec 22, 2020
5fde85a
Update CMake/HDF5Examples version in bin/release
lrknox Dec 22, 2020
1c44828
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Dec 22, 2020
faf36a3
Fixed typo in an error message. (#227)
bmribler Dec 23, 2020
1c141c0
Remove duplicate setting (#239)
byrnHDF Jan 5, 2021
2d5ac50
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 9, 2021
6810e75
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 14, 2021
03ca350
RELEASE.txt cleanup.
lrknox Jan 14, 2021
751596f
Add macOS Big Sur to tested machines, also missing entries for macOS …
lrknox Jan 15, 2021
216de13
)Update version.
lrknox Jan 15, 2021
103163a
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 16, 2021
f45efa1
Reverts lock/unlock callback signature to 1.8.21 version (#254)
derobins Jan 12, 2021
e46cef4
Update version to 1.8.22-14.
lrknox Jan 16, 2021
dcf60c4
Update version in H5public.h
lrknox Jan 16, 2021
792bb16
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 16, 2021
34619be
Merge branch 'hdf5_1_8_22' of https://github.com/HDFGroup/hdf5 into h…
lrknox Jan 23, 2021
f309d6c
Set version 1.8.22 for release.
lrknox Jan 23, 2021
564be14
dd RELEASE.txt entry for HDFFV-10741.
lrknox Jan 24, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-14 currently under development
HDF5 version 1.8.22 currently under development

------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.
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-14, currently under development"
PROJECT_NUMBER = "1.8.22"

# 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 "-14")
set (CTEST_SOURCE_VERSEXT "")

##############################################################################
# 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-14.
# Generated by GNU Autoconf 2.69 for HDF5 1.8.22.
#
# Report bugs to <help@hdfgroup.org>.
#
Expand Down Expand Up @@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='HDF5'
PACKAGE_TARNAME='hdf5'
PACKAGE_VERSION='1.8.22-14'
PACKAGE_STRING='HDF5 1.8.22-14'
PACKAGE_VERSION='1.8.22'
PACKAGE_STRING='HDF5 1.8.22'
PACKAGE_BUGREPORT='help@hdfgroup.org'
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-14 to adapt to many kinds of systems.
\`configure' configures HDF5 1.8.22 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-14:";;
short | recursive ) echo "Configuration of HDF5 1.8.22:";;
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-14
HDF5 configure 1.8.22
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-14, which was
It was created by HDF5 $as_me 1.8.22, 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-14'
VERSION='1.8.22'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -30282,7 +30282,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."

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

Copyright (C) 2011 Free Software Foundation, Inc.
Expand Down Expand Up @@ -32358,7 +32358,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-14, which was
This file was extended by HDF5 $as_me 1.8.22, which was
generated by GNU Autoconf 2.69. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -32424,7 +32424,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-14
HDF5 config.status 1.8.22
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-14], [help@hdfgroup.org])
AC_INIT([HDF5], [1.8.22], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])

Expand Down
10 changes: 9 additions & 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-14 currently under development
HDF5 version 1.8.22 currently under development
================================================================================

Notice: HDF5 1.8.22 will be followed later in 2021 by HDF5 1.8.23, the final
Expand Down Expand Up @@ -290,6 +290,14 @@ New Features

(ADB - 2019/06/12, HDFFV-10805)

- Change tools tests to search the error stack

There are some use cases which can cause the error stack of tools to be
different then the expected output. These tests now use grepTest.cmake;
this was changed to allow the error file to be searched for an expected string.

(ADB - 2019/04/15, HDFFV-10741)

- Add toolchain and cross-compile support

Added info on using a toolchain file to INSTALL_CMAKE.txt. A
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 "14" /* For pre-releases like snap0 */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.8.22-14" /* Full version string */
#define H5_VERS_INFO "HDF5 library version: 1.8.22" /* Full version string */

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

Expand Down