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

* commit '25f80cbbec3a7d8036325784168b029cb71cc813': (324 commits)
  Snapshot version 1.10 release 3 (snap3)
  Update document
  HDFFV-10433 Updated text to address issues raised.
  Snapshot version 1.10 release 3 (snap2)
  Updated version to 1.10.3-snap2
  Merge corrections from develop
  HDFFV-10473 add note for attribute fix
  Correct attribute location
  HDFFV-9739 and cmake improvements merge from develop
  Fix for HDFFV-10469: set to latest format for virtual layout encoding.
  Update Windows test machines
  Fix soversion
  Fixed libver bounds underscore issue
  removed extraneous lib. ver. bound, PR comment
  temporary fix for HDFFV-10469
  Updated version to 1.10.3-snap1
  Add new file
  Correct number of tests
  Whitespace and test reclassify merge from develop
  HDFFV-10444 fix so numbers and merge java test changes
  ...

2 files changed, 24 insertions, 24 deletions

diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 7eaf80a..0123bce 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -34,8 +34,8 @@ cmake_minimum_required (VERSION 3.10)
 #     CTEST_SOURCE_NAME  -  source folder

 ##############################################################################

 

-set (CTEST_SOURCE_VERSION "1.11.2")

-set (CTEST_SOURCE_VERSEXT "")

+set (CTEST_SOURCE_VERSION "1.10.3")

+set (CTEST_SOURCE_VERSEXT "-snap4")

 

 ##############################################################################

 # handle input parameters to script.

@@ -184,7 +184,7 @@ set (MODEL "Experimental")
 #####       Following controls source update                  #####

 #set (LOCAL_UPDATE "TRUE")

 set (REPOSITORY_URL "https://git@bitbucket.hdfgroup.org/scm/hdffv/hdf5.git")

-set (REPOSITORY_BRANCH "develop")

+set (REPOSITORY_BRANCH "hdf5_1_10_2")

 

 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows

 #set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")

diff --git a/config/lt_vers.am b/config/lt_vers.am
index fcc2a40..82cf35e 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -12,13 +12,13 @@
 ## If you do not have access to either file, you may request a copy from
 ## help@hdfgroup.org.
 ##
-# Add libtool shared library version numbers to the HDF5 library
-# 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_AGE = 0
+## Add libtool shared library version numbers to the HDF5 library
+## See libtool versioning documentation online.
+## After making changes, run bin/reconfigure to update other configure related
+## files like Makefile.in.
+LT_VERS_INTERFACE = 102
 LT_VERS_REVISION = 0
+LT_VERS_AGE = 1
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
 ## reset LT_VERS_REVISION to 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 = 102
 LT_CXX_VERS_REVISION = 0
 LT_CXX_VERS_AGE = 0
 
-LT_F_VERS_INTERFACE = 1000
-LT_F_VERS_REVISION = 0
-LT_F_VERS_AGE = 0
+LT_F_VERS_INTERFACE = 101
+LT_F_VERS_REVISION = 1
+LT_F_VERS_AGE = 1
 
-LT_HL_VERS_INTERFACE = 1000
+LT_HL_VERS_INTERFACE = 101
 LT_HL_VERS_REVISION = 0
-LT_HL_VERS_AGE = 0
+LT_HL_VERS_AGE = 1
 
-LT_HL_CXX_VERS_INTERFACE = 1000
-LT_HL_CXX_VERS_REVISION = 0
-LT_HL_CXX_VERS_AGE = 0
+LT_HL_CXX_VERS_INTERFACE = 101
+LT_HL_CXX_VERS_REVISION = 1
+LT_HL_CXX_VERS_AGE = 1
 
-LT_HL_F_VERS_INTERFACE = 1000
-LT_HL_F_VERS_REVISION = 0
+LT_HL_F_VERS_INTERFACE = 100
+LT_HL_F_VERS_REVISION = 2
 LT_HL_F_VERS_AGE = 0
 
-LT_JAVA_VERS_INTERFACE = 1000
+LT_JAVA_VERS_INTERFACE = 102
 LT_JAVA_VERS_REVISION = 0
-LT_JAVA_VERS_AGE = 0
+LT_JAVA_VERS_AGE = 2
 
-LT_TOOLS_VERS_INTERFACE = 1000
+LT_TOOLS_VERS_INTERFACE = 101
 LT_TOOLS_VERS_REVISION = 0
-LT_TOOLS_VERS_AGE = 0
+LT_TOOLS_VERS_AGE = 1