From 9a694db450d3d62d63910887bd8485ae76124807 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 22 Dec 2022 13:38:51 -0600 Subject: Update testh5cc.sh.in for new major version 1.14. (#2349) * Update testh5cc.sh.in for new major version 1.14. * iFix sha256sum commands in release script. --- bin/release | 16 +++++++-------- examples/testh5cc.sh.in | 52 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/bin/release b/bin/release index 6beab57..ca9a47c 100755 --- a/bin/release +++ b/bin/release @@ -52,7 +52,7 @@ for compressing the resulting tar archive (if none are given then information is available in the README_HPC file. doc -- produce the latest doc tree in addition to the archive. -An sha256 checksum is produced for each archive created and stored in the sha256 file. +A sha256 checksum is produced for each archive created and stored in the sha256 file. Examples: @@ -537,37 +537,37 @@ for comp in $methods; do case $comp in tar) cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar - (cd $DEST; sha256 $HDF5_VERS.tar >> $SHA256) + (cd $DEST; sha256sum $HDF5_VERS.tar >> $SHA256) ;; gzip) test "$verbose" && echo " Running gzip..." 1>&2 gzip -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.gz - (cd $DEST; sha256 $HDF5_VERS.tar.gz >> $SHA256) + (cd $DEST; sha256sum $HDF5_VERS.tar.gz >> $SHA256) ;; cmake-tgz) test "$verbose" && echo " Creating CMake tar.gz file..." 1>&2 tar2cmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.tar.gz 1>&2 - (cd $DEST; sha256 CMake-$HDF5_VERS.tar.gz >> $SHA256) + (cd $DEST; sha256sum CMake-$HDF5_VERS.tar.gz >> $SHA256) ;; hpc-cmake-tgz) test "$verbose" && echo " Creating HPC-CMake tar.gz file..." 1>&2 tar2hpccmaketgz $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/HPC-CMake-$HDF5_VERS.tar.gz 1>&2 - (cd $DEST; sha256 HPC-CMake-$HDF5_VERS.tar.gz >> $SHA256) + (cd $DEST; sha256sum HPC-CMake-$HDF5_VERS.tar.gz >> $SHA256) ;; bzip2) test "$verbose" && echo " Running bzip2..." 1>&2 bzip2 -9 <$tmpdir/$HDF5_VERS.tar >$DEST/$HDF5_VERS.tar.bz2 - (cd $DEST; sha256 $HDF5_VERS.tar.bz2 >> $SHA256) + (cd $DEST; sha256sum $HDF5_VERS.tar.bz2 >> $SHA256) ;; zip) test "$verbose" && echo " Creating zip ball..." 1>&2 tar2zip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.zip 1>&2 - (cd $DEST; sha256 $HDF5_VERS.zip >> $SHA256) + (cd $DEST; sha256sum $HDF5_VERS.zip >> $SHA256) ;; cmake-zip) test "$verbose" && echo " Creating CMake-zip ball..." 1>&2 tar2cmakezip $HDF5_VERS $tmpdir/$HDF5_VERS.tar $DEST/CMake-$HDF5_VERS.zip 1>&2 - (cd $DEST; sha256 CMake-$HDF5_VERS.zip >> $SHA256) + (cd $DEST; sha256sum CMake-$HDF5_VERS.zip >> $SHA256) ;; doc) if [ "${DOCVERSION}" = "" ]; then diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in index ff8f83f..3eb8949 100644 --- a/examples/testh5cc.sh.in +++ b/examples/testh5cc.sh.in @@ -69,6 +69,8 @@ v110main=${H5TOOL}_v110main.$suffix v110main_o=${H5TOOL}_v110main.o v112main=${H5TOOL}_v112main.$suffix v112main_o=${H5TOOL}_v112main.o +v114main=${H5TOOL}_v114main.$suffix +v114main_o=${H5TOOL}_v114main.o appmain=${H5TOOL}_appmain.$suffix appmain_o=${H5TOOL}_appmain.o prog1=${H5TOOL}_prog1.$suffix @@ -82,7 +84,7 @@ applib=libapp${H5TOOL}.a # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated # by other test programs. This will cause a racing condition error when # parallel make (e.g., gmake -j 4) is used. -temp_SRC="$hdf5main $v16main $v18main $v110main $v112main $appmain $prog1 $prog2" +temp_SRC="$hdf5main $v16main $v18main $v110main $v112main $v114main $appmain $prog1 $prog2" temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"` temp_FILES="a.out $applib" @@ -286,6 +288,53 @@ main (void) } EOF +# Generate HDF5 v1.14 Main Program: +# This makes unique V1.14 API calls. +cat > $v114main <