Skip to content

Commit a34abc0

Browse files
philippeVerneyphilippeVerney
authored
v2.13.0.0
2 parents 10514af + ea8a1f5 commit a34abc0

40 files changed

Lines changed: 651 additions & 525 deletions

‎.github/workflows/github-actions.yml‎

Lines changed: 19 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,8 @@
11
name: github-actions
22
on: [push, pull_request]
33
jobs:
4-
windows-2019-dynamicLink:
5-
runs-on: windows-2019
6-
steps:
7-
- uses: actions/checkout@v4
8-
- name: HDF5 install
9-
run: |
10-
Invoke-WebRequest https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.0/bin/hdf5-1.12.0-Std-win10_64-vs16.zip -OutFile ${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16.zip
11-
Expand-Archive ${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16.zip -DestinationPath ${{ runner.temp }}
12-
msiexec.exe /i "${{ runner.temp }}\hdf\HDF5-1.12.0-win64.msi" /qn INSTALL_ROOT=${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16
13-
- name: Minizip DLL install
14-
run: |
15-
git clone https://github.com/F2I-Consulting/Minizip.git ${{ runner.temp }}/Minizip
16-
cd ${{ runner.temp }}
17-
mkdir minizip-build
18-
cd minizip-build
19-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DZLIB_ROOT=${{ runner.temp }}/hdf5-1.12.0-Std-win10_64-vs16 -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/minizip-install ${{ runner.temp }}/Minizip
20-
cmake --build . --config Release -j2
21-
cmake --build . --config Release --target INSTALL
22-
- name: Boost install
23-
run: |
24-
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.87.0/binaries/boost_1_87_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
25-
Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
26-
- name: CMake build and install
27-
run: |
28-
cd ${{ github.workspace }}/..
29-
mkdir build
30-
cd build
31-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ROOT=${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16 -DMINIZIP_ROOT=${{ runner.temp }}/minizip-install -DZLIB_ROOT=${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16 -DSZIP_LIBRARY_RELEASE=${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16/lib/szip.lib -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DWITH_EXAMPLE=TRUE -DWITH_RESQML2_2=TRUE -DWITH_TEST=TRUE -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ github.workspace }}
32-
cmake --build . --config Release -j2
33-
cmake --build . --config Release --target INSTALL
34-
- name: Copy hdf5 dll
35-
run: |
36-
Copy-Item ${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16\bin\hdf5.dll -Destination ${{ github.workspace }}\..\build\Release
37-
Copy-Item ${{ runner.temp }}\hdf5-1.12.0-Std-win10_64-vs16\bin\zlib.dll -Destination ${{ github.workspace }}\..\build\Release
38-
- name: Run Unit tests
39-
run: |
40-
${{ github.workspace }}\..\build\Release\unitTest
41-
- name: Run Cpp example
42-
run: |
43-
${{ github.workspace }}\..\build\Release\example.exe
44-
- uses: actions/upload-artifact@v4
45-
with:
46-
name: windows-2019
47-
path: ${{ runner.temp }}/fesapi-install
48-
windows-2019-staticLink-cs:
49-
runs-on: windows-2019
4+
windows-2022-staticLink-cs:
5+
runs-on: windows-2022
506
steps:
517
- uses: actions/checkout@v4
528
- name: zlib install
@@ -56,7 +12,7 @@ jobs:
5612
tar -xzf ${{ runner.temp }}\zlib.tar.gz
5713
mkdir zlib-build
5814
cd zlib-build
59-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install ${{ runner.temp }}/zlib-1.3.1
15+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/zlib-install ${{ runner.temp }}/zlib-1.3.1
6016
cmake --build . --config Release -j2
6117
cmake --build . --config Release --target INSTALL
6218
- name: Minizip static lib install
@@ -65,33 +21,33 @@ jobs:
6521
cd ${{ runner.temp }}
6622
mkdir minizip-build
6723
cd minizip-build
68-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBUILD_SHARED_LIBS=FALSE -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/minizip-install ${{ runner.temp }}/Minizip
24+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBUILD_SHARED_LIBS=FALSE -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/minizip-install ${{ runner.temp }}/Minizip
6925
cmake --build . --config Release -j2
7026
cmake --build . --config Release --target INSTALL
7127
- name: HDF5 install
7228
run: |
73-
Invoke-WebRequest https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_5/downloads/hdf5-1.14.5.zip -OutFile ${{ runner.temp }}\hdf5-1.14.5.zip
29+
Invoke-WebRequest https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_6/downloads/hdf5-1.14.6.zip -OutFile ${{ runner.temp }}\hdf5-1.14.6.zip
7430
cd ${{ runner.temp }}
75-
Expand-Archive ${{ runner.temp }}\hdf5-1.14.5.zip -DestinationPath ${{ runner.temp }}
31+
Expand-Archive ${{ runner.temp }}\hdf5-1.14.6.zip -DestinationPath ${{ runner.temp }}
7632
mkdir hdf5-build
7733
cd hdf5-build
78-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON -DZLIB_INCLUDE_DIR:PATH=${{ runner.temp }}/zlib-install/include -DZLIB_LIBRARY:PATH=${{ runner.temp }}/zlib-install/lib/zlibstatic.lib -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=OFF -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_EXAMPLES:BOOL=OFF -DHDF5_BUILD_GENERATORS:BOOL=OFF -DHDF5_BUILD_TOOLS:BOOL=OFF -DHDF5_BUILD_UTILS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/hdf5-install ${{ runner.temp }}/hdf5-1.14.5
34+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON -DZLIB_INCLUDE_DIR:PATH=${{ runner.temp }}/zlib-install/include -DZLIB_LIBRARY:PATH=${{ runner.temp }}/zlib-install/lib/zlibstatic.lib -DHDF5_BUILD_FORTRAN:BOOL=OFF -DHDF5_BUILD_JAVA:BOOL=OFF -DHDF5_ENABLE_PARALLEL:BOOL=OFF -DHDF5_BUILD_CPP_LIB:BOOL=OFF -DHDF5_BUILD_HL_LIB:BOOL=OFF -DHDF5_BUILD_EXAMPLES:BOOL=OFF -DHDF5_BUILD_GENERATORS:BOOL=OFF -DHDF5_BUILD_TOOLS:BOOL=OFF -DHDF5_BUILD_UTILS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/hdf5-install ${{ runner.temp }}/hdf5-1.14.6
7935
cmake --build . --config Release -j2
8036
cmake --build . --config Release --target INSTALL
8137
- name: Boost install
8238
run: |
83-
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.87.0/binaries/boost_1_87_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
39+
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.88.0/binaries/boost_1_88_0-msvc-14.3-64.exe", "${{ runner.temp }}\boost.exe")
8440
Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
8541
- name: Swig install
8642
run: |
87-
(New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.3.0.zip", "${{ runner.temp }}\swigwin-4.3.0.zip")
88-
7z x ${{ runner.temp }}\swigwin-4.3.0.zip -o${{ runner.temp }}
43+
(New-Object System.Net.WebClient).DownloadFile("http://prdownloads.sourceforge.net/swig/swigwin-4.3.1.zip", "${{ runner.temp }}\swigwin-4.3.1.zip")
44+
7z x ${{ runner.temp }}\swigwin-4.3.1.zip -o${{ runner.temp }}
8945
- name: CMake build and install
9046
run: |
9147
cd ${{ github.workspace }}/..
9248
mkdir build
9349
cd build
94-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ROOT=${{ runner.temp }}/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DMINIZIP_ROOT=${{ runner.temp }}/minizip-install -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DBoost_INCLUDE_DIR=${{ runner.temp }}/boost-install -DWITH_EXAMPLE=TRUE -DWITH_RESQML2_2=TRUE -DWITH_DOTNET_WRAPPING=TRUE -DSWIG_EXECUTABLE=${{ runner.temp }}/swigwin-4.3.0/swig.exe -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ github.workspace }}
50+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DHDF5_ROOT=${{ runner.temp }}/hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DMINIZIP_ROOT=${{ runner.temp }}/minizip-install -DZLIB_ROOT=${{ runner.temp }}/zlib-install -DZLIB_USE_STATIC_LIBS=TRUE -DBoost_INCLUDE_DIR=${{ runner.temp }}/boost-install -DWITH_EXAMPLE=TRUE -DWITH_RESQML2_2=TRUE -DWITH_DOTNET_WRAPPING=TRUE -DSWIG_EXECUTABLE=${{ runner.temp }}/swigwin-4.3.1/swig.exe -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ github.workspace }}
9551
cmake --build . --config Release -j2
9652
cmake --build . --config Release --target INSTALL
9753
- name: Add msbuild to PATH
@@ -109,21 +65,20 @@ jobs:
10965
- name: Run C# example
11066
run: |
11167
${{ github.workspace }}\cs\example\bin\x64\Release\example.exe
112-
ubuntu-20-java11:
113-
runs-on: ubuntu-20.04
68+
ubuntu-22-java11:
69+
runs-on: ubuntu-22.04
11470
strategy:
11571
fail-fast: false # 'false' means Don't stop matrix workflows even if some matrix failed.
11672
matrix:
11773
include: [
11874
{ xcc_name: 'gcc 9', xcc_pkg: gcc-9, cc: gcc-9, cxx: g++-9 },
11975
{ xcc_name: 'gcc 10', xcc_pkg: gcc-10, cc: gcc-10, cxx: g++-10 },
120-
{ xcc_name: 'clang 9', xcc_pkg: clang-9, cc: clang-9, cxx: clang++-9 },
121-
{ xcc_name: 'clang 10', xcc_pkg: clang-10, cc: clang-10, cxx: clang++-10 },
12276
{ xcc_name: 'clang 11', xcc_pkg: clang-11, cc: clang-11, cxx: clang++-11 },
123-
# { xcc_name: 'clang 12', xcc_pkg: clang-12, cc: clang, cxx: clang++ },
77+
{ xcc_name: 'clang 12', xcc_pkg: clang-12, cc: clang-12, cxx: clang++-12 },
78+
{ xcc_name: 'clang 13', xcc_pkg: clang-13, cc: clang-13, cxx: clang++-13 },
12479
]
12580
env:
126-
XCC: $${{ matrix.xcc_name }}
81+
XCC: ${{ matrix.xcc_name }}
12782
CC: ${{ matrix.cc }}
12883
CXX: ${{ matrix.cxx }}
12984
steps:
@@ -164,7 +119,7 @@ jobs:
164119
java -Djava.library.path=${{ runner.temp }}/fesapi-install/lib -cp `find ${{ runner.temp }}/fesapi-install -name fesapiJava*.jar`:. com.f2i_consulting.example.FesapiJavaExample
165120
- uses: actions/upload-artifact@v4
166121
with:
167-
name: ubuntu-20.04-${{ matrix.cxx }}
122+
name: ubuntu-22.04-${{ matrix.cxx }}
168123
path: ${{ runner.temp }}/fesapi-install
169124
build_wheels_windows:
170125
name: Build wheels on windows-latest
@@ -289,7 +244,7 @@ jobs:
289244
name: cibw-wheels-macosx_arm64
290245
path: ./wheelhouse/*.whl
291246
ubuntu-20-mpi:
292-
runs-on: ubuntu-20.04
247+
runs-on: ubuntu-22.04
293248
steps:
294249
- name: Checkout
295250
uses: actions/checkout@v4
@@ -333,7 +288,7 @@ jobs:
333288
${{ github.workspace }}/../build/test/unitTest
334289
webassembly:
335290
if: false
336-
runs-on: ubuntu-20.04
291+
runs-on: ubuntu-22.04
337292
steps:
338293
- uses: mymindstorm/setup-emsdk@v11
339294
- uses: actions/checkout@v4

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ set (FESAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
1212

1313
# version mechanism
1414
set (Fesapi_VERSION_MAJOR 2)
15-
set (Fesapi_VERSION_MINOR 12)
16-
set (Fesapi_VERSION_PATCH 2)
17-
set (Fesapi_VERSION_TWEAK 1)
15+
set (Fesapi_VERSION_MINOR 13)
16+
set (Fesapi_VERSION_PATCH 0)
17+
set (Fesapi_VERSION_TWEAK 0)
1818

1919
set (Fesapi_VERSION ${Fesapi_VERSION_MAJOR}.${Fesapi_VERSION_MINOR}.${Fesapi_VERSION_PATCH}.${Fesapi_VERSION_TWEAK})
2020

‎cmake/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("F2I-CONSULTING")]
1212
[assembly: AssemblyProduct("FesapiCs")]
13-
[assembly: AssemblyCopyright("Copyright © 2020")]
13+
[assembly: AssemblyCopyright("Copyright © 2025")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

0 commit comments

Comments
 (0)