mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1630 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop

Browse Source 
* commit '7a0ac416c9e42a650d99b77feefbb2dc2df9a155':
  Snapshot version 1.11 release 4. Update version to 1.11.5.
This commit is contained in:
Larry Knox 2019-04-02 12:20:16 -05:00
commit a61ba73814
9 changed files with 19 additions and 19 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.4 currently under development
HDF5 version 1.11.5 currently under development
------------------------------------------------------------------------------
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 =
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = "1.11.4"
PROJECT_NUMBER = "1.11.5"
# 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

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

@ -34,7 +34,7 @@ cmake_minimum_required (VERSION 3.10)
# CTEST_SOURCE_NAME - source folder
##############################################################################
set (CTEST_SOURCE_VERSION "1.11.4")
set (CTEST_SOURCE_VERSION "1.11.5")
set (CTEST_SOURCE_VERSEXT "")
##############################################################################

4
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
## release!!!
##
AC_INIT([HDF5], [1.11.4], [help@hdfgroup.org])
AC_INIT([HDF5], [1.11.5], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])
@ -48,7 +48,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # use silent rules where a
##
## By default, it is enabled. Users can configure with
## --disable-maintainer-mode to prevent running the autotools.
AM_MAINTAINER_MODE([enable])
AM_MAINTAINER_MODE([disable])
## ----------------------------------------------------------------------
## Set prefix default (install directory) to a directory in the build area.

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

@ -212,7 +212,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
* exception handlers to print out the HDF-5 error stack.
* <hr>
*
* @version HDF5 1.11.4 <BR>
* @version HDF5 1.11.5 <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.HDF5CDataTypes.html"> hdf.hdf5lib.HDF5CDataTypes</a><BR>
@ -235,7 +235,7 @@ public class H5 implements java.io.Serializable {
*
* Make sure to update the versions number when a different library is used.
*/
public final static int LIB_VERSION[] = { 1, 11, 4 };
public final static int LIB_VERSION[] = { 1, 11, 5 };
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
public void testH5get_libversion() {
int libversion[] = { 1, 11, 4 };
int libversion[] = { 1, 11, 5 };
try {
H5.H5get_libversion(libversion);
@ -201,7 +201,7 @@ public class TestH5 {
*/
@Test
public void testH5check_version() {
int majnum = 1, minnum = 11, relnum = 4;
int majnum = 1, minnum = 11, relnum = 5;
try {
H5.H5check_version(majnum, minnum, relnum);

2
release_docs/RELEASE.txt
View File

@ -1,4 +1,4 @@
version 1.11.4 currently under development
HDF5 version 1.11.5 currently under development
================================================================================

4
src/H5public.h
View File

@ -93,10 +93,10 @@ extern "C" {
/* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 11 /* For minor interface/format changes */
#define H5_VERS_RELEASE 4 /* For tweaks, bug-fixes, or development */
#define H5_VERS_RELEASE 5 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.11.4" /* Full version string */
#define H5_VERS_INFO "HDF5 library version: 1.11.5" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
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 {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {
@ -33,7 +33,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {
@ -55,7 +55,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {
@ -77,7 +77,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {
@ -99,7 +99,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {
@ -121,7 +121,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {
@ -143,7 +143,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 11 4 }
PARAMS { 9 1 11 5 }
}
}
FILLVALUE {