diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d43cd51b..556393651 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: runs-on: macos-latest strategy: matrix: - target: [osx, ios, iossimulator, androidarm, androidarm64, androidx86, androidx86_64] + target: [osx, ios, iossimulator, androidarm, androidarm64, androidx86_64] steps: - name: Checkout uses: actions/checkout@v3 @@ -138,24 +138,18 @@ jobs: runs-on: ${{ matrix.image }} strategy: matrix: - toolset: [143, 142, 141] + toolset: [143, 142] include: - toolset: 143 image: windows-2022 - vcver: 14.34 vcvars: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" - toolset: 142 image: windows-2019 - vcver: 14.29 - vcvars: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" - - toolset: 141 - image: windows-2019 - vcver: 14.16 vcvars: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat" env: MAKEFLAGS: "" VER_SUFFIX: .VS${{ matrix.toolset }} - VERSION: 3.15.0.${{ github.run_number }} + VERSION: 3.16.0.${{ github.run_number }} VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/patches/vcpkg-triplets VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/patches/vcpkg-ports steps: @@ -184,7 +178,6 @@ jobs: -msiversion $env:VERSION ` -toolset ${{ matrix.toolset }} ` -vcvars "${{ matrix.vcvars }}" ` - -vcver "${{ matrix.vcver }}" ` -swig C:/ProgramData/chocolatey/bin/swig.exe ` -doxygen "C:/Program files/doxygen/bin/doxygen.exe" - name: Archive artifacts diff --git a/CMakeLists.txt b/CMakeLists.txt index ffa18211e..4b8b77900 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) if(POLICY CMP0122) cmake_policy(SET CMP0122 NEW) endif() -project(libdigidocpp VERSION 3.15.0) +project(libdigidocpp VERSION 3.16.0) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) include(VersionInfo) diff --git a/README.md b/README.md index 4cd2455fd..15ed8378e 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ git clone --recursive https://github.com/open-eid/libdigidocpp cd libdigidocpp -3. Prepare dependencies (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86) +3. Prepare dependencies (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86_64) sh prepare_osx_build_environment.sh osx all @@ -72,7 +72,7 @@ * swig - Optional, for C# and Java bindings * openjdk - Optional, for Java bindings -5. Configure, build and install (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86) +5. Configure, build and install (available targets: osx, ios, iossimulator, androidarm, androidarm64, androidx86_64) ./build-library.sh osx install @@ -92,7 +92,6 @@ * [Java](https://www.oracle.com/java/technologies/downloads/) - Optional, for Java bindings Toolset: - * 141 - Visual Studio 2017 * 142 - Visual Studio 2019 (Default) * 143 - Visual Studio 2022 @@ -115,7 +114,7 @@ Optional CMake parameters: - -DSWIG_EXECUTABLE=C:/swigwin-4.0.2/swig.exe + -DSWIG_EXECUTABLE=C:/swigwin-4.1.1/swig.exe After running the cmake build, digidoc_csharp.dll along with the C# source files will be created, more info at [examples/DigiDocCSharp/README.md](examples/DigiDocCSharp/README.md). diff --git a/build.ps1 b/build.ps1 index 65c0cef28..92805a2ba 100644 --- a/build.ps1 +++ b/build.ps1 @@ -4,7 +4,7 @@ param( [string]$vcpkg = "vcpkg\vcpkg.exe", [string]$vcpkg_dir = (split-path -parent $vcpkg), [string]$buildver = "0", - [string]$msiversion = "3.15.0.$buildver", + [string]$msiversion = "3.16.0.$buildver", [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.msi", [string]$cmake = "cmake.exe", [string]$generator = "NMake Makefiles", @@ -25,7 +25,6 @@ param( if (!$vcvars) { switch ($toolset) { - '141' { $vcvars = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" } '142' { $vcvars = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" } '143' { $vcvars = "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" } } diff --git a/libdigidocpp.wxs b/libdigidocpp.wxs index 0dbb38bec..7282b5036 100644 --- a/libdigidocpp.wxs +++ b/libdigidocpp.wxs @@ -3,8 +3,6 @@ - - diff --git a/patches/vcpkg-triplets/x64-windows-v141.cmake b/patches/vcpkg-triplets/x64-windows-v141.cmake deleted file mode 100644 index 3f915493d..000000000 --- a/patches/vcpkg-triplets/x64-windows-v141.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_PLATFORM_TOOLSET v141) diff --git a/patches/vcpkg-triplets/x86-windows-v141.cmake b/patches/vcpkg-triplets/x86-windows-v141.cmake deleted file mode 100644 index 1b6ae87f1..000000000 --- a/patches/vcpkg-triplets/x86-windows-v141.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x86) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_PLATFORM_TOOLSET v141) diff --git a/prepare_win_build_environment.ps1 b/prepare_win_build_environment.ps1 index f16b4b5c4..33145dbe5 100644 --- a/prepare_win_build_environment.ps1 +++ b/prepare_win_build_environment.ps1 @@ -3,7 +3,7 @@ param( [string]$vcpkg = "vcpkg\vcpkg.exe", [string]$git = "git.exe", [string]$7zip = "C:\Program Files\7-Zip\7z.exe", - [string]$toolset = "141", + [string]$toolset = "142", [string]$xsdver = "xsd-4.0.0-i686-windows", [switch]$openssl = $false, [switch]$xerces = $false, diff --git a/src/digidoc-tool.1.cmake b/src/digidoc-tool.1.cmake index 1f1bd4f62..c3c104f48 100644 --- a/src/digidoc-tool.1.cmake +++ b/src/digidoc-tool.1.cmake @@ -69,4 +69,4 @@ All commands: --loglevel=[0,1,2,3,4] - Log level 0 - none, 1 - error, 2 - warning, 3 - info, 4 - debug --logfile= - File to log, empty to console .SH SEE ALSO -cdigidoc(1), qdigidoc4(1) +qdigidoc4(1)