diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2019-02-18 22:34:05 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2019-02-18 22:34:05 (GMT) |
commit | c31f7e21022244210258cee56ceabecbef38fabe (patch) | |
tree | 157294e9371599a62d9998e10fb06ee84f25f921 | |
parent | 0012c2f3dd18196485ce60da121cfd61de6f5a22 (diff) | |
parent | b3c49d88d0a209cda99d8c667f37b5c8da092d38 (diff) | |
download | hdf5-c31f7e21022244210258cee56ceabecbef38fabe.zip hdf5-c31f7e21022244210258cee56ceabecbef38fabe.tar.gz hdf5-c31f7e21022244210258cee56ceabecbef38fabe.tar.bz2 |
Merge pull request #1565 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_5 to hdf5_1_10_5
* commit 'b3c49d88d0a209cda99d8c667f37b5c8da092d38':
set version to 1.10.5-pre1. Change default build mode to production.
-rw-r--r-- | README.txt | 2 | ||||
-rw-r--r-- | c++/src/cpp_doc_config | 2 | ||||
-rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 | ||||
-rwxr-xr-x | configure | 26 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 2 | ||||
-rw-r--r-- | src/H5public.h | 4 |
7 files changed, 22 insertions, 22 deletions
@@ -1,4 +1,4 @@ -HDF5 version 1.10.5-snap1 currently under development +HDF5 version 1.10.5-pre1 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 7e3c91d..d3d8efa 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.5-snap1, currently under development" +PROJECT_NUMBER = "1.10.5-pre1, 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 4d6af03..61bdcd6 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -35,7 +35,7 @@ cmake_minimum_required (VERSION 3.10) ############################################################################## set (CTEST_SOURCE_VERSION "1.10.5") -set (CTEST_SOURCE_VERSEXT "-snap1") +set (CTEST_SOURCE_VERSEXT "-pre1") ############################################################################## # handle input parameters to script. @@ -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.5-snap1. +# Generated by GNU Autoconf 2.69 for HDF5 1.10.5-pre1. # # 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.5-snap1' -PACKAGE_STRING='HDF5 1.10.5-snap1' +PACKAGE_VERSION='1.10.5-pre1' +PACKAGE_STRING='HDF5 1.10.5-pre1' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1529,7 +1529,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.5-snap1 to adapt to many kinds of systems. +\`configure' configures HDF5 1.10.5-pre1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1599,7 +1599,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.10.5-snap1:";; + short | recursive ) echo "Configuration of HDF5 1.10.5-pre1:";; esac cat <<\_ACEOF @@ -1620,7 +1620,7 @@ Optional Features: Clean turns nothing on and disables optimization (i.e.: a 'clean slate' configuration). All these settings can be overridden by using specific - configure flags. [default=debug] + configure flags. [default=production] --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking @@ -1857,7 +1857,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.10.5-snap1 +HDF5 configure 1.10.5-pre1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2772,7 +2772,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.5-snap1, which was +It was created by HDF5 $as_me 1.10.5-pre1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3644,7 +3644,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.10.5-snap1' + VERSION='1.10.5-pre1' cat >>confdefs.h <<_ACEOF @@ -4135,7 +4135,7 @@ fi ## Set the default ## Depends on branch, set via script at branch creation time if test "X-$BUILD_MODE" = X- ; then - BUILD_MODE=debug + BUILD_MODE=production fi ## Allow this variable to be substituted in @@ -31447,7 +31447,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -HDF5 config.lt 1.10.5-snap1 +HDF5 config.lt 1.10.5-pre1 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -33495,7 +33495,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.5-snap1, which was +This file was extended by HDF5 $as_me 1.10.5-pre1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33561,7 +33561,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.5-snap1 +HDF5 config.status 1.10.5-pre1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 41334f4..93300597 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.5-snap1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.10.5-pre1], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) @@ -299,14 +299,14 @@ AC_ARG_ENABLE([build-mode], (i.e.: a 'clean slate' configuration). All these settings can be overridden by using specific configure flags. - [default=debug] + [default=production] ])], [BUILD_MODE=$enableval]) ## Set the default ## Depends on branch, set via script at branch creation time if test "X-$BUILD_MODE" = X- ; then - BUILD_MODE=debug + BUILD_MODE=production fi ## Allow this variable to be substituted in diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 353d63b..b1f1733 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.10.5-snap1 currently under development +HDF5 version 1.10.5-pre1 currently under development ================================================================================ diff --git a/src/H5public.h b/src/H5public.h index 1ff2954..06f61fd 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -94,9 +94,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 5 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "snap1" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "pre1" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.10.5-snap1" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.10.5-pre1" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) |