Skip to content

Commit d191ef2

Browse files
metsmametsma
committed
Update version and packages (#1344)
IB-8527, IB-8447, IB-8434, IB-8526, IB-8306, IB-8529 Signed-off-by: Raul Metsma <[email protected]>
1 parent f3b245c commit d191ef2

File tree

4 files changed

+44
-38
lines changed

4 files changed

+44
-38
lines changed

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
name: Build on macOS
1212
runs-on: macos-latest
1313
env:
14-
MACOSX_DEPLOYMENT_TARGET: 12.0
14+
MACOSX_DEPLOYMENT_TARGET: 13.0
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v4
1818
with:
1919
submodules: recursive
2020
- name: Download artifact
21-
uses: dawidd6/action-download-artifact@v6
21+
uses: dawidd6/action-download-artifact@v11
2222
with:
2323
workflow: build.yml
2424
branch: master
@@ -36,6 +36,7 @@ jobs:
3636
sudo installer -verboseR -pkg libdigidocpp-pkg/build/macos/libdigidocpp*.pkg -target /
3737
sudo installer -verboseR -pkg opensc_*.pkg -target /
3838
sudo unzip -qq -d /Library/Developer ${HASH}.zip
39+
rm -rf libdigidocpp-pkg
3940
- name: Build
4041
run: |
4142
QT_DIR=$(ls -d /Library/Developer/Qt-*-OpenSSL | tail -n 1)
@@ -64,7 +65,7 @@ jobs:
6465
DEBEMAIL: [email protected]
6566
steps:
6667
- name: Download artifact
67-
uses: dawidd6/action-download-artifact@v6
68+
uses: dawidd6/action-download-artifact@v11
6869
with:
6970
workflow: build.yml
7071
branch: master
@@ -79,7 +80,6 @@ jobs:
7980
submodules: recursive
8081
- name: Setup changelog
8182
run: |
82-
rm -rf libdigidocpp-pkg
8383
export VERSION=$(grep project CMakeLists.txt | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
8484
export VERSIONEX=${VERSION}.${BUILD_NUMBER}.$(lsb_release -rs)
8585
dch --distribution $(lsb_release -cs) -v ${VERSIONEX} "Release ${VERSIONEX}."
@@ -103,7 +103,7 @@ jobs:
103103
container: [41, 42]
104104
steps:
105105
- name: Download artifact
106-
uses: dawidd6/action-download-artifact@v6
106+
uses: dawidd6/action-download-artifact@v11
107107
with:
108108
workflow: build.yml
109109
branch: master
@@ -127,13 +127,10 @@ jobs:
127127
path: build/qdigidoc4*.rpm
128128
windows:
129129
name: Build on Windows
130-
runs-on: ${{ matrix.image }}
130+
runs-on: windows-2022
131131
strategy:
132132
matrix:
133133
vcver: [143]
134-
include:
135-
- vcver: 143
136-
image: windows-2022
137134
env:
138135
VER_SUFFIX: .VS${{ matrix.vcver }}
139136
steps:
@@ -142,7 +139,7 @@ jobs:
142139
with:
143140
submodules: recursive
144141
- name: Download artifact
145-
uses: dawidd6/action-download-artifact@v6
142+
uses: dawidd6/action-download-artifact@v11
146143
with:
147144
workflow: build.yml
148145
branch: master
@@ -157,21 +154,21 @@ jobs:
157154
uses: lukka/run-vcpkg@v7
158155
with:
159156
vcpkgArguments: openssl zlib flatbuffers
160-
vcpkgGitCommitId: 4008642a50a01a7115c2406b04d5273898e7fe1c
157+
vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e
161158
vcpkgTriplet: x64-windows
162159
- name: Install Qt
163160
uses: jurplel/install-qt-action@v4
164161
with:
165-
version: 6.8.3
162+
version: 6.9.1
166163
arch: win64_msvc2022_64
167164
- name: Setup dev env
168165
uses: ilammy/msvc-dev-cmd@v1
169166
with:
170167
arch: x64
171168
- name: Install WiX
172169
run: |
173-
dotnet tool install -g wix --version 5.0.2
174-
wix extension -g add WixToolset.UI.wixext/5.0.2
170+
dotnet tool install -g wix --version 6.0.1
171+
wix extension -g add WixToolset.UI.wixext/6.0.1
175172
- name: Build
176173
run: |
177174
cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `
@@ -199,7 +196,7 @@ jobs:
199196
with:
200197
submodules: recursive
201198
- name: Download artifact
202-
uses: dawidd6/action-download-artifact@v6
199+
uses: dawidd6/action-download-artifact@v11
203200
with:
204201
workflow: build.yml
205202
branch: master
@@ -241,7 +238,7 @@ jobs:
241238
with:
242239
submodules: recursive
243240
- name: Download artifact
244-
uses: dawidd6/action-download-artifact@v6
241+
uses: dawidd6/action-download-artifact@v11
245242
with:
246243
workflow: build.yml
247244
branch: master

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.22)
22
if(NOT EXISTS ${CMAKE_SOURCE_DIR}/common/CMakeLists.txt)
33
message(FATAL_ERROR "common submodule directory empty, did you 'git clone --recursive'?")
44
endif()
5-
project(qdigidoc4 VERSION 4.8.1)
5+
project(qdigidoc4 VERSION 4.8.2)
66

77
macro(SET_ENV NAME DEF)
88
if(DEFINED ENV{${NAME}})

‎client/CMakeLists.txt‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
5151
DateTime.cpp
5252
DateTime.h
5353
Diagnostics.cpp
54+
$<IF:$<PLATFORM_ID:Windows>,Diagnostics_win.cpp,Diagnostics_unix.cpp>
5455
Diagnostics.h
5556
DiagnosticsTask.cpp
5657
DiagnosticsTask.h
@@ -168,7 +169,7 @@ if( APPLE )
168169
set_source_files_properties( ${_file} PROPERTIES MACOSX_PACKAGE_LOCATION ${_file_dir})
169170
endforeach(_file)
170171

171-
target_sources(${PROJECT_NAME} PRIVATE ${RESOURCE_FILES} Application_mac.mm MacMenuBar.cpp MacMenuBar.h dialogs/CertificateDetails_mac.mm Diagnostics_unix.cpp)
172+
target_sources(${PROJECT_NAME} PRIVATE ${RESOURCE_FILES} Application_mac.mm MacMenuBar.cpp MacMenuBar.h dialogs/CertificateDetails_mac.mm)
172173
set_source_files_properties( Application_mac.mm dialogs/CertificateDetails_mac.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc" )
173174
set_source_files_properties( LdapSearch.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
174175
target_link_libraries(${PROJECT_NAME} "-framework QuickLookUI" "-fobjc-arc")
@@ -190,25 +191,34 @@ if( APPLE )
190191
COMMAND ln -sf digidocpp.framework/Libraries/libssl.3.dylib
191192
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/libssl.3.dylib
192193
)
193-
194194
add_custom_target(codesign DEPENDS ${PROJECT_NAME}
195-
COMMAND codesign -f -s \"$$SIGNCERT\"
195+
COMMAND codesign -f -s "Developer ID Application: ${SIGNCERT}"
196196
$<TARGET_FILE_DIR:${PROJECT_NAME}>/*.*
197197
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/digidocpp.framework/Libraries/*
198198
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/*.framework
199199
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/*/*.dylib
200-
COMMAND if echo \"$$SIGNCERT\" | grep -q "Developer ID" \; then
201-
codesign -f --options runtime -s \"$$SIGNCERT\" $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/DigiDocQL.appex --entitlements ${CMAKE_SOURCE_DIR}/extensions/DigiDocQL/DigiDocQL.entitlements\;
202-
codesign -f --options runtime -s \"$$SIGNCERT\" $<TARGET_BUNDLE_DIR:${PROJECT_NAME}> --entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.eToken.entitlements\;
203-
else
204-
codesign -f -s \"$$SIGNCERT\" $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/DigiDocQL.appex --entitlements ${CMAKE_SOURCE_DIR}/extensions/DigiDocQL/DigiDocQL.entitlements\;
205-
codesign -f -s \"$$SIGNCERT\" $<TARGET_BUNDLE_DIR:${PROJECT_NAME}> --entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.entitlements\;
206-
fi
200+
COMMAND codesign -f --options runtime -s "Developer ID Application: ${SIGNCERT}"
201+
--entitlements ${CMAKE_SOURCE_DIR}/extensions/DigiDocQL/DigiDocQL.entitlements
202+
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/DigiDocQL.appex
203+
COMMAND codesign -f --options runtime -s "Developer ID Application: ${SIGNCERT}"
204+
--entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.eToken.entitlements
205+
$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>
207206
)
208-
209207
add_custom_target(productbuild DEPENDS ${PROJECT_NAME}
208+
COMMAND codesign -f -s "Apple distribution: ${SIGNCERT}"
209+
$<TARGET_FILE_DIR:${PROJECT_NAME}>/*.*
210+
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/digidocpp.framework/Libraries/*
211+
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/*.framework
212+
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/*/*.dylib
213+
COMMAND codesign -f -s "Apple distribution: ${SIGNCERT}"
214+
--entitlements ${CMAKE_SOURCE_DIR}/extensions/DigiDocQL/DigiDocQL.entitlements
215+
$<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/DigiDocQL.appex
216+
COMMAND codesign -f -s "Apple distribution: ${SIGNCERT}"
217+
--entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.entitlements
218+
$<TARGET_BUNDLE_DIR:${PROJECT_NAME}>
210219
COMMAND productbuild --component $<TARGET_BUNDLE_DIR:${PROJECT_NAME}> /Applications
211-
--sign \"$$INSTCERT\" ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-store_${VERSION}$ENV{VER_SUFFIX}.pkg
220+
--sign "3rd Party Mac Developer Installer: ${SIGNCERT}"
221+
${CMAKE_BINARY_DIR}/${PROJECT_NAME}-store_${VERSION}$ENV{VER_SUFFIX}.pkg
212222
)
213223
add_custom_target(zip DEPENDS ${PROJECT_NAME}
214224
COMMAND zip --symlinks -r -D ${CMAKE_BINARY_DIR}/${PROJECT_NAME}_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.app
@@ -218,7 +228,7 @@ if( APPLE )
218228
COMMAND zip -r ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-dbg_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.dSYM
219229
)
220230
elseif(WIN32)
221-
target_sources(${PROJECT_NAME} PRIVATE QCNG.cpp QCNG.h CertStore.cpp CertStore.h Diagnostics_win.cpp)
231+
target_sources(${PROJECT_NAME} PRIVATE QCNG.cpp QCNG.h CertStore.cpp CertStore.h)
222232
target_compile_options(${PROJECT_NAME} PRIVATE "/guard:cf")
223233
target_link_options(${PROJECT_NAME} PRIVATE "/guard:cf" $<$<BOOL:${CROSSSIGNCERT}>:/INTEGRITYCHECK>)
224234
target_link_libraries(${PROJECT_NAME} NCrypt Crypt32 Cryptui winscard)
@@ -291,7 +301,6 @@ elseif(WIN32)
291301
)
292302
else()
293303
find_package( Threads REQUIRED )
294-
target_sources(${PROJECT_NAME} PRIVATE Diagnostics_unix.cpp)
295304
target_link_libraries(${PROJECT_NAME} Threads::Threads )
296305
configure_file( qdigidoc4.1.cmake qdigidoc4.1 )
297306
install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

‎prepare_osx_build_environment.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
set -e
55

66
######### Versions of libraries/frameworks to be compiled
7-
QT_VER="6.8.2"
8-
OPENSSL_VER="3.0.16"
9-
OPENLDAP_VER="2.6.9"
7+
QT_VER="6.9.1"
8+
OPENSSL_VER="3.5.1"
9+
OPENLDAP_VER="2.6.10"
1010
REBUILD=false
1111
BUILD_PATH=~/cmake_builds
12-
: ${MACOSX_DEPLOYMENT_TARGET:="12.0"}
12+
: ${MACOSX_DEPLOYMENT_TARGET:="13.0"}
1313
export MACOSX_DEPLOYMENT_TARGET
1414

1515
while [[ $# -gt 0 ]]
@@ -80,7 +80,7 @@ if [[ ! -d ${OPENSSL_PATH} ]] ; then
8080
tar xf openssl-${OPENSSL_VER}.tar.gz
8181
pushd openssl-${OPENSSL_VER}
8282
for ARCH in x86_64 arm64; do
83-
./Configure darwin64-${ARCH} --prefix=${OPENSSL_PATH} shared no-autoload-config no-module no-tests enable-ec_nistp_64_gcc_128
83+
./Configure darwin64-${ARCH} --prefix=${OPENSSL_PATH} no-apps shared no-autoload-config no-module no-tests enable-ec_nistp_64_gcc_128
8484
make -s > /dev/null
8585
make install_sw
8686
mv ${OPENSSL_PATH}{,.${ARCH}}
@@ -103,7 +103,7 @@ if [[ "$REBUILD" = true || ! -d ${QT_PATH} ]] ; then
103103
echo -e "\n${ORANGE}##### Building Qt ${QT_VER} ${QT_PATH} #####${RESET}\n"
104104
for PACKAGE in qtbase-everywhere-src-${QT_VER} qtsvg-everywhere-src-${QT_VER} qttools-everywhere-src-${QT_VER}; do
105105
if [ ! -f ${PACKAGE}.tar.xz ]; then
106-
curl -O -L http://download.qt.io/official_releases/qt/${QT_MINOR}/${QT_VER}/submodules/${PACKAGE}.tar.xz
106+
curl -O -L https://download.qt.io/official_releases/qt/${QT_MINOR}/${QT_VER}/submodules/${PACKAGE}.tar.xz
107107
fi
108108
rm -rf ${PACKAGE}
109109
tar xf ${PACKAGE}.tar.xz
@@ -125,7 +125,7 @@ fi
125125
if [[ "$REBUILD" = true || ! -d ${OPENLDAP_PATH} ]] ; then
126126
echo -e "\n${ORANGE}##### Building OpenLDAP ${OPENLDAP_VER} ${OPENLDAP_PATH} #####${RESET}\n"
127127
if [ ! -f openldap-${OPENLDAP_VER}.tgz ]; then
128-
curl -O -L http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-${OPENLDAP_VER}.tgz
128+
curl -O -L https://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-${OPENLDAP_VER}.tgz
129129
fi
130130
tar xf openldap-${OPENLDAP_VER}.tgz
131131
pushd openldap-${OPENLDAP_VER}

0 commit comments

Comments
 (0)