diff options
author | hdftest <hdftest@hdfgroup.org> | 2017-02-22 22:08:39 (GMT) |
---|---|---|
committer | hdftest <hdftest@hdfgroup.org> | 2017-02-22 22:08:39 (GMT) |
commit | c83faa4905c24f4c74653e8f4d279c732204d2d0 (patch) | |
tree | 878f039ea0ad4600da00915ca12eca1a1aa5fef4 | |
parent | f3022b3d23b50e07aaf39d7a7589c4515ab09b42 (diff) | |
parent | e627a2a45b6751294a14cab7f6617c48a5809482 (diff) | |
download | hdf5-c83faa4905c24f4c74653e8f4d279c732204d2d0.zip hdf5-c83faa4905c24f4c74653e8f4d279c732204d2d0.tar.gz hdf5-c83faa4905c24f4c74653e8f4d279c732204d2d0.tar.bz2 |
Merge pull request #306 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:hdf5_1_8 to hdf5_1_8
* commit 'e627a2a45b6751294a14cab7f6617c48a5809482':
Delete files inadvertently checked in with version changes following snapshot release. (Changed daily test command to add specific files for commit instead of all new and modified files.)
Snapshot version 1.8 release 19 (snap1)
-rw-r--r-- | README.txt | 2 | ||||
-rw-r--r-- | c++/src/cpp_doc_config | 2 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | hl/test/Makefile.in | 3 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 2 | ||||
-rw-r--r-- | src/H5public.h | 4 |
7 files changed, 19 insertions, 18 deletions
@@ -1,4 +1,4 @@ -HDF5 version 1.8.19-snap1 currently under development +HDF5 version 1.8.19-snap2 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 2c56a97..b059e5e 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -38,7 +38,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.19-snap1 currently under development" +PROJECT_NUMBER = "1.8.19-snap2 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 @@ -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.19-snap1. +# Generated by GNU Autoconf 2.69 for HDF5 1.8.19-snap2. # # Report bugs to <help@hdfgroup.org>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.8.19-snap1' -PACKAGE_STRING='HDF5 1.8.19-snap1' +PACKAGE_VERSION='1.8.19-snap2' +PACKAGE_STRING='HDF5 1.8.19-snap2' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1476,7 +1476,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.19-snap1 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.19-snap2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1546,7 +1546,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.19-snap1:";; + short | recursive ) echo "Configuration of HDF5 1.8.19-snap2:";; esac cat <<\_ACEOF @@ -1741,7 +1741,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.19-snap1 +HDF5 configure 1.8.19-snap2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2678,7 +2678,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.19-snap1, which was +It was created by HDF5 $as_me 1.8.19-snap2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3549,7 +3549,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.19-snap1' + VERSION='1.8.19-snap2' cat >>confdefs.h <<_ACEOF @@ -29284,7 +29284,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -HDF5 config.lt 1.8.19-snap1 +HDF5 config.lt 1.8.19-snap2 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -31319,7 +31319,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.19-snap1, which was +This file was extended by HDF5 $as_me 1.8.19-snap2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31385,7 +31385,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.19-snap1 +HDF5 config.status 1.8.19-snap2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 35dbdc3..f0eb713 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,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.19-snap1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.19-snap2], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 6fd37b5..1a9b390 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -709,7 +709,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 \ combine_tables[1-2].h5 test_ds[1-9].h5 test_ds10.h5 \ test_image[1-3].h5 file_img[1-2].h5 test_lite[1-4].h5 \ test_table.h5 test_packet_table.h5 test_packet_compress.h5 \ - test_detach.h5 test_dectris.h5 + test_detach.h5 test_dectris.h5 test_packet_table_vlen.h5 \ + testfl_packet_table_vlen.h5 # The tests depend on the hdf5, hdf5 test, and hdf5_hl libraries LDADD = $(LIBH5_HL) $(LIBH5TEST) $(LIBHDF5) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 1b96576..6655eb0 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.19-snap1 currently under development +HDF5 version 1.8.19-snap2 currently under development ================================================================================ INTRODUCTION diff --git a/src/H5public.h b/src/H5public.h index 353a55c..b8919c9 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -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 19 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "snap1" /* For pre-releases like snap0 */ +#define H5_VERS_SUBRELEASE "snap2" /* For pre-releases like snap0 */ /* Empty string for real releases. */ -#define H5_VERS_INFO "HDF5 library version: 1.8.19-snap1" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.8.19-snap2" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) |