summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/main.yml86
-rw-r--r--.github/workflows/pr-check.yml87
-rw-r--r--CTestConfig.cmake2
-rw-r--r--m4/ax_jni_include_dir.m418
-rw-r--r--release_docs/RELEASE.txt18
5 files changed, 190 insertions, 21 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c891bac..4d0d3bb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,14 +17,19 @@ jobs:
strategy:
# fail-fast: false
matrix:
- name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC"]
+ name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC", "Windows TS MSVC", "Ubuntu TS GCC", "TS Debug GCC", "macOS TS Clang", "TS Autotools GCC"]
include:
- name: "Windows Latest MSVC"
artifact: "Windows-MSVC.tar.xz"
os: windows-latest
build_type: "Release"
toolchain: ""
+ cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
+ parallel: OFF
generator: "-G \"Visual Studio 16 2019\" -A x64"
- name: "Ubuntu Latest GCC"
artifact: "Linux.tar.xz"
@@ -32,6 +37,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
@@ -41,6 +49,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/clang.cmake"
generator: "-G Ninja"
@@ -50,15 +61,82 @@ jobs:
build_type: "Debug"
cpp: ON
fortran: OFF
+ java: OFF
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
- name: "Ubuntu Autotools GCC"
- artifact: "Linux.tar.xz"
+ artifact: "LinuxA.tar.xz"
os: ubuntu-latest
build_type: "Release"
cpp: enable
fortran: enable
+ java: enable
+ ts: disable
+ hl: enable
+ parallel: disable
+ toolchain: ""
+ generator: "autogen"
+# Threadsafe runs
+ - name: "Windows TS MSVC"
+ artifact: "Windows-MSVCTS.tar.xz"
+ os: windows-latest
+ build_type: "Release"
+ toolchain: ""
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ generator: "-G \"Visual Studio 16 2019\" -A x64"
+ - name: "Ubuntu TS GCC"
+ artifact: "LinuxTS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "macOS TS Clang"
+ artifact: "macOSTS.tar.xz"
+ os: macos-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/clang.cmake"
+ generator: "-G Ninja"
+ - name: "TS Debug GCC"
+ artifact: "LinuxTSDBG.tar.xz"
+ os: ubuntu-latest
+ build_type: "Debug"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "TS Autotools GCC"
+ artifact: "LinuxATS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: disable
+ fortran: disable
+ java: disable
+ ts: enable
+ hl: disable
parallel: disable
toolchain: ""
generator: "autogen"
@@ -109,7 +187,7 @@ jobs:
sh ./bin/chkmanifest
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
+ $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.ts }}-threadsafe --${{ matrix.hl }}-hl --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java
shell: bash
- name: Configure
@@ -117,7 +195,7 @@ jobs:
run: |
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
+ cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} -DHDF5_BUILD_HL_LIB:BOOL=${{ matrix.hl }} -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} $GITHUB_WORKSPACE
shell: bash
- name: Autotools Build
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index 47feb7a..8c3bb2c 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -12,14 +12,19 @@ jobs:
strategy:
# fail-fast: false
matrix:
- name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC"]
+ name: ["Windows Latest MSVC", "Ubuntu Latest GCC", "Ubuntu Debug GCC", "macOS Latest Clang", "Ubuntu Autotools GCC", "Windows TS MSVC", "Ubuntu TS GCC", "TS Debug GCC", "macOS TS Clang", "TS Autotools GCC"]
include:
- name: "Windows Latest MSVC"
artifact: "Windows-MSVC.tar.xz"
os: windows-latest
build_type: "Release"
toolchain: ""
+ cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
+ parallel: OFF
generator: "-G \"Visual Studio 16 2019\" -A x64"
- name: "Ubuntu Latest GCC"
artifact: "Linux.tar.xz"
@@ -27,6 +32,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
@@ -36,6 +44,9 @@ jobs:
build_type: "Release"
cpp: ON
fortran: OFF
+ java: ON
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/clang.cmake"
generator: "-G Ninja"
@@ -45,15 +56,82 @@ jobs:
build_type: "Debug"
cpp: ON
fortran: OFF
+ java: OFF
+ ts: OFF
+ hl: ON
parallel: OFF
toolchain: "config/toolchain/GCC.cmake"
generator: "-G Ninja"
- name: "Ubuntu Autotools GCC"
- artifact: "Linux.tar.xz"
+ artifact: "LinuxA.tar.xz"
os: ubuntu-latest
build_type: "Release"
cpp: enable
fortran: enable
+ java: enable
+ ts: disable
+ hl: enable
+ parallel: disable
+ toolchain: ""
+ generator: "autogen"
+# Threadsafe runs
+ - name: "Windows TS MSVC"
+ artifact: "Windows-MSVCTS.tar.xz"
+ os: windows-latest
+ build_type: "Release"
+ toolchain: ""
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ generator: "-G \"Visual Studio 16 2019\" -A x64"
+ - name: "Ubuntu TS GCC"
+ artifact: "LinuxTS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "macOS TS Clang"
+ artifact: "macOSTS.tar.xz"
+ os: macos-latest
+ build_type: "Release"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/clang.cmake"
+ generator: "-G Ninja"
+ - name: "TS Debug GCC"
+ artifact: "LinuxTSDBG.tar.xz"
+ os: ubuntu-latest
+ build_type: "Debug"
+ cpp: OFF
+ fortran: OFF
+ java: OFF
+ ts: ON
+ hl: OFF
+ parallel: OFF
+ toolchain: "config/toolchain/GCC.cmake"
+ generator: "-G Ninja"
+ - name: "TS Autotools GCC"
+ artifact: "LinuxATS.tar.xz"
+ os: ubuntu-latest
+ build_type: "Release"
+ cpp: disable
+ fortran: disable
+ java: disable
+ ts: enable
+ hl: disable
parallel: disable
toolchain: ""
generator: "autogen"
@@ -70,6 +148,7 @@ jobs:
name: ${{ matrix.name }}
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
+ if: "!contains(github.event.head_commit.message, 'skip-ci')"
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
@@ -103,7 +182,7 @@ jobs:
sh ./bin/chkmanifest
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --enable-java
+ $GITHUB_WORKSPACE/configure --enable-shared --${{ matrix.ts }}-threadsafe --${{ matrix.hl }}-hl --${{ matrix.parallel }}-parallel --${{ matrix.cpp }}-cxx --${{ matrix.fortran }}-fortran --${{ matrix.java }}-java
shell: bash
- name: Configure
@@ -111,7 +190,7 @@ jobs:
run: |
mkdir "${{ runner.workspace }}/build"
cd "${{ runner.workspace }}/build"
- cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=ON $GITHUB_WORKSPACE
+ cmake ${{ matrix.generator }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DBUILD_SHARED_LIBS=ON -DHDF5_ENABLE_ALL_WARNINGS=ON -DHDF5_ENABLE_THREADSAFE:BOOL=${{ matrix.ts }} -DHDF5_BUILD_HL_LIB:BOOL=${{ matrix.hl }} -DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} -DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} -DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} -DHDF5_BUILD_JAVA=${{ matrix.java }} $GITHUB_WORKSPACE
shell: bash
- name: Autotools Build
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 5498b06..b178d55 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -18,7 +18,7 @@
set (CTEST_PROJECT_NAME "HDF5")
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
-set (CTEST_DROP_METHOD "http")
+set (CTEST_DROP_METHOD "https")
if (CTEST_DROP_SITE_INIT)
set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}")
else ()
diff --git a/m4/ax_jni_include_dir.m4 b/m4/ax_jni_include_dir.m4
index ae7a5f0..cd72098 100644
--- a/m4/ax_jni_include_dir.m4
+++ b/m4/ax_jni_include_dir.m4
@@ -73,13 +73,19 @@ fi
case "$host_os" in
darwin*) # Apple Java headers are inside the Xcode bundle.
- macos_version=$(sw_vers -productVersion | sed -n -e 's/^@<:@0-9@:>@*.\(@<:@0-9@:>@*\).@<:@0-9@:>@*/\1/p')
- if @<:@ "$macos_version" -gt "7" @:>@; then
- _JTOPDIR="$(xcrun --show-sdk-path)/System/Library/Frameworks/JavaVM.framework"
- _JINC="$_JTOPDIR/Headers"
+ major_macos_version=$(sw_vers -productVersion | sed -n -e 's/^\(@<:@0-9@:>@*\).@<:@0-9@:>@*.@<:@0-9@:>@*/\1/p')
+ if @<:@ "$major_macos_version" -gt "10" @:>@; then
+ _JTOPDIR="$(/usr/libexec/java_home)"
+ _JINC="$_JTOPDIR/include"
else
- _JTOPDIR="/System/Library/Frameworks/JavaVM.framework"
- _JINC="$_JTOPDIR/Headers"
+ macos_version=$(sw_vers -productVersion | sed -n -e 's/^@<:@0-9@:>@*.\(@<:@0-9@:>@*\).@<:@0-9@:>@*/\1/p')
+ if @<:@ "$macos_version" -gt "7" @:>@; then
+ _JTOPDIR="$(xcrun --show-sdk-path)/System/Library/Frameworks/JavaVM.framework"
+ _JINC="$_JTOPDIR/Headers"
+ else
+ _JTOPDIR="/System/Library/Frameworks/JavaVM.framework"
+ _JINC="$_JTOPDIR/Headers"
+ fi
fi
;;
*) _JINC="$_JTOPDIR/include";;
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index fe9d1f8..0caf204 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -563,17 +563,23 @@ The following platforms are not supported but have been tested for this release.
MPICH 3.3
OpenMPI 2.1.5, 3.1.3, 4.0.0
- Fedora32 5.8.18-200.fc32.x86_64
- #1 SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6)
- GNU Fortran (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6)
- clang version 10.0.1 (Fedora 10.0.1-3.fc32)
+ Fedora33 5.10.10-200.fc33.x86_64
+ #1 SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.1 20201125 (Red Hat 10.2.1-9)
+ GNU Fortran (GCC) 10.2.1 20201125 (Red Hat 10.2.1-9)
+ clang version 11.0.0 (Fedora 11.0.0-2.fc33)
(cmake and autotools)
- Ubuntu20.10 -5.8.0-29-generic-x86_64
- #31-Ubuntu SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.0-13ubuntu1
+ Ubuntu20.10 5.8.0-41-generic-x86_64
+ #46-Ubuntu SMP x86_64 GNU/Linux GNU gcc (GCC) 10.2.0-13ubuntu1
GNU Fortran (GCC) 10.2.0-13ubuntu1
(cmake and autotools)
+ SUSE15sp2 5.3.18-22-default
+ #1 SMP x86_64 GNU/Linux GNU gcc (SUSE Linux) 7.5.0
+ GNU Fortran (SUSE Linux) 7.5.0
+ clang version 7.0.1 (tags/RELEASE_701/final 349238)
+ (cmake and autotools)
+
Known Problems
==============
generated by cgit v0.12 at 2024-09-02 00:16:53 (GMT)