From 29b03cdc9f69a4434d0a15794946bc5ba1d4c25a Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Wed, 14 Dec 2022 12:03:01 -0600 Subject: Update hdf5 1 14 0 (#2298) * Initial updates for HDF5 1.14.0 release December 2022 Update so numbers for release Set version to 1.14.0 Switch default build mode to production for release in configure.ac lines435 and 442 Switch AM_MAINTAINER_MODE to disabled with bin/switch_maint_mode Set HDF5_GENERATE_HEADERS to OFF in src/CMakeLists.txt Commit Makefile.ins and other generated files for release except 2 ...~ files and autom4te.cache. * Add autotools generated files with misspelled word to list for codespell to skip. * Add autom4te.cache to codespell list of files to skip * Update windows worker compilers (#2247) * Update release script, version in java files and so numbers in Makefile.ins. * Add hdf5-1_14_0 branch to main.yml. * Don't run autogen.sh for release branche hdf5_1_10_0. Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com> --- .github/workflows/main.yml | 6 +++--- CTestConfig.cmake | 2 +- bin/h5vers | 4 ++-- bin/release | 38 +++++++++++++++++++------------------- c++/src/Makefile.in | 16 ++++++++-------- fortran/src/Makefile.in | 16 ++++++++-------- hl/c++/src/Makefile.in | 16 ++++++++-------- hl/fortran/src/Makefile.in | 16 ++++++++-------- hl/src/Makefile.in | 16 ++++++++-------- java/src/hdf/hdf5lib/H5.java | 2 +- java/src/jni/Makefile.in | 16 ++++++++-------- java/test/TestH5.java | 2 +- release_docs/RELEASE.txt | 5 ++++- src/Makefile.in | 16 ++++++++-------- 14 files changed, 87 insertions(+), 84 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96e2c83..c17ecf4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: push: pull_request: - branches: [ develop, hdf5_1_12, hdf5_1_10, hdf5_1_8 ] + branches: [ develop, hdf5_1_14_0, hdf5_1_14, hdf5_1_12, hdf5_1_10, hdf5_1_8 ] paths-ignore: - '.github/CODEOWNERS' - '.github/FUNDING.yml' @@ -377,7 +377,7 @@ jobs: - name: Autotools Configure run: | - sh ./autogen.sh +#sh ./autogen.sh mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --${{ matrix.deprec_sym }}-deprecated-symbols --with-default-api-version=${{ matrix.default_api }} --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd @@ -386,7 +386,7 @@ jobs: - name: Autotools Configure (Thread-Safe) run: | - sh ./autogen.sh +#sh ./autogen.sh mkdir "${{ runner.workspace }}/build" cd "${{ runner.workspace }}/build" ${{ matrix.flags }} $GITHUB_WORKSPACE/configure --enable-build-mode=${{ matrix.build_mode.autotools }} --enable-shared --enable-threadsafe --disable-hl --${{ matrix.parallel }}-parallel --${{ matrix.mirror_vfd }}-mirror-vfd --${{ matrix.direct_vfd }}-direct-vfd diff --git a/CTestConfig.cmake b/CTestConfig.cmake index b780b86..02b34dd 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -32,7 +32,7 @@ if (CTEST_DROP_LOCATION_INIT) set (CTEST_DROP_LOCATION "${CTEST_DROP_LOCATION_INIT}") else () if (CDASH_LOCAL) - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk") + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5114") else () set (CTEST_DROP_LOCATION "/submit.php?project=HDF5") endif () diff --git a/bin/h5vers b/bin/h5vers index a78c24d..6716794 100755 --- a/bin/h5vers +++ b/bin/h5vers @@ -376,7 +376,7 @@ if ($H5_JAVA) { my $version_string2 = sprintf("%d, %d, %d", @newver[0,1,2]); $data =~ s/\@version HDF5 .*
/\@version HDF5 $version_string1
/; - $data =~ s/ public final static int LIB_VERSION\[\] = \{ \d*, \d*, \d* \};/ public final static int LIB_VERSION[] = \{ $version_string2 \};/; + $data =~ s/ public final static int LIB_VERSION\[\] = \{\d*,.\d*,.\d*\};/ public final static int LIB_VERSION[] = \{$version_string2\};/; write_file($H5_JAVA, $data); } @@ -393,7 +393,7 @@ if ($TESTH5_JAVA) { my $version_string1 = sprintf("%d, %d, %d", @newver[0,1,2]); my $version_string2 = sprintf("int majnum = %d, minnum = %d, relnum = %d", @newver[0,1,2]); - $data =~ s/ int libversion\[\] = \{ .* \};/ int libversion\[\] = \{ $version_string1 \};/; + $data =~ s/ int libversion\[\] = \{.*\};/ int libversion\[\] = \{$version_string1\};/; $data =~ s/ int majnum = \d*, minnum = \d*, relnum = \d*;/ $version_string2;/; write_file($TESTH5_JAVA, $data); diff --git a/bin/release b/bin/release index 4c471b0..5bf002a 100755 --- a/bin/release +++ b/bin/release @@ -52,23 +52,23 @@ 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 md5 checksum is produced for each archive created and stored in the md5 file. +An sha256 checksum is produced for each archive created and stored in the sha256 file. Examples: $ bin/release -d /tmp /tmp/hdf5-1.8.13-RELEASE.txt - /tmp/hdf5-1.8.13.md5 + /tmp/hdf5-1.8.13.sha256 /tmp/hdf5-1.8.13.tar $ bin/release -d /tmp gzip /tmp/hdf5-1.8.13-RELEASE.txt - /tmp/hdf5-1.8.13.md5 + /tmp/hdf5-1.8.13.sha256 /tmp/hdf5-1.8.13.tar.gz $ bin/release -d /tmp tar gzip zip /tmp/hdf5-1.8.13-RELEASE.txt - /tmp/hdf5-1.8.13.md5 + /tmp/hdf5-1.8.13.sha256 /tmp/hdf5-1.8.13.tar /tmp/hdf5-1.8.13.tar.gz /tmp/hdf5-1.8.13.tar.zip @@ -205,8 +205,8 @@ tar2cmakezip() # 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/HDF5Examples-2.0.1-Source.zip $cmziptmpsubdir - cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.zip $cmziptmpsubdir + cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.2-Source.zip $cmziptmpsubdir + cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_0.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 @@ -297,8 +297,8 @@ tar2cmaketgz() # 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/HDF5Examples-2.0.1-Source.tar.gz $cmgztmpsubdir - cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir + cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.2-Source.tar.gz $cmgztmpsubdir + cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_0.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 @@ -376,8 +376,8 @@ tar2hpccmaketgz() # 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/HDF5Examples-2.0.1-Source.tar.gz $cmgztmpsubdir - cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-master.tar.gz $cmgztmpsubdir + cp /mnt/scr1/pre-release/hdf5/CMake/HDF5Examples-2.0.2-Source.tar.gz $cmgztmpsubdir + cp /mnt/scr1/pre-release/hdf5/CMake/hdf5_plugins-1_14_0.tar.gz $cmgztmpsubdir cp $cmgztmpsubdir/$version/config/cmake/scripts/CTestScript.cmake $cmgztmpsubdir cp $cmgztmpsubdir/$version/config/cmake/scripts/HDF5config.cmake $cmgztmpsubdir @@ -531,43 +531,43 @@ test "$verbose" && echo " Running tar..." 1>&2 (cd "$tmpdir" && exec tar -ch --exclude-vcs -f "$HDF5_VERS.tar" "./$HDF5_VERS" || exit 1 ) # Compress -MD5file=$HDF5_VERS.md5 -cp /dev/null $DEST/$MD5file +SHA256=$HDF5_VERS.sha256 +cp /dev/null $DEST/$SHA256 for comp in $methods; do case $comp in tar) cp -p $tmpdir/$HDF5_VERS.tar $DEST/$HDF5_VERS.tar - (cd $DEST; md5sum $HDF5_VERS.tar >> $MD5file) + (cd $DEST; sha256 $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; md5sum $HDF5_VERS.tar.gz >> $MD5file) + (cd $DEST; sha256 $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; md5sum CMake-$HDF5_VERS.tar.gz >> $MD5file) + (cd $DEST; sha256 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; md5sum HPC-CMake-$HDF5_VERS.tar.gz >> $MD5file) + (cd $DEST; sha256 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; md5sum $HDF5_VERS.tar.bz2 >> $MD5file) + (cd $DEST; sha256 $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; md5sum $HDF5_VERS.zip >> $MD5file) + (cd $DEST; sha256 $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; md5sum CMake-$HDF5_VERS.zip >> $MD5file) + (cd $DEST; sha256 CMake-$HDF5_VERS.zip >> $SHA256) ;; doc) if [ "${DOCVERSION}" = "" ]; then diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index a20547f..f685bfb 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -821,28 +821,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 714426a..18fe928 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -849,28 +849,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 AM_FCLIBS = $(LIBHDF5) diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index bcdc2fb..a0d98ae 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -811,28 +811,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 2a0a39e..ca775f4 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -839,28 +839,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 06d1c16..c68febb 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -810,28 +810,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index b67f5e5..332856b 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -270,7 +270,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, 13, 3}; + public final static int LIB_VERSION[] = {1, 14, 0}; /** * @ingroup JH5 diff --git a/java/src/jni/Makefile.in b/java/src/jni/Makefile.in index 44a879e..54eefb6 100644 --- a/java/src/jni/Makefile.in +++ b/java/src/jni/Makefile.in @@ -815,28 +815,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 diff --git a/java/test/TestH5.java b/java/test/TestH5.java index 8e3c18f..90ba1d5 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -313,7 +313,7 @@ public class TestH5 { @Test public void testH5get_libversion() { - int libversion[] = {1, 13, 3}; + int libversion[] = {1, 14, 0}; try { H5.H5get_libversion(libversion); diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index dc40314..90309fd 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -467,7 +467,10 @@ Platforms Tested Visual Studio 2017 w/ Intel C/C++/Fortran 19 (cmake) Visual Studio 2019 w/ clang 12.0.0 with MSVC-like command-line (C/C++ only - cmake) - Visual Studio 2019 w/ Intel C/C++/Fortran oneAPI 2021 (cmake) + Visual Studio 2019 w/ Intel C/C++/Fortran oneAPI 2022 (cmake) + Visual Studio 2022 w/ clang 15.0.1 + with MSVC-like command-line (C/C++ only - cmake) + Visual Studio 2022 w/ Intel C/C++/Fortran oneAPI 2022 (cmake) Visual Studio 2019 w/ MSMPI 10.1 (C only - cmake) diff --git a/src/Makefile.in b/src/Makefile.in index ea524bb..c57af2c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1040,28 +1040,28 @@ CHECK_CLEANFILES = *.chkexe *.chklog # 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_INTERFACE = 310 LT_VERS_AGE = 0 LT_VERS_REVISION = 0 -LT_CXX_VERS_INTERFACE = 1000 +LT_CXX_VERS_INTERFACE = 310 LT_CXX_VERS_REVISION = 0 LT_CXX_VERS_AGE = 0 -LT_F_VERS_INTERFACE = 1000 +LT_F_VERS_INTERFACE = 310 LT_F_VERS_REVISION = 0 LT_F_VERS_AGE = 0 -LT_HL_VERS_INTERFACE = 1000 +LT_HL_VERS_INTERFACE = 310 LT_HL_VERS_REVISION = 0 LT_HL_VERS_AGE = 0 -LT_HL_CXX_VERS_INTERFACE = 1000 +LT_HL_CXX_VERS_INTERFACE = 310 LT_HL_CXX_VERS_REVISION = 0 LT_HL_CXX_VERS_AGE = 0 -LT_HL_F_VERS_INTERFACE = 1000 +LT_HL_F_VERS_INTERFACE = 310 LT_HL_F_VERS_REVISION = 0 LT_HL_F_VERS_AGE = 0 -LT_JAVA_VERS_INTERFACE = 1000 +LT_JAVA_VERS_INTERFACE = 310 LT_JAVA_VERS_REVISION = 0 LT_JAVA_VERS_AGE = 0 -LT_TOOLS_VERS_INTERFACE = 1000 +LT_TOOLS_VERS_INTERFACE = 310 LT_TOOLS_VERS_REVISION = 0 LT_TOOLS_VERS_AGE = 0 -- cgit v0.12