CDoc 2.0

CDOC-1

Signed-off-by: Raul Metsma <raul@metsma.ee>

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     name: Build on macOS
     runs-on: macos-latest
     env:
-      MACOSX_DEPLOYMENT_TARGET: '10.14'
+      MACOSX_DEPLOYMENT_TARGET: 10.14
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -21,7 +21,7 @@ jobs:
         branch: master
         name: pkgs
         path: libdigidocpp-pkg
-        repo: 'open-eid/libdigidocpp'
+        repo: open-eid/libdigidocpp
     - name: Install dependencies
       run: |
         HASH=($(shasum prepare_osx_build_environment.sh))
@@ -30,6 +30,7 @@ jobs:
         sudo installer -verboseR -pkg libdigidocpp-pkg/libdigidocpp*.pkg -target /
         sudo installer -verboseR -pkg opensc_*.pkg -target /
         sudo unzip -qq -d /Library/Developer ${HASH}.zip
+        brew install flatbuffers
     - name: Build
       run: |
         QT_DIR=$(ls -d /Library/Developer/Qt-*-OpenSSL | tail -n 1)
@@ -50,26 +51,26 @@ jobs:
     container: ${{ matrix.container }}
     strategy:
       matrix:
-        container: ['ubuntu:20.04', 'ubuntu:21.10', 'ubuntu:22.04']
+        container: ['ubuntu:20.04', 'ubuntu:22.04']
     env:
       DEBIAN_FRONTEND: noninteractive
-      DEBFULLNAME: 'github-actions'
-      DEBEMAIL: 'github-actions@github.com'
+      DEBFULLNAME: github-actions
+      DEBEMAIL: github-actions@github.com
     steps:
     - name: Checkout
       uses: actions/checkout@v1
       with:
         submodules: recursive
     - name: Install dependencies
-      run: apt update -qq && apt install --no-install-recommends -y lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian
+      run: apt update -qq && apt install --no-install-recommends -y lsb-release fakeroot build-essential devscripts cdbs pkg-config cmake libldap2-dev gettext libpcsclite-dev libssl-dev libqt5svg5-dev qttools5-dev-tools qttools5-dev lintian libflatbuffers-dev zlib1g-dev
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v2
       with:
         workflow: build.yml
         branch: master
         name: debs
         path: libdigidocpp-pkg
-        repo: 'open-eid/libdigidocpp'
+        repo: open-eid/libdigidocpp
     - name: Install artifact
       run: |
         apt install --no-install-recommends -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.deb
@@ -96,26 +97,24 @@ jobs:
     container: ${{ matrix.container }}
     strategy:
       matrix:
-        container: ['fedora:33']
+        container: ['fedora:34']
     env:
       MAKEFLAGS: -j3
     steps:
     - name: Checkout
       uses: actions/checkout@v1
       with:
         submodules: recursive
-    - name: Install Build Deps
-      run: dnf groupinstall -y "Development Tools" "Development Libraries" fedora-packager
     - name: Install Deps
-      run: dnf install -y cmake openssl-devel vim-common qt5-qtsvg-devel qt5-linguist
+      run: dnf install -y gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt5-qtsvg-devel qt5-linguist flatbuffers-devel zlib-devel
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v2
       with:
         workflow: build.yml
         branch: master
         name: rpms
         path: libdigidocpp-pkg
-        repo: 'open-eid/libdigidocpp'
+        repo: open-eid/libdigidocpp
     - name: Install artifact
       run: dnf install -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.rpm
     - name: Build
@@ -174,15 +173,15 @@ jobs:
         branch: master
         name: msi
         path: ./
-        repo: 'open-eid/libdigidocpp'
+        repo: open-eid/libdigidocpp
     - name: Install artifact
       run: |
         Rename-Item "libdigidocpp*VS${{ matrix.vcver }}.msi" libdigidocpp.msi
         msiexec /qn /a libdigidocpp.msi "TARGETDIR=$($pwd.Path)\\libs"
     - name: Prepare vcpkg
       uses: lukka/run-vcpkg@v7
       with:
-        vcpkgArguments: openssl
+        vcpkgArguments: openssl zlib flatbuffers
         vcpkgGitCommitId: a69b65229b3956b7f45abd81671b7330114bcaad
         vcpkgTriplet: ${{ matrix.arch }}-windows
     - name: Install Qt
@@ -220,7 +219,7 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-      PROJECTNAME: 'open-eid/DigiDoc4-Client'
+      PROJECTNAME: open-eid/DigiDoc4-Client
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -235,7 +234,7 @@ jobs:
         branch: master
         name: debs
         path: libdigidocpp-pkg
-        repo: 'open-eid/libdigidocpp'
+        repo: open-eid/libdigidocpp
     - name: Install artifact
       run: sudo dpkg -i libdigidocpp-pkg/*$(lsb_release -rs)*.deb
     - name: Download Coverity Build Tool

CMakeLists.txt

@@ -16,6 +16,8 @@ find_package( LibDigiDocpp 3.14.8 REQUIRED )
 find_package( LDAP REQUIRED )
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.9.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport Svg LinguistTools)
+find_package(Flatbuffers CONFIG REQUIRED)
+find_package(ZLIB REQUIRED)
 
 set_env( TSL_URL "https://ec.europa.eu/tools/lotl/eu-lotl.xml" CACHE STRING "TSL trust list primary URL" )
 set_env( TSL_INCLUDE "EE" CACHE STRING "TSL list include in binary" )