Skip to content

Commit c0d2844

Browse files
philippeVerneyphilippeVerney
authored
v0.4.0.0
2 parents 0317ffb + a601e9e commit c0d2844

41 files changed

Lines changed: 1074 additions & 9363 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: github-actions
22
on: [push, pull_request]
33
jobs:
4-
windows-2019:
5-
runs-on: windows-2019
4+
windows-2022:
5+
runs-on: windows-2022
66
steps:
7-
- uses: actions/checkout@v4
7+
- uses: actions/checkout@v5
88
- name: Boost install
99
run: |
10-
(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")
10+
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.88.0/binaries/boost_1_88_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
1111
Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
1212
- name: AVRO install
1313
run: |
@@ -19,23 +19,23 @@ jobs:
1919
cd ${{ runner.temp }}
2020
mkdir avro-cpp-build
2121
cd avro-cpp-build
22-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
22+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
2323
cmake --build . --config Release --target avrocpp_s -j2
2424
cmake --install .
2525
- name: CMake build and install
2626
run: |
2727
cd ${{ github.workspace }}/..
2828
mkdir build
2929
cd build
30-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
30+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
3131
cmake --build . --config Release -j2
32-
windows-2019-with-fesapi:
33-
runs-on: windows-2019
32+
windows-2022-with-fesapi:
33+
runs-on: windows-2022
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- name: Boost install
3737
run: |
38-
(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")
38+
(New-Object System.Net.WebClient).DownloadFile("https://archives.boost.io/release/1.88.0/binaries/boost_1_88_0-msvc-14.2-64.exe", "${{ runner.temp }}\boost.exe")
3939
Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
4040
- name: AVRO install
4141
run: |
@@ -47,24 +47,24 @@ jobs:
4747
cd ${{ runner.temp }}
4848
mkdir avro-cpp-build
4949
cd avro-cpp-build
50-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
50+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/avro-cpp-install ${{ runner.temp }}/avro-cpp-1.11.3
5151
cmake --build . --config Release --target avrocpp_s -j2
5252
cmake --install .
5353
- name: FESAPI install
5454
run: |
55-
(New-Object System.Net.WebClient).DownloadFile("https://github.com/F2I-Consulting/fesapi/releases/download/v2.12.1.0/fesapi2_12_1_0-cpp-vs2019-x64.zip", "${{ runner.temp }}\fesapi.zip")
55+
(New-Object System.Net.WebClient).DownloadFile("https://github.com/F2I-Consulting/fesapi/releases/download/v2.14.0.0/fesapi2_14_0_0-cpp-vs2019-x64.zip", "${{ runner.temp }}\fesapi.zip")
5656
7z x ${{ runner.temp }}\fesapi.zip -o${{ runner.temp }}
5757
- name: CMake build and install
5858
run: |
5959
cd ${{ github.workspace }}/..
6060
mkdir build
6161
cd build
62-
cmake -G"Visual Studio 16 2019" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_12_1_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
62+
cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_14_0_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
6363
cmake --build . --config Release -j2
6464
ubuntu-22:
6565
runs-on: ubuntu-22.04
6666
steps:
67-
- uses: actions/checkout@v4
67+
- uses: actions/checkout@v5
6868
- name: APT install
6969
run: |
7070
sudo apt update
@@ -91,8 +91,8 @@ jobs:
9191
ubuntu-22-java11:
9292
runs-on: ubuntu-22.04
9393
steps:
94-
- uses: actions/checkout@v4
95-
- uses: actions/setup-java@v4
94+
- uses: actions/checkout@v5
95+
- uses: actions/setup-java@v5
9696
with:
9797
distribution: 'temurin' # See 'Supported distributions' for available options
9898
java-version: '11'
@@ -137,8 +137,8 @@ jobs:
137137
CC: ${{ matrix.cc }}
138138
CXX: ${{ matrix.cxx }}
139139
steps:
140-
- uses: actions/checkout@v4
141-
- uses: actions/setup-java@v4
140+
- uses: actions/checkout@v5
141+
- uses: actions/setup-java@v5
142142
with:
143143
distribution: 'temurin' # See 'Supported distributions' for available options
144144
java-version: '11'
@@ -148,13 +148,16 @@ jobs:
148148
sudo apt install -y ${{ matrix.xcc_pkg }} libhdf5-dev libminizip-dev libboost-all-dev
149149
- name: FESAPI install
150150
run: |
151-
git clone --branch v2.12.1.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
151+
git clone --branch v2.14.0.0 --single-branch https://github.com/F2I-Consulting/fesapi.git ${{ runner.temp }}/fesapi-src
152152
cd ${{ runner.temp }}
153153
mkdir fesapi-build
154154
cd fesapi-build
155155
cmake -DMINIZIP_INCLUDE_DIR=/usr/include/minizip -DMINIZIP_LIBRARY_RELEASE=/usr/lib/x86_64-linux-gnu/libminizip.so.1.0.0 -DCMAKE_BUILD_TYPE=Release -DWITH_JAVA_WRAPPING=TRUE -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} ${{ runner.temp }}/fesapi-src
156156
cmake --build . -j2
157157
cmake --install .
158+
mkdir -p ${{ runner.temp }}/fesapi-install/include/fesapi
159+
cd ${{ runner.temp }}/fesapi-src/src
160+
find . -name "*.h" -exec cp --parents \{\} ${{ runner.temp }}/fesapi-install/include/fesapi/ \;
158161
- name: AVRO INSTALL
159162
run: |
160163
curl https://archive.apache.org/dist/avro/avro-1.11.3/cpp/avro-cpp-1.11.3.tar.gz -o ${{ runner.temp }}/avro-cpp-1.11.3.tar.gz
@@ -172,31 +175,31 @@ jobs:
172175
cd ${{ github.workspace }}/..
173176
mkdir build
174177
cd build
175-
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.12.1.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
178+
cmake -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi-install -DFESAPI_JAR=${{ runner.temp }}/fesapi-install/lib/fesapiJava-2.14.0.0.jar -DWITH_JAVA_WRAPPING=TRUE ${{ github.workspace }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
176179
cmake --build . --config Release -j2
177180
build_wheels_windows:
178181
name: Build wheels on windows-latest
179182
runs-on: windows-latest
180183
steps:
181-
- uses: actions/checkout@v4
184+
- uses: actions/checkout@v5
182185
- name: Stub `setup.py` check
183186
# It will be generated during CMake run
184187
# https://github.com/pypa/cibuildwheel/issues/1139
185188
run: touch python/setup.py
186189
- name: Build wheels
187-
uses: pypa/cibuildwheel@v2.21.3
190+
uses: pypa/cibuildwheel@v3.2.1
188191
env:
189192
CIBW_BUILD: cp38-win_amd64 cp39-win_amd64 cp310-win_amd64 cp311-win_amd64 cp312-win_amd64 cp313-win_amd64
190193
CIBW_ARCHS: auto64
191194
CIBW_BEFORE_ALL: >
192195
%VCPKG_INSTALLATION_ROOT%\vcpkg install boost-uuid minizip hdf5[zlib] &&
193196
cd ${{ runner.temp }} &&
194-
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.12.1.0.tar.gz', '${{ runner.temp }}\fesapi-2.12.1.0.tar.gz')" &&
195-
7z x ${{ runner.temp }}\fesapi-2.12.1.0.tar.gz -o${{ runner.temp }} &&
196-
7z x ${{ runner.temp }}\fesapi-2.12.1.0.tar -o${{ runner.temp }} &&
197+
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.tar.gz', '${{ runner.temp }}\fesapi-2.14.0.0.tar.gz')" &&
198+
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar.gz -o${{ runner.temp }} &&
199+
7z x ${{ runner.temp }}\fesapi-2.14.0.0.tar -o${{ runner.temp }} &&
197200
mkdir fesapi-build &&
198201
cd fesapi-build &&
199-
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.12.1.0 &&
202+
cmake -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DCMAKE_INSTALL_PREFIX=${{ runner.temp }}/fesapi-install ${{ runner.temp }}\fesapi-2.14.0.0 &&
200203
cmake --build . --config Release -j2 &&
201204
cmake --build . --config Release --target INSTALL &&
202205
%VCPKG_INSTALLATION_ROOT%\vcpkg install openssl boost-beast avro-cpp &&
@@ -221,13 +224,14 @@ jobs:
221224
name: Build wheels on ubuntu-latest
222225
runs-on: ubuntu-latest
223226
steps:
224-
- uses: actions/checkout@v4
227+
- uses: actions/checkout@v5
225228
- name: Stub `setup.py` check
226229
# It will be generated during CMake run
227230
# https://github.com/pypa/cibuildwheel/issues/1139
228231
run: touch python/setup.py
229232
- name: Build wheels
230-
uses: pypa/cibuildwheel@v2.21.3
233+
# Above cibuildwheel@v2.22.0, GNU 14 is most likely used instead of GNU 12 or 13 which makes AVRO 1.11.3 not compiling
234+
uses: pypa/cibuildwheel@v2.22.0
231235
env:
232236
CIBW_BUILD: cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*
233237
CIBW_ARCHS: auto64
@@ -239,11 +243,11 @@ jobs:
239243
yum install -y epel-release &&
240244
yum --enablerepo=epel install -y minizip1.2-devel hdf5-devel cmake3 &&
241245
cd / &&
242-
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.12.1.0.zip &&
243-
unzip v2.12.1.0.zip &&
246+
wget https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
247+
unzip v2.14.0.0.zip &&
244248
mkdir fesapi-build &&
245249
cd fesapi-build &&
246-
cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.12.1.0 &&
250+
cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:STRING=/fesapi-install /fesapi-2.14.0.0 &&
247251
cmake3 --build . -j2 --config Release &&
248252
cmake3 --install . &&
249253
cd / &&
@@ -277,13 +281,13 @@ jobs:
277281
name: Build wheels on macos-14
278282
runs-on: macos-14
279283
steps:
280-
- uses: actions/checkout@v4
284+
- uses: actions/checkout@v5
281285
- name: Stub `setup.py` check
282286
# It will be generated during CMake run
283287
# https://github.com/pypa/cibuildwheel/issues/1139
284288
run: touch python/setup.py
285289
- name: Build wheels
286-
uses: pypa/cibuildwheel@v2.21.3
290+
uses: pypa/cibuildwheel@v3.2.1
287291
env:
288292
CIBW_BUILD: cp38-macosx_* cp39-macosx_* cp310-macosx_* cp311-macosx_* cp312-macosx_* cp313-macosx_*
289293
CIBW_ARCHS: auto64
@@ -312,11 +316,11 @@ jobs:
312316
cmake --build . -j2 --config Release &&
313317
cmake --install . &&
314318
cd ${{ github.workspace }}/.. &&
315-
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.12.1.0.zip &&
316-
unzip v2.12.1.0.zip &&
319+
wget --no-verbose https://github.com/F2I-Consulting/fesapi/archive/refs/tags/v2.14.0.0.zip &&
320+
unzip v2.14.0.0.zip &&
317321
mkdir fesapi-build &&
318322
cd fesapi-build &&
319-
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.12.1.0 &&
323+
cmake -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=${{ github.workspace }}/../boost-install -DMINIZIP_ROOT=${{ github.workspace }}/../minizip-install -DHDF5_ROOT=${{ github.workspace }}/../hdf5-install -DHDF5_USE_STATIC_LIBRARIES=TRUE -DCMAKE_INSTALL_PREFIX:STRING=${{ github.workspace }}/../fesapi-install ${{ github.workspace }}/../fesapi-2.14.0.0 &&
320324
cmake --build . -j2 --config Release &&
321325
cmake --install . &&
322326
cd ${{ github.workspace }}/.. &&
@@ -329,6 +333,8 @@ jobs:
329333
cd ${{ github.workspace }}/.. &&
330334
wget --no-verbose https://archive.apache.org/dist/avro/avro-1.11.3/cpp/avro-cpp-1.11.3.tar.gz &&
331335
tar xf avro-cpp-1.11.3.tar.gz &&
336+
sed -i '' 's/cmake_minimum_required (VERSION 3.1)/cmake_minimum_required (VERSION 3.5)/' avro-cpp-1.11.3/CMakeLists.txt &&
337+
sed -i '' 's/if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)/if (APPLE)/' avro-cpp-1.11.3/CMakeLists.txt &&
332338
sed -i '' 's/install (TARGETS avrocpp avrocpp_s/install (TARGETS avrocpp_s/' avro-cpp-1.11.3/CMakeLists.txt &&
333339
sed -i '' 's/install (TARGETS avrogencpp RUNTIME DESTINATION bin)//' avro-cpp-1.11.3/CMakeLists.txt &&
334340
mkdir avro-build &&

‎CMakeLists.txt‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ set (FETPAPI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
1515

1616
# version mechanism
1717
set (Fetpapi_VERSION_MAJOR 0)
18-
set (Fetpapi_VERSION_MINOR 3)
19-
set (Fetpapi_VERSION_PATCH 1)
18+
set (Fetpapi_VERSION_MINOR 4)
19+
set (Fetpapi_VERSION_PATCH 0)
2020
set (Fetpapi_VERSION_TWEAK 0)
2121

2222
set (Fetpapi_VERSION ${Fetpapi_VERSION_MAJOR}.${Fetpapi_VERSION_MINOR}.${Fetpapi_VERSION_PATCH}.${Fetpapi_VERSION_TWEAK})
@@ -200,7 +200,6 @@ set (ALL_SOURCES_AND_HEADERS
200200
${FETPAPI_HEADERS}
201201
${FETPAPI_PROTOCOL_SOURCES}
202202
${FETPAPI_PROTOCOL_HEADERS}
203-
${FETPAPI_TOOLS_HEADERS}
204203
${FETPAPI_FESAPI_SOURCES}
205204
${FETPAPI_FESAPI_HEADERS}
206205
${FETPAPI_SSL_SOURCES}
@@ -224,8 +223,6 @@ target_include_directories(${PROJECT_NAME} INTERFACE
224223

225224
# organizing sources and headers in the Visual Studio Project
226225
if (WIN32)
227-
source_group ("tools" FILES ${FETPAPI_TOOLS_HEADERS})
228-
229226
set (ETP_PREFIX "etp")
230227
source_group ("${ETP_PREFIX}" FILES ${FETPAPI_SOURCES} ${FETPAPI_HEADERS})
231228
source_group ("${ETP_PREFIX}\\ProtocolHandlers" FILES ${FETPAPI_PROTOCOL_SOURCES} ${FETPAPI_PROTOCOL_HEADERS})
@@ -307,12 +304,6 @@ INSTALL (
307304
COMPONENT fetpapi_headers
308305
)
309306

310-
INSTALL (
311-
FILES ${FETPAPI_TOOLS_HEADERS}
312-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fetpapi/tools
313-
COMPONENT fetpapi_headers
314-
)
315-
316307
if (WITH_ETP_SSL)
317308
INSTALL (
318309
FILES ${FETPAPI_SSL_HEADERS}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Download (build and install if necessary) third party libraries:
1313
- BOOST : All versions from version 1.66 should be ok but you may experience some [min/max build issues](https://github.com/boostorg/beast/issues/1980) using version 1.72 or 1.73.
1414
- AVRO : https://avro.apache.org/releases.html#Download (starting from version 1.9.0 [except 1.11.1](https://issues.apache.org/jira/browse/AVRO-3601), build it with the above boost library.)
15-
- (OPTIONALLY) OpenSSL : version 1.1 is known to work.
15+
- (OPTIONALLY) OpenSSL : version 3.4 is known to work.
1616
- (OPTIONALLY) [FESAPI](https://github.com/F2I-Consulting/fesapi/releases) : All versions from version 2.7.0.0 should be ok but a minimal version of 2.11.0.0 is recommended to automatically recognize FESAPI CMake Variables using CMake find Module and build silently the EtpClient example.
1717

1818
# Configure the build

‎cmake/FetpapiClientUsingFesapi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Licensed to the Apache Software Foundation (ASF) under one
1616
specific language governing permissions and limitations
1717
under the License.
1818
-----------------------------------------------------------------------*/
19-
package com.f2i_consulting.fetpapi.client;
19+
package com.f2i_consulting.example;
2020

2121
import java.util.Optional;
2222
import java.util.UUID;

‎cmake/fetpapiCsWithFesapi.csproj.template‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>F2iConsulting.Fetpapi</RootNamespace>
1212
<AssemblyName>${CS_LIBRARY_NAME}</AssemblyName>
13+
<!-- Minimal TargetFrameworkVersion according to SWIG
1314
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
15+
-->
16+
<!-- TargetFrameworkVersion which is ok for a lot of softwares and for Github Runner image -->
17+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1418
<FileAlignment>512</FileAlignment>
1519
<TargetFrameworkProfile />
1620
</PropertyGroup>

‎cmake/fetpapiCsWithoutFesapi.csproj.template‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>F2iConsulting.Fetpapi</RootNamespace>
1212
<AssemblyName>${CS_LIBRARY_NAME}</AssemblyName>
13+
<!-- Minimal TargetFrameworkVersion according to SWIG
1314
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
15+
-->
16+
<!-- TargetFrameworkVersion which is ok for a lot of softwares and for Github Runner image -->
17+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1418
<FileAlignment>512</FileAlignment>
1519
<TargetFrameworkProfile />
1620
</PropertyGroup>

‎cmake/pyproject.toml.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ readme = "README.md"
1616
classifiers=[
1717
'Development Status :: 5 - Production/Stable',
1818
'Intended Audience :: Developers',
19-
'License :: OSI Approved :: Apache Software License',
2019
'Operating System :: Microsoft :: Windows',
2120
'Operating System :: POSIX :: Linux',
2221
'Operating System :: MacOS',
@@ -29,9 +28,10 @@ classifiers=[
2928
'Programming Language :: Python :: 3.12',
3029
'Topic :: Software Development',
3130
'Topic :: Software Development :: Libraries',
32-
'Topic :: Software Development :: Libraries :: Application Frameworks ',
31+
'Topic :: Software Development :: Libraries :: Application Frameworks',
3332
'Topic :: File Formats',
3433
]
34+
license = {text = "Apache-2.0"}
3535
keywords = [
3636
"energistics",
3737
"resqml",
@@ -43,7 +43,7 @@ keywords = [
4343
]
4444
requires-python = ">=3.8"
4545
dependencies = [
46-
'fesapi==2.12.1',
46+
'fesapi==2.14.0',
4747
]
4848

4949
[project.urls]

0 commit comments

Comments
 (0)