From e7dbf811912efd75121d340638ade209959ad973 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Wed, 25 Sep 2019 15:57:22 -0500 Subject: Set versions in initial hdf5_1_12 revision. --- README.txt | 2 +- c++/src/cpp_doc_config | 2 +- config/cmake/scripts/HDF5config.cmake | 2 +- config/lt_vers.am | 16 ++++++++-------- configure.ac | 2 +- java/src/hdf/hdf5lib/H5.java | 4 ++-- java/test/TestH5.java | 4 ++-- release_docs/RELEASE.txt | 2 +- src/H5public.h | 6 +++--- .../testfiles/h5repack_layout.h5-plugin_version_test.ddl | 14 +++++++------- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.txt b/README.txt index 64f1345..bee4f5f 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.11.6 currently under development +HDF5 version 1.12.0 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 14ca90c..1c30292 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -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.6" +PROJECT_NUMBER = "1.12.0" # 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 3511d05..1c04fcc 100644 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -34,7 +34,7 @@ cmake_minimum_required (VERSION 3.10) # CTEST_SOURCE_NAME - source folder ############################################################################## -set (CTEST_SOURCE_VERSION "1.11.6") +set (CTEST_SOURCE_VERSION "1.12.0") set (CTEST_SOURCE_VERSEXT "") ############################################################################## diff --git a/config/lt_vers.am b/config/lt_vers.am index fcc2a40..3cca531 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -16,7 +16,7 @@ # See libtool versioning documentation online. # After making changes, run bin/reconfigure to update other configure related # files like Makefile.in. -LT_VERS_INTERFACE = 1000 +LT_VERS_INTERFACE = 200 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 @@ -39,31 +39,31 @@ LT_VERS_REVISION = 0 ## the effects of the H5_V1_x_COMPAT flag. ## ## Version numbers for wrapper shared library files. -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 200 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 200 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 200 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 200 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 200 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 200 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 200 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 diff --git a/configure.ac b/configure.ac index e119e0a..dd777ab 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.11.6], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.12.0], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 4b563fd..83c4f0d 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -214,7 +214,7 @@ import hdf.hdf5lib.structs.H5O_info_t; * exception handlers to print out the HDF-5 error stack. *
* - * @version HDF5 1.11.6
+ * @version HDF5 1.12.0
* See also: hdf.hdf5lib.HDFArray
* hdf.hdf5lib.HDF5Constants
* hdf.hdf5lib.HDF5CDataTypes
@@ -237,7 +237,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, 6 }; + public final static int LIB_VERSION[] = { 1, 12, 0 }; public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib"; diff --git a/java/test/TestH5.java b/java/test/TestH5.java index 1dbcce3..a2e53cd 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -161,7 +161,7 @@ public class TestH5 { */ @Test public void testH5get_libversion() { - int libversion[] = { 1, 11, 6 }; + int libversion[] = { 1, 12, 0 }; try { H5.H5get_libversion(libversion); @@ -200,7 +200,7 @@ public class TestH5 { */ @Test public void testH5check_version() { - int majnum = 1, minnum = 11, relnum = 6; + int majnum = 1, minnum = 12, relnum = 0; try { H5.H5check_version(majnum, minnum, relnum); diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index eb47648..9c91a0b 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.11.6 currently under development +HDF5 version 1.12.0 currently under development ================================================================================ diff --git a/src/H5public.h b/src/H5public.h index b79fcfb..ce108f9 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -95,11 +95,11 @@ 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 6 /* For tweaks, bug-fixes, or development */ +#define H5_VERS_MINOR 12 /* For minor interface/format changes */ +#define H5_VERS_RELEASE 0 /* 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.6" /* Full version string */ +#define H5_VERS_INFO "HDF5 library version: 1.12.0" /* Full version string */ #define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ H5_VERS_RELEASE) diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl index 3ff2170..14e7ca0 100644 --- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl +++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl @@ -11,7 +11,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { @@ -33,7 +33,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { @@ -55,7 +55,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { @@ -77,7 +77,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { @@ -99,7 +99,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { @@ -121,7 +121,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { @@ -143,7 +143,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 11 6 } + PARAMS { 9 1 12 0 } } } FILLVALUE { -- cgit v0.12