From 55565382d2a6ae444ec5bc039f83b6b3bfb6730c Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 25 Sep 2023 22:16:43 -0500
Subject: Create 11011 tarball (#3596)
* Use variable for ignore-eol usage. (#3592)
* Add last_test depends properties
* Just print status on CMake below 3.14 (#3595)
* updated bin/release to fix CMake tar.gz and zip files for saip and zlib.
Removed the use of -commons linking option on Darwin as COMMON and
EQUIVALENCE are no long used.
Release of HDF5 1.10.11.
---------
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
---
README.md | 2 +-
bin/release | 24 ++++++++++++------------
config/cmake/fileCompareTest.cmake | 4 ++--
configure.ac | 8 --------
fortran/src/H5f90global.F90 | 2 --
release_docs/RELEASE.txt | 2 +-
tools/test/h5dump/CMakeTests.cmake | 8 ++++----
tools/test/misc/CMakeTestsClear.cmake | 8 ++++++++
8 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/README.md b/README.md
index 9c63c17..25e942c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-HDF5 version 1.10.11 released on 2023-09-21
+HDF5 version 1.10.11 released on 2023-09-25
diff --git a/bin/release b/bin/release
index 0e40133..03ea2b9 100755
--- a/bin/release
+++ b/bin/release
@@ -162,8 +162,8 @@ tar2zip()
# CTestScript.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5config.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5options.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
-# LIBAEC.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
-# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
+# LIBAEC.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake/config-time
+# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake/config-time
# Parameters:
@@ -211,8 +211,8 @@ tar2cmakezip()
(cd $cmziptmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=VS202264 -C Release -V -O hdf5.log" > build-VS2022-64.bat; chmod 755 build-VS2022-64.bat)
# step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
- 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/config-time/LIBAEC.tar.gz $cmziptmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/config-time/ZLib.tar.gz $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/hdf5-examples-master.zip $cmziptmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.zip $cmziptmpsubdir
cp $cmziptmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmziptmpsubdir
@@ -260,8 +260,8 @@ tar2cmakezip()
# CTestScript.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5config.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5options.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
-# LIBAEC.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
-# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
+# LIBAEC.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake/config-time
+# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake/config-time
# Parameters:
@@ -303,8 +303,8 @@ tar2cmaketgz()
(cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
# step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
- 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/config-time/LIBAEC.tar.gz $cmgztmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/config-time/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/hdf5-examples-master.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
@@ -333,8 +333,8 @@ tar2cmaketgz()
# CTestScript.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5config.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
# HDF5options.cmake cmake file copied from <hdf5 source code>/config/cmake/scripts
-# LIBAEC.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
-# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake
+# LIBAEC.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake/config-time
+# ZLib.tar.gz copied from /mnt/scr1/pre-release/hdf5/CMake/config-time
#
# 5. For HPC-CMake tgz file the following are also needed in the top-level directory:
# README_HPC copied from release_docs
@@ -382,8 +382,8 @@ tar2hpccmaketgz()
(cd $cmgztmpsubdir; echo "ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -V -O hdf5.log" > build-unix.sh; chmod 755 build-unix.sh)
# step 3: add LIBAEC.tar.gz, ZLib.tar.gz and cmake files
- 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/config-time/LIBAEC.tar.gz $cmgztmpsubdir
+ cp /mnt/scr1/pre-release/hdf5/CMake/config-time/ZLib.tar.gz $cmgztmpsubdir
cp /mnt/scr1/pre-release/hdf5/CMake/hdf5-examples-master.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
diff --git a/config/cmake/fileCompareTest.cmake b/config/cmake/fileCompareTest.cmake
index 4a8dc09..f4c46f6 100644
--- a/config/cmake/fileCompareTest.cmake
+++ b/config/cmake/fileCompareTest.cmake
@@ -59,7 +59,7 @@ if (TEST_STRINGS STREQUAL "YES")
endif ()
else ()
if (CMAKE_VERSION VERSION_LESS "3.14.0")
- message (FATAL_ERROR "CANNOT get file size, file command SIZE not supported")
+ message (STATUS "CANNOT get file size, file command SIZE not supported")
else ()
file (SIZE ${TEST_FOLDER}/${TEST_ONEFILE} TEST_ONE_SIZE)
file (SIZE ${TEST_FOLDER}/${TEST_TWOFILE} TEST_TWO_SIZE)
@@ -74,7 +74,7 @@ else ()
elseif (TEST_FUNCTION MATCHES "LTEQ")
if (TEST_ONE_SIZE LESS_EQUAL TEST_TWO_SIZE)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
- message (VERBOSES "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
+ message (VERBOSE "Passed: The size of ${TEST_FOLDER}/${TEST_ONEFILE} was less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
endif ()
else ()
message (FATAL_ERROR "The size of ${TEST_FOLDER}/${TEST_ONEFILE} was NOT less or equal ${TEST_FOLDER}/${TEST_TWOFILE}")
diff --git a/configure.ac b/configure.ac
index 5102c1a..eca6e19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1046,14 +1046,6 @@ H5_FORTRAN_SHARED="no"
if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
AC_MSG_CHECKING([if shared Fortran libraries are supported])
H5_FORTRAN_SHARED="yes"
- ## tell libtool to do the right thing with COMMON symbols, this fixes
- ## corrupt values with COMMON and EQUIVALENCE when building shared
- ## Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772).
- case "`uname`" in
- Darwin*)
- H5_LDFLAGS="$H5_LDFLAGS -Wl,-commons,use_dylibs"
- ;;
- esac
## Report results of check(s)
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 4b03610..d7de672 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -9,8 +9,6 @@
! PURPOSE
! This module is used to pass C stubs for H5 Fortran APIs. The C stubs are
! packed into arrays in H5_f.c and these arrays are then passed to Fortran.
-! This module then uses EQUIVALENCE to assign elements of the arrays to
-! Fortran equivalent C stubs.
!
! NOTES
! The size of the C arrays in H5_f.c has to match the values of the variables
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 1b095c0..109f529 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.10.11 released on 2023-09-21
+HDF5 version 1.10.11 released on 2023-09-25
================================================================================
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index 7ce8f43..5080c51 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -553,7 +553,7 @@
)
add_test (
NAME H5DUMP-${resultfile}-output-cmp
- COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+ COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
)
set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
DEPENDS H5DUMP-${resultfile}
@@ -618,7 +618,7 @@
)
add_test (
NAME H5DUMP-${resultfile}-output-cmp
- COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+ COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
)
set_tests_properties (H5DUMP-${resultfile}-output-cmp PROPERTIES
DEPENDS H5DUMP-${resultfile}
@@ -626,7 +626,7 @@
)
add_test (
NAME H5DUMP-${resultfile}-output-cmp-ddl
- COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${ddlfile}.txt ${ddlfile}.exp
+ COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${ddlfile}.txt ${ddlfile}.exp
)
set_tests_properties (H5DUMP-${resultfile}-output-cmp-ddl PROPERTIES
DEPENDS H5DUMP-${resultfile}-output-cmp
@@ -672,7 +672,7 @@
)
add_test (
NAME H5DUMP-output-cmp-${resultfile}
- COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${resultfile}.txt ${resultfile}.exp
+ COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${resultfile}.txt ${resultfile}.exp
)
set_tests_properties (H5DUMP-output-cmp-${resultfile} PROPERTIES
DEPENDS H5DUMP-output-${resultfile}
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index 5e307aa..a554972 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -99,6 +99,10 @@
-D "TEST_REFERENCE=${resultfile}.ddl"
-P "${HDF_RESOURCES_DIR}/runTest.cmake"
)
+ if (last_test)
+ set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+ endif ()
+ set (last_test "H5CLEAR_CMP-${testname}")
endif ()
endmacro ()
@@ -117,6 +121,10 @@
-D "TEST_ERRREF=${resultfile}.err"
-P "${HDF_RESOURCES_DIR}/runTest.cmake"
)
+ if (last_test)
+ set_tests_properties (H5CLEAR_CMP-${testname} PROPERTIES DEPENDS ${last_test})
+ endif ()
+ set (last_test "H5CLEAR_CMP-${testname}")
endif ()
endmacro ()
--
cgit v0.12