mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-07 16:37:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #343 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10

Browse Source 
* commit '9187d41af616b6c8064ab0af5c85d4dd93cff50d':
  Update version numbers in HDF5config.cmake and 2 java files.  h5vers script missed them, will need updating.
  set initial version for HDF5 1.10.1.
This commit is contained in:
Larry Knox 2017-03-17 13:25:24 -05:00
commit 7ebd91fbdb
8 changed files with 13 additions and 13 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.9.236 currently under development HDF5 version 1.10.1-pre0 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.9.236 currently under development" PROJECT_NUMBER = "1.10.1-pre0, currently under development"
# 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

@ -28,7 +28,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
############################################################################## ##############################################################################
set (CTEST_SOURCE_VERSION 1.10.1) set (CTEST_SOURCE_VERSION 1.10.1)
set (CTEST_SOURCE_VERSEXT "") set (CTEST_SOURCE_VERSEXT "-pre0")
############################################################################## ##############################################################################
# handle input parameters to script. # handle input parameters to script.

2
configure.ac
View File

@ -26,7 +26,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.9.236], [help@hdfgroup.org]) AC_INIT([HDF5], [1.10.1-pre0], [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

@ -216,7 +216,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.9 <BR> * @version HDF5 1.10.1-pre0 <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>
@ -239,7 +239,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, 9, 9999 }; public final static int LIB_VERSION[] = { 1, 10, 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

@ -164,7 +164,7 @@ public class TestH5 {
*/ */
@Test @Test
public void testH5get_libversion() { public void testH5get_libversion() {
int libversion[] = { 1, 9, 0 }; int libversion[] = { 1, 10, 1 };
try { try {
H5.H5get_libversion(libversion); H5.H5get_libversion(libversion);
@ -186,7 +186,7 @@ public class TestH5 {
*/ */
@Test @Test
public void testH5check_version() { public void testH5check_version() {
int majnum = 1, minnum = 9, relnum = 0; int majnum = 1, minnum = 10, 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.9.236 currently under development HDF5 version 1.10.1-pre0 currently under development
================================================================================ ================================================================================

8
src/H5public.h
View File

@ -93,11 +93,11 @@ 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 9 /* For minor interface/format changes */ #define H5_VERS_MINOR 10 /* For minor interface/format changes */
#define H5_VERS_RELEASE 236 /* 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 "pre0" /* For pre-releases like snap0 */
/* Empty string for real releases. */ /* Empty string for real releases. */
#define H5_VERS_INFO "HDF5 library version: 1.9.236" /* Full version string */ #define H5_VERS_INFO "HDF5 library version: 1.10.1-pre0" /* 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)