diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efdf60dc8..5d1343e70 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ permissions:
env:
BUILD_NUMBER: ${{ github.run_number }}
CMAKE_BUILD_PARALLEL_LEVEL: 4
+ UBUNTU_DEPS: ./libdigidocpp-pkg/*.deb cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
jobs:
macos:
name: Build on macOS
@@ -61,16 +62,6 @@ jobs:
DEBFULLNAME: github-actions
DEBEMAIL: github-actions@github.com
steps:
- - name: Install dependencies
- if: matrix.container == '20.04'
- run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian libflatbuffers-dev zlib1g-dev
- - name: Install dependencies
- if: matrix.container != '20.04'
- run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools lintian libflatbuffers-dev zlib1g-dev
- - name: Checkout
- uses: actions/checkout@v4
- with:
- submodules: recursive
- name: Download artifact
uses: dawidd6/action-download-artifact@v6
with:
@@ -79,12 +70,19 @@ jobs:
name: ubuntu_${{ matrix.container }}
path: libdigidocpp-pkg
repo: open-eid/libdigidocpp
- - name: Install artifact
- run: |
- apt install --no-install-recommends -y ./libdigidocpp-pkg/*.deb
- rm -rf libdigidocpp-pkg
+ - name: Install dependencies
+ if: matrix.container == '20.04'
+ run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config lintian ./libdigidocpp-pkg/*.deb cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev libflatbuffers-dev zlib1g-dev
+ - name: Install dependencies
+ if: matrix.container != '20.04'
+ run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config lintian ${UBUNTU_DEPS}
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ submodules: recursive
- name: Setup changelog
run: |
+ rm -rf libdigidocpp-pkg
export VERSION=$(grep project CMakeLists.txt | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
export VERSIONEX=${VERSION}.${BUILD_NUMBER}.$(lsb_release -rs)
dch --distribution $(lsb_release -cs) -v ${VERSIONEX} "Release ${VERSIONEX}."
@@ -216,8 +214,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- - name: Install dependencies
- run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
- name: Download artifact
uses: dawidd6/action-download-artifact@v6
with:
@@ -226,8 +222,8 @@ jobs:
name: ubuntu_22.04
path: libdigidocpp-pkg
repo: open-eid/libdigidocpp
- - name: Install artifact
- run: sudo dpkg -i libdigidocpp-pkg/*.deb
+ - name: Install dependencies
+ run: sudo apt update -qq && sudo apt install --no-install-recommends -y ${UBUNTU_DEPS}
- name: Download Coverity Build Tool
run: |
curl -s -d "token=$TOKEN&project=$PROJECTNAME" -o cov-analysis-linux64.tar.gz https://scan.coverity.com/download/cxx/linux64
@@ -260,8 +256,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- - name: Install dependencies
- run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
- name: Download artifact
uses: dawidd6/action-download-artifact@v6
with:
@@ -270,8 +264,8 @@ jobs:
name: ubuntu_22.04
path: libdigidocpp-pkg
repo: open-eid/libdigidocpp
- - name: Install artifact
- run: sudo dpkg -i libdigidocpp-pkg/*.deb
+ - name: Install dependencies
+ run: sudo apt update -qq && sudo apt install --no-install-recommends -y ${UBUNTU_DEPS}
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c402bec71..9d50f9fff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.16)
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/VersionInfo.cmake)
- message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?")
+ message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?")
endif()
project(qdigidoc4 VERSION 4.6.0)
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 9d9a4bdcd..eb86c86c3 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -266,6 +266,9 @@ elseif(WIN32)
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/XalanMessages_1_12.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/Xalan-C_1_12.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/xsec_2_0.dll appx
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxml2.dll appx
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1.dll appx
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libxmlsec1-openssl.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.dll appx
COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Assets appx/Assets
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
index d7b257d67..43d1708ef 100644
--- a/qdigidoc4.wxs
+++ b/qdigidoc4.wxs
@@ -101,9 +101,14 @@
+
+
+
+
+
@@ -123,11 +128,6 @@
-
-
-
-
-