diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2017-11-02 21:30:29 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2017-11-02 21:30:29 (GMT) |
commit | 3cebf07a22e5d7d4c1a60a3cb4df57d570b40a13 (patch) | |
tree | 67eafb3fd250664deca88e2f3b1ba21d7ac2cbd1 | |
parent | 1077afd5c419b144093ad2ef6288674d1be995fa (diff) | |
parent | 26a8b4b21723a1f19a36fc4c66b6fa414d81bef2 (diff) | |
download | hdf5-3cebf07a22e5d7d4c1a60a3cb4df57d570b40a13.zip hdf5-3cebf07a22e5d7d4c1a60a3cb4df57d570b40a13.tar.gz hdf5-3cebf07a22e5d7d4c1a60a3cb4df57d570b40a13.tar.bz2 |
Merge pull request #750 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8_20 to hdf5_1_8_20
* commit '26a8b4b21723a1f19a36fc4c66b6fa414d81bef2':
Set version to 1.8.20-pre1
Update supported and tested platforms in RELEASE.txt.
Incremented lib file .so numbers: revision for all except c++ for code change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
-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 | 22 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 28 | ||||
-rw-r--r-- | src/H5public.h | 4 |
7 files changed, 35 insertions, 27 deletions
@@ -1,4 +1,4 @@ -HDF5 version 1.8.20-pre0 currently under development +HDF5 version 1.8.20-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 39489f2..30f9c87 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -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.20-pre0, currently under development" +PROJECT_NUMBER = "1.8.20-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 0492ab0..f1becd6 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR) ##############################################################################
set (CTEST_SOURCE_VERSION "1.8.20")
-set (CTEST_SOURCE_VERSEXT "-pre0")
+set (CTEST_SOURCE_VERSEXT "-pre1")
##############################################################################
# handle input parameters to script.
@@ -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.20-pre0. +# Generated by GNU Autoconf 2.69 for HDF5 1.8.20-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.8.20-pre0' -PACKAGE_STRING='HDF5 1.8.20-pre0' +PACKAGE_VERSION='1.8.20-pre1' +PACKAGE_STRING='HDF5 1.8.20-pre1' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1480,7 +1480,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.20-pre0 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.20-pre1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1550,7 +1550,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.20-pre0:";; + short | recursive ) echo "Configuration of HDF5 1.8.20-pre1:";; esac cat <<\_ACEOF @@ -1745,7 +1745,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.20-pre0 +HDF5 configure 1.8.20-pre1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2682,7 +2682,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.20-pre0, which was +It was created by HDF5 $as_me 1.8.20-pre1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3553,7 +3553,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.20-pre0' + VERSION='1.8.20-pre1' cat >>confdefs.h <<_ACEOF @@ -29313,7 +29313,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -HDF5 config.lt 1.8.20-pre0 +HDF5 config.lt 1.8.20-pre1 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -31373,7 +31373,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.20-pre0, which was +This file was extended by HDF5 $as_me 1.8.20-pre1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -31439,7 +31439,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.20-pre0 +HDF5 config.status 1.8.20-pre1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f5de134..0d9d79e 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.8.20-pre0], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.20-pre1], [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 1f8ba54..95e4902 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.20-pre0 currently under development +HDF5 version 1.8.20-pre1 currently under development ================================================================================ INTRODUCTION @@ -322,13 +322,13 @@ They are built with the configure process unless specified otherwise. Linux 2.6.32-573.22.1.el6 GNU C (gcc), Fortran (gfortran), C++ (g++) #1 SMP x86_64 GNU/Linux compilers: (platypus/mayll) Version 4.4.7 20120313 - Versions 4.9.3, 5.2.0, 6.2.0 + Versions 4.9.3, 5.3.0, 6.2.0 PGI C, Fortran, C++ for 64-bit target on x86-64; Version 16.10-0 Intel(R) C (icc), C++ (icpc), Fortran (icc) compilers: - Version 17.0.0.098 Build 20160721 + Version 17.0.0.196 Build 20160721 MPICH 3.1.4 compiled with GCC 4.9.3 OpenMPI 2.0.1 compiled with GCC 4.9.3 @@ -371,10 +371,6 @@ They are built with the configure process unless specified otherwise. Windows 10 x64 Visual Studio 2015 w/ Intel Fortran 16 (cmake) - Mac OS X Mt. Lion 10.8.5 Apple LLVM version 5.1 (clang-503.0.40) - 64-bit gfortran GNU Fortran (GCC) 4.8.2 - (swallow/kite) Intel icc/icpc/ifort version 15.0.3 - Mac OS X Mavericks 10.9.5 Apple LLVM version 6.0 (clang-600.0.57) 64-bit gfortran GNU Fortran (GCC) 4.9.2 (wren/quail) Intel icc/icpc/ifort version 15.0.3 @@ -383,10 +379,14 @@ They are built with the configure process unless specified otherwise. 64-bit gfortran GNU Fortran (GCC) 4.9.2 (osx1010dev/osx1010test) Intel icc/icpc/ifort version 15.0.3 - Mac OS X El Capitan 10.11.4 Apple LLVM version 7.3.0 (clang-703.0.29) + Mac OS X El Capitan 10.11.6 Apple LLVM version 7.3.0 (clang-703.0.29) 64-bit gfortran GNU Fortran (GCC) 5.2.0 (VM osx1011dev/osx1011test) Intel icc/icpc/ifort version 16.0.2 + Mac OS Sierra 10.12.6 Apple LLVM version 8.1 (clang-802.0.42) + 64-bit gfortran GNU Fortran (GCC) 7.1.0 + (kite) Intel icc/icpc/ifort version 17.0.2 + Tested Configuration Features Summary ===================================== @@ -411,9 +411,10 @@ Windows 7 Cygwin n y/n n y y y Windows 7 x64 Cygwin n y/n n y y y Windows 10 y y/y n y y y Windows 10 x64 y y/y n y y y -Mac OS X Mountain Lion 10.8.5 64-bit n y/y n y y y Mac OS X Mavericks 10.9.5 64-bit n y/y n y y y Mac OS X Yosemite 10.10.5 64-bit n y/y n y y y +Mac OS X El Capitan 10.11.6 64-bit n y/y n y y y +Mac OS Sierra 10.12.6 64-bit n y/y n y y y AIX 6.1 32- and 64-bit n y/n n y y y CentOS 6.7 Linux 2.6.32 x86_64 GNU y y/y y y y y CentOS 6.7 Linux 2.6.32 x86_64 Intel n y/y n y y y @@ -432,9 +433,10 @@ Windows 7 Cygwin n n n y Windows 7 x64 Cygwin n n n y Windows 10 y y y y Windows 10 x64 y y y y -Mac OS X Mountain Lion 10.8.5 64-bit y n y y Mac OS X Mavericks 10.9.5 64-bit y n y y Mac OS X Yosemite 10.10.5 64-bit y n y y +Mac OS X El Capitan 10.11.6 64-bit y n y y +Mac OS Sierra 10.12.6 64-bit y n y y AIX 6.1 32- and 64-bit y n n y CentOS 6.7 Linux 2.6.32 x86_64 GNU y y y y CentOS 6.7 Linux 2.6.32 x86_64 Intel y y y y @@ -485,6 +487,12 @@ Known Problems found a solution that satisfies both. Therefore the dynamically loaded plugin tests have been disabled on CYGWIN. + Mac OS X 10.13 added additional subdirectory structure in .libs for shared + libraries. Consequently "make check" will fail testing java and dynamically + loaded plugin test libraries attempting to copy files from the previous + locations in .libs directories. This will be addressed in the next release + when support for the Mac OS X 10.13 platform is added. + Known problems in previous releases can be found in the HISTORY*.txt files in the HDF5 source. Please report any new problems found to help@hdfgroup.org. diff --git a/src/H5public.h b/src/H5public.h index 151047e..9ff88f2 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -93,9 +93,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 20 /* For tweaks, bug-fixes, or development */ -#define H5_VERS_SUBRELEASE "pre0" /* 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.8.20-pre0" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.8.20-pre1" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) |