summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-09-08 04:01:22 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-09-08 04:01:22 (GMT)
commitbd1094856ffdd11773c39c6fcf98feae9b665349 (patch)
tree0b7c030f2b40c324a0ad5fffc9a8212bffa411ff
parent102f41b8b125969a9ea75538fbc49b1d12338a98 (diff)
parent1e02be328393806dbc41ca1b4f492fe93651a836 (diff)
downloadhdf5-bd1094856ffdd11773c39c6fcf98feae9b665349.zip
hdf5-bd1094856ffdd11773c39c6fcf98feae9b665349.tar.gz
hdf5-bd1094856ffdd11773c39c6fcf98feae9b665349.tar.bz2
Merge pull request #2883 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_7 to hdf5_1_10_7
* commit '1e02be328393806dbc41ca1b4f492fe93651a836': Update version for HDF5 1.10.7 release.
-rw-r--r--README.txt2
-rw-r--r--c++/src/cpp_doc_config2
-rwxr-xr-xconfig/cmake/scripts/HDF5config.cmake2
-rwxr-xr-xconfigure22
-rw-r--r--configure.ac2
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5public.h4
7 files changed, 18 insertions, 18 deletions
diff --git a/README.txt b/README.txt
index 0a1ff7b..d2aab65 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.10.7-2 currently under development
+HDF5 version 1.10.7 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 67ceca5..8397a2f 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-2, currently under development"
+PROJECT_NUMBER = "1.10.7"
# 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 d112c5a..0bbd3b9 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 "-2")
+set (CTEST_SOURCE_VERSEXT "")
##############################################################################
# handle input parameters to script.
diff --git a/configure b/configure
index 0fb0e5c..59cd680 100755
--- a/configure
+++ b/configure
@@ -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-2.
+# Generated by GNU Autoconf 2.69 for HDF5 1.10.7.
#
# 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-2'
-PACKAGE_STRING='HDF5 1.10.7-2'
+PACKAGE_VERSION='1.10.7'
+PACKAGE_STRING='HDF5 1.10.7'
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-2 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.10.7 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-2:";;
+ short | recursive ) echo "Configuration of HDF5 1.10.7:";;
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-2
+HDF5 configure 1.10.7
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-2, which was
+It was created by HDF5 $as_me 1.10.7, 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-2'
+ VERSION='1.10.7'
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-2
+HDF5 config.lt 1.10.7
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-2, which was
+This file was extended by HDF5 $as_me 1.10.7, 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-2
+HDF5 config.status 1.10.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c688d69..8a645a0 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-2], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.10.7], [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 fabaf5b..0083c1b 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.10.7-2 currently under development
+HDF5 version 1.10.7 currently under development
================================================================================
diff --git a/src/H5public.h b/src/H5public.h
index c4e2e2c..62f1047 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 "2" /* 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.10.7-2" /* Full version string */
+#define H5_VERS_INFO "HDF5 library version: 1.10.7" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)