diff --git a/CMakePresets.json b/CMakePresets.json
index 13766ca66f..ac5c1c0042 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -14,28 +14,34 @@
}
},
{
- "name": "ci-StdCompression",
+ "name": "ci-CompressionVars",
"hidden": true,
- "inherits": "ci-base-tgz",
"cacheVariables": {
"BUILD_ZLIB_WITH_FETCHCONTENT": "ON",
"ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
"ZLIB_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/madler/zlib/releases/download/v1.2.13"},
"ZLIB_TGZ_ORIGNAME": {"type": "STRING", "value": "zlib-1.2.13.tar.gz"},
- "ZLIB_USE_LOCALCONTENT": "OFF",
"BUILD_SZIP_WITH_FETCHCONTENT": "ON",
"LIBAEC_PACKAGE_NAME": {"type": "STRING", "value": "libaec"},
"LIBAEC_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/MathisRosenhauer/libaec/releases/download/v1.0.6"},
- "LIBAEC_TGZ_ORIGNAME": {"type": "STRING", "value": "libaec-1.0.6.tar.gz"},
+ "LIBAEC_TGZ_ORIGNAME": {"type": "STRING", "value": "libaec-1.0.6.tar.gz"}
+ }
+ },
+ {
+ "name": "ci-StdCompression",
+ "hidden": true,
+ "inherits": ["ci-base-tgz", "ci-CompressionVars"],
+ "cacheVariables": {
+ "HDF5_PACKAGE_EXTLIBS": "ON",
+ "ZLIB_USE_LOCALCONTENT": "OFF",
"LIBAEC_USE_LOCALCONTENT": "OFF"
}
},
{
"name": "ci-base-plugins",
"hidden": true,
- "inherits": "ci-base-tgz",
"cacheVariables": {
- "PLUGIN_TGZ_NAME": {"type": "STRING", "value": "hdf5_plugins-1.14.0.tar.gz"},
+ "PLUGIN_TGZ_NAME": {"type": "STRING", "value": "hdf5_plugins.tar.gz"},
"PLUGIN_PACKAGE_NAME": {"type": "STRING", "value": "pl"},
"BSHUF_TGZ_NAME": {"type": "STRING", "value": "bitshuffle.tar.gz"},
"BSHUF_PACKAGE_NAME": {"type": "STRING", "value": "bshuf"},
@@ -63,32 +69,48 @@
}
},
{
- "name": "ci-StdPlugins",
+ "name": "ci-PluginsVars",
"hidden": true,
- "inherits": ["ci-base-plugins", "ci-base-tgz"],
"cacheVariables": {
"HDF5_ENABLE_PLUGIN_SUPPORT": "ON",
"PLUGIN_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/HDFGroup/hdf5_plugins/archive/refs/tags"},
- "PLUGIN_TGZ_ORIGNAME": {"type": "STRING", "value": "hdf5_plugins-1.14.0.tar.gz"}
+ "PLUGIN_TGZ_ORIGNAME": {"type": "STRING", "value": "hdf5_plugins-master.tar.gz"}
}
},
- {
- "name": "ci-StdExamples",
+ {
+ "name": "ci-StdPlugins",
+ "hidden": true,
+ "inherits": ["ci-base-plugins", "ci-PluginsVars", "ci-base-tgz"],
+ "cacheVariables": {
+ "H5PL_VERS_MAJOR": "1",
+ "H5PL_VERS_MINOR": "14",
+ "H5PL_VERS_RELEASE": "3"
+ }
+ },
+ {
+ "name": "ci-ExamplesVars",
"hidden": true,
- "inherits": "ci-base",
"cacheVariables": {
- "HDF5_PACK_EXAMPLES": "ON",
"HDF5_EXAMPLES_COMPRESSED": {"type": "STRING", "value": "hdf5-examples-2.0.3.tar.gz"},
"HDF5_EXAMPLES_COMPRESSED_DIR": {"type": "STRING", "value": "${sourceParentDir}/temp"},
"EXAMPLES_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/HDFGroup/hdf5-examples/archive/refs/tags/"},
- "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "2.0.3.tar.gz"},
+ "EXAMPLES_TGZ_ORIGNAME": {"type": "STRING", "value": "2.0.3.tar.gz"}
+ }
+ },
+ {
+ "name": "ci-StdExamples",
+ "hidden": true,
+ "inherits": ["ci-base", "ci-ExamplesVars", "ci-base-tgz"],
+ "cacheVariables": {
+ "EXAMPLES_USE_LOCALCONTENT": "OFF",
+ "HDF5_PACK_EXAMPLES": "ON",
"EXAMPLES_DOWNLOAD": "ON"
}
},
- {
+ {
"name": "ci-StdShar",
"hidden": true,
- "inherits": "ci-StdCompression",
+ "inherits": ["ci-StdCompression", "ci-StdExamples"],
"cacheVariables": {
"HDF_PACKAGE_NAMESPACE": {"type": "STRING", "value": "hdf5::"},
"HDF5_INSTALL_MOD_FORTRAN": "NO",
@@ -105,8 +127,7 @@
"ci-x64-Release-MSVC",
"ci-CPP",
"ci-Java",
- "ci-StdShar",
- "ci-StdExamples"
+ "ci-StdShar"
]
},
{
@@ -117,8 +138,7 @@
"ci-CPP",
"ci-Fortran",
"ci-Java",
- "ci-StdShar",
- "ci-StdExamples"
+ "ci-StdShar"
]
},
{
@@ -129,8 +149,7 @@
"ci-CPP",
"ci-Fortran",
"ci-Java",
- "ci-StdShar",
- "ci-StdExamples"
+ "ci-StdShar"
]
},
{
@@ -141,8 +160,7 @@
"ci-CPP",
"ci-Fortran",
"ci-Java",
- "ci-StdShar",
- "ci-StdExamples"
+ "ci-StdShar"
]
}
],
diff --git a/bin/release b/bin/release
index 41f922bb0d..1226d33d8a 100755
--- a/bin/release
+++ b/bin/release
@@ -206,7 +206,7 @@ tar2cmakezip()
cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.zip $cmziptmpsubdir
- cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_2.zip $cmziptmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.zip $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmziptmpsubdir
@@ -298,7 +298,7 @@ tar2cmaketgz()
cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.tar.gz $cmgztmpsubdir
- cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_2.tar.gz $cmgztmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5options.cmake $cmgztmpsubdir
@@ -377,7 +377,7 @@ tar2hpccmaketgz()
cp /mnt/scr1/pre-release/hdf5/CMake/LIBAEC.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.3-Source.tar.gz $cmgztmpsubdir
- cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_2.tar.gz $cmgztmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir
cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index ad61584c90..ee2d7c72cb 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -73,6 +73,9 @@ set (KWSYS_USE_LOCALCONTENT OFF CACHE BOOL "Use local file for KWSYS FetchConten
set (PLUGIN_TGZ_NAME "hdf5_plugins.tar.gz" CACHE STRING "Use PLUGINS from compressed file" FORCE)
set (PLUGIN_PACKAGE_NAME "pl" CACHE STRING "Name of PLUGIN package" FORCE)
+set (H5PL_VERS_MAJOR "1" CACHE STRING "Major version of hdf5 package for PLUGIN package" FORCE)
+set (H5PL_VERS_MINOR "14" CACHE STRING "Minor version of hdf5 package for PLUGIN package" FORCE)
+set (H5PL_VERS_RELEASE "3" CACHE STRING "Release version of hdf5 package for PLUGIN package" FORCE)
#############
# bitshuffle
diff --git a/doxygen/dox/LearnBasics.dox b/doxygen/dox/LearnBasics.dox
index 8d6115cb7e..2847be7f77 100644
--- a/doxygen/dox/LearnBasics.dox
+++ b/doxygen/dox/LearnBasics.dox
@@ -67,7 +67,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create a dataset
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|
@@ -75,7 +75,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Read and write to a dataset
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|
@@ -83,7 +83,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create an attribute
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|
@@ -91,7 +91,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create a group
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|
@@ -99,7 +99,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create groups in a file using absolute and relative paths
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|
@@ -107,7 +107,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create datasets in a group
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|
@@ -115,7 +115,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create a file and dataset and select/read a subset from the dataset
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
Also see examples to Write by row (and column) below.
|
@@ -123,7 +123,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create an extendible (unlimited dimension) dataset
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
Also see examples to Extend by row (and column) below
|
@@ -131,7 +131,7 @@ These examples (C, C++, Fortran) are provided in the HDF5 source code and (Unix)
| Create a chunked and compressed dataset
|
-C Fortran C++ Java Python
+ | C Fortran C++ Java Python
|
|