mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-23 16:20:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

Browse Source 
* commit '994611a2d4320358dc5a1c0c721633670ad4833c':
  Snapshot version 1.11 release 1
This commit is contained in:
Allen Byrne 2018-01-05 10:49:03 -06:00
commit a30a41bc32
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.txt
View File

@ -1,4 +1,4 @@
HDF5 version 1.11.0 currently under development HDF5 version 1.11.1 currently under development
Please refer to the release_docs/INSTALL file for installation instructions. Please refer to the release_docs/INSTALL file for installation instructions.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

2
c++/src/cpp_doc_config
View File

@ -38,7 +38,7 @@ PROJECT_NAME = "HDF5 C++ API"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = "1.11.0" PROJECT_NUMBER = "1.11.1"
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

2
config/cmake/scripts/HDF5config.cmake
View File

@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
# NO_MAC_FORTRAN - Yes to be SHARED on a Mac # NO_MAC_FORTRAN - Yes to be SHARED on a Mac
############################################################################## ##############################################################################
set (CTEST_SOURCE_VERSION "1.11.0") set (CTEST_SOURCE_VERSION "1.11.1")
set (CTEST_SOURCE_VERSEXT "") set (CTEST_SOURCE_VERSEXT "")
############################################################################## ##############################################################################

2
configure.ac
View File

@ -24,7 +24,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a ## NOTE: Do not forget to change the version number here when we do a
## release!!! ## release!!!
## ##
AC_INIT([HDF5], [1.11.0], [help@hdfgroup.org]) AC_INIT([HDF5], [1.11.1], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h]) AC_CONFIG_HEADERS([src/H5config.h])

4
java/src/hdf/hdf5lib/H5.java
View File

@ -214,7 +214,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
* exception handlers to print out the HDF-5 error stack. * exception handlers to print out the HDF-5 error stack.
* <hr> * <hr>
* *
* @version HDF5 1.11.0 <BR> * @version HDF5 1.11.1 <BR>
* <b>See also: <a href ="./hdf.hdf5lib.HDFArray.html"> hdf.hdf5lib.HDFArray</a> </b><BR> * <b>See also: <a href ="./hdf.hdf5lib.HDFArray.html"> hdf.hdf5lib.HDFArray</a> </b><BR>
* <a href ="./hdf.hdf5lib.HDF5Constants.html"> hdf.hdf5lib.HDF5Constants</a><BR> * <a href ="./hdf.hdf5lib.HDF5Constants.html"> hdf.hdf5lib.HDF5Constants</a><BR>
* <a href ="./hdf.hdf5lib.HDF5CDataTypes.html"> hdf.hdf5lib.HDF5CDataTypes</a><BR> * <a href ="./hdf.hdf5lib.HDF5CDataTypes.html"> hdf.hdf5lib.HDF5CDataTypes</a><BR>
@ -237,7 +237,7 @@ public class H5 implements java.io.Serializable {
* *
* Make sure to update the versions number when a different library is used. * Make sure to update the versions number when a different library is used.
*/ */
public final static int LIB_VERSION[] = { 1, 11, 0 }; public final static int LIB_VERSION[] = { 1, 11, 1 };
public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib"; public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";

4
java/test/TestH5.java
View File

@ -162,7 +162,7 @@ public class TestH5 {
*/ */
@Test @Test
public void testH5get_libversion() { public void testH5get_libversion() {
int libversion[] = { 1, 11, 0 }; int libversion[] = { 1, 11, 1 };
try { try {
H5.H5get_libversion(libversion); H5.H5get_libversion(libversion);
@ -184,7 +184,7 @@ public class TestH5 {
*/ */
@Test @Test
public void testH5check_version() { public void testH5check_version() {
int majnum = 1, minnum = 11, relnum = 0; int majnum = 1, minnum = 11, relnum = 1;
try { try {
H5.H5check_version(majnum, minnum, relnum); H5.H5check_version(majnum, minnum, relnum);

2
release_docs/RELEASE.txt
View File

@ -1,4 +1,4 @@
HDF5 version 1.11.0 currently under development HDF5 version 1.11.1 currently under development
================================================================================ ================================================================================

4
src/H5public.h
View File

@ -93,10 +93,10 @@ extern "C" {
/* Version numbers */ /* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */ #define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 11 /* For minor interface/format changes */ #define H5_VERS_MINOR 11 /* For minor interface/format changes */
#define H5_VERS_RELEASE 0 /* For tweaks, bug-fixes, or development */ #define H5_VERS_RELEASE 1 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */ #define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */ /* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.11.0" /* Full version string */ #define H5_VERS_INFO "HDF5 library version: 1.11.1" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE) H5_VERS_RELEASE)

14
tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
View File

@ -11,7 +11,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {
@ -33,7 +33,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {
@ -55,7 +55,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {
@ -77,7 +77,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {
@ -99,7 +99,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {
@ -121,7 +121,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {
@ -143,7 +143,7 @@ GROUP "/" {
USER_DEFINED_FILTER { USER_DEFINED_FILTER {
FILTER_ID 260 FILTER_ID 260
COMMENT dynlib4 COMMENT dynlib4
PARAMS { 9 1 11 0 } PARAMS { 9 1 11 1 }
} }
} }
FILLVALUE { FILLVALUE {