Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_10

12 files changed, 46 insertions, 23 deletions

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 3f5f380..8efea80 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -10,10 +10,10 @@ set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 set (CTEST_DROP_METHOD "http")
 if (CDASH_LOCAL)
   set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk")
+  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110")
 else ()
   set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5+Trunk")
+  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110")
 endif ()
 set (CTEST_DROP_SITE_CDASH TRUE)
 
diff --git a/README.txt b/README.txt
index e51a486..6d7ae50 100644
--- a/README.txt
+++ b/README.txt
@@ -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.
 ------------------------------------------------------------------------------
 
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 5986eaa..f04528f 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,7 @@ PROJECT_NAME           = "HDF5 C++ API"
 # could be handy for archiving the generated documentation or if some version
 # 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
 # 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 f9dada9..5b5e2b6 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -28,7 +28,7 @@ cmake_minimum_required (VERSION 3.2.2 FATAL_ERROR)
 ##############################################################################

 

 set (CTEST_SOURCE_VERSION 1.10.1)

-set (CTEST_SOURCE_VERSEXT "")

+set (CTEST_SOURCE_VERSEXT "-pre0")

 

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

 # handle input parameters to script.

diff --git a/configure.ac b/configure.ac
index 3e918db..a9756f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## 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_HEADERS([src/H5config.h])
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 5b35d17..4a491fe 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -216,7 +216,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
  * exception handlers to print out the HDF-5 error stack.
  * <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>
  *          <a href ="./hdf.hdf5lib.HDF5Constants.html"> hdf.hdf5lib.HDF5Constants</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.
      */
-    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";
 
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index 1a78bea..205a51c 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -164,7 +164,7 @@ public class TestH5 {
      */
     @Test
     public void testH5get_libversion() {
-        int libversion[] = { 1, 9, 0 };
+        int libversion[] = { 1, 10, 1 };
 
         try {
             H5.H5get_libversion(libversion);
@@ -186,7 +186,7 @@ public class TestH5 {
      */
     @Test
     public void testH5check_version() {
-        int majnum = 1, minnum = 9, relnum = 0;
+        int majnum = 1, minnum = 10, relnum = 1;
 
         try {
             H5.H5check_version(majnum, minnum, relnum);
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 8651584..f6d3912 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.236 currently under development
+HDF5 version 1.10.1-pre0 currently under development
 ================================================================================
 
 
diff --git a/src/H5public.h b/src/H5public.h
index f0eb63a..76be643 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -93,11 +93,11 @@ extern "C" {
 
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
-#define H5_VERS_MINOR	9	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	236	/* For tweaks, bug-fixes, or development     */
-#define H5_VERS_SUBRELEASE ""	/* For pre-releases like snap0       */
+#define H5_VERS_MINOR	10	/* For minor interface/format changes  	     */
+#define H5_VERS_RELEASE	1	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_SUBRELEASE "pre0"	/* For pre-releases like snap0       */
 				/* 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,	      \
 				        H5_VERS_RELEASE)
diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in
index c4a75e8..85e169a 100644
--- a/test/testswmr.sh.in
+++ b/test/testswmr.sh.in
@@ -123,6 +123,25 @@ while [ $# -gt 0 ]; do
     esac
 done
 
+# HDF5 has several tests that create and delete signal files to communicate
+# between processes, and it seems that even though the names of the files are
+# different, occasionally the wrong file is deleted, interrupting the flow of
+# the test.  Running each of these tests in its own directory should eliminate
+# the problem.
+mkdir -p swmr_test/.libs
+cp swmr* swmr_test
+
+# With the --disable-shared option, swmr program files are built in the test
+# directory, otherwise they are in test/.libs with a corresponding wrapper
+# script in the test directory.  The programs or wrapper scripts in test should
+# always be copied, swmr files in .libs should be copied only if they exists.
+if [ -f .libs/swmr ]; then
+    cp .libs/swmr* swmr_test/.libs
+fi
+
+cd swmr_test
+
+
 # Loop over index types
 for index_type in "-i ea" "-i b2" 
 do
@@ -521,6 +540,10 @@ done
 $DPRINT nerrors=$nerrors
 if test $nerrors -eq 0 ; then
     echo "SWMR tests passed."
+    if test -z "$HDF5_NOCLEANUP"; then
+        # delete the test directory
+        rm -rf swmr_test
+    fi
     exit 0
 else
     echo "SWMR tests failed with $nerrors errors."
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index c7a9a6b..3f577a9 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -248,7 +248,7 @@ TOOLTEST_DUMP()
 COPY_TESTFILES_TO_TESTDIR
 
 # Run the test
-arg="h5repack_layout.h5 -v -f UD=260,4,9,1,9,235"
+arg="h5repack_layout.h5 -v -f UD=260,4,9,1,10,1"
 TOOLTEST_DUMP plugin_version_test $arg
 
 arg="h5repack_layout.h5 -v -f UD=257,1,9"
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 4a5617f..7bac9c4 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 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {
@@ -99,7 +99,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
          USER_DEFINED_FILTER {
             FILTER_ID 260
             COMMENT dynlib4
-            PARAMS { 9 1 9 236 }
+            PARAMS { 9 1 10 1 }
          }
       }
       FILLVALUE {