diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-09-18 13:00:07 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-09-18 13:00:07 (GMT) |
| commit | f77aec9f604743d36c6b191b7170d14ac0a92847 (patch) | |
| tree | 2dad527866fb89bfe78457ed18825577f367ac2a | |
| parent | 21b9b4eee9e1af16565891c3adac4acbf3aa842d (diff) | |
| parent | 0cbb20b68e83a52d798676a81a3bbca284b1b36b (diff) | |
| download | hdf5-f77aec9f604743d36c6b191b7170d14ac0a92847.zip hdf5-f77aec9f604743d36c6b191b7170d14ac0a92847.tar.gz hdf5-f77aec9f604743d36c6b191b7170d14ac0a92847.tar.bz2 | |
Merge pull request #2892 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_12 to hdf5_1_12
* commit '0cbb20b68e83a52d798676a81a3bbca284b1b36b':
Snapshot version 1.12 release 1-2. Update version to 1.12.1-3
| -rw-r--r-- | README.txt | 2 | ||||
| -rw-r--r-- | c++/src/cpp_doc_config | 2 | ||||
| -rw-r--r-- | config/cmake/scripts/HDF5config.cmake | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 2 | ||||
| -rw-r--r-- | src/H5public.h | 4 |
6 files changed, 7 insertions, 7 deletions
@@ -1,4 +1,4 @@ -HDF5 version 1.12.1-2 currently under development +HDF5 version 1.12.1-3 currently under development ------------------------------------------------------------------------------ Please refer to the release_docs/INSTALL file for installation instructions. diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 037decc..3db683d 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.12.1-2, currently under development" +PROJECT_NUMBER = "1.12.1-3, 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 612f997..48a960c 100644 --- 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.12.1") -set (CTEST_SOURCE_VERSEXT "-2") +set (CTEST_SOURCE_VERSEXT "-3") ############################################################################## # handle input parameters to script. diff --git a/configure.ac b/configure.ac index e7aa159..3b6eb1c 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.12.1-2], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.12.1-3], [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 2e20886..70fbdc4 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.12.1-2 currently under development +HDF5 version 1.12.1-3 currently under development ================================================================================ diff --git a/src/H5public.h b/src/H5public.h index ca17f37..d76c47b 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 12 /* For minor interface/format changes */ #define H5_VERS_RELEASE 1 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "2" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "3" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.12.1-2" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.12.1-3" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) |