From a1138f72ff26419d25aa8faff0d198c46b36efba Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Wed, 15 Feb 2023 08:44:08 +0200 Subject: [PATCH] Update Qt 6.4.2 (#1150) IB-7637 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 2 +- client/CMakeLists.txt | 18 +++++++++--------- prepare_osx_build_environment.sh | 10 ++++------ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d1b323e9..1de0ea292 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: matrix: vcver: [142, 143] arch: [x64] - qtver: [6.4.1] + qtver: [6.4.2] qt: [win64_msvc2019_64] qtmodules: [qt5compat] include: diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 5932bfae7..d172b6bb0 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -207,14 +207,14 @@ if( APPLE ) add_custom_target(productbuild DEPENDS ${PROJECT_NAME} COMMAND productbuild --component $ /Applications - --sign \"$$INSTCERT\" ${CMAKE_BINARY_DIR}/qdigidoc4-store_${VERSION}$ENV{VER_SUFFIX}.pkg + --sign \"$$INSTCERT\" ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-store_${VERSION}$ENV{VER_SUFFIX}.pkg ) add_custom_target(zip DEPENDS ${PROJECT_NAME} - COMMAND zip --symlinks -r -D ${CMAKE_BINARY_DIR}/qdigidoc4_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.app + COMMAND zip --symlinks -r -D ${CMAKE_BINARY_DIR}/${PROJECT_NAME}_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.app ) add_custom_target(zipdebug DEPENDS ${PROJECT_NAME} COMMAND dsymutil -o ${PROJECT_NAME}.dSYM $ - COMMAND zip -r ${CMAKE_BINARY_DIR}/qdigidoc4-dbg_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.dSYM + COMMAND zip -r ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-dbg_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.dSYM ) elseif(WIN32) target_sources(${PROJECT_NAME} PRIVATE QCNG.cpp CertStore.cpp Diagnostics_win.cpp) @@ -233,21 +233,21 @@ elseif(WIN32) list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM} -dMSI_VERSION=${VERSION} -dPlatform=${PLATFORM} -dlibs_path="${LIBS_PATH}" -dclient_path=$ -dico_path=${CMAKE_CURRENT_SOURCE_DIR}/images/digidoc.ico -dqtconf=${CMAKE_SOURCE_DIR}/qt.conf -dschemasLocation=${LIBS_PATH}/schema SchemasFragment.wxs - -dqt_ver_major=${QT_VERSION_MAJOR} -dqt_suffix=$<$:d> ${CMAKE_SOURCE_DIR}/qdigidoc4.wxs + -dqt_ver_major=${QT_VERSION_MAJOR} -dqt_suffix=$<$:d> ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg2.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal2.wxs) list(APPEND LIGHT_CMD "$ENV{WIX}bin\\light.exe" -nologo -ext WixUIExtension - qdigidoc4.wixobj SchemasFragment.wixobj WelcomeDlg2.wixobj WixUI_Minimal2.wixobj + ${PROJECT_NAME}.wixobj SchemasFragment.wixobj WelcomeDlg2.wixobj WixUI_Minimal2.wixobj -dWixUIDialogBmp=${CMAKE_SOURCE_DIR}/cmake/modules/dlgbmp.bmp -dWixUIBannerBmp=${CMAKE_SOURCE_DIR}/cmake/modules/banner.bmp) add_custom_target(msi DEPENDS ${PROJECT_NAME} COMMAND "$ENV{WIX}bin\\heat.exe" dir ${LIBS_PATH}/schema -nologo -cg Schemas -gg -scom -sreg -sfrag -srd -dr SchemaFolder -var var.schemasLocation -out SchemasFragment.wxs COMMAND ${CANDLE_CMD} - COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/qdigidoc4.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.msi" - COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/qdigidoc4.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.msi" + COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.msi" + COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.msi" #Build MSI with QT COMMAND ${CANDLE_CMD} -dqt_path=${qtCore_install_prefix} - COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/qdigidoc4.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.qt.msi" - COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/qdigidoc4.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.qt.msi" + COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.qt.msi" + COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.qt.msi" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) if(SIGNCERT) diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index 9467ae9b9..fb8ac2ed0 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -4,8 +4,8 @@ set -e ######### Versions of libraries/frameworks to be compiled -QT_VER="6.4.1" -OPENSSL_VER="1.1.1s" +QT_VER="6.4.2" +OPENSSL_VER="1.1.1t" OPENLDAP_VER="2.6.3" REBUILD=false BUILD_PATH=~/cmake_builds @@ -22,6 +22,7 @@ do ;; -p|--path) BUILD_PATH="$2" + : ${OPENSSL_PATH:="${BUILD_PATH}/OpenSSL"} shift ;; -q|--qt) @@ -42,7 +43,7 @@ do echo "" echo "Options:" echo " -o or --openssl openssl-path:" - echo " OpenSSL path; default will be built ${OPENSSL_PATH}" + echo " OpenSSL path; default ${OPENSSL_VER} will be built ${OPENSSL_PATH}" echo " -p or --path build-path" echo " folder where the dependencies should be built; default ${BUILD_PATH}" echo " -q or --qt qt-version:" @@ -60,9 +61,6 @@ do shift # past argument or value done -if [[ -z "${OPENSSL_PATH}" ]]; then - OPENSSL_PATH="${BUILD_PATH}/OpenSSL" -fi QT_PATH=${BUILD_PATH}/Qt-${QT_VER}-OpenSSL OPENLDAP_PATH=${BUILD_PATH}/OpenLDAP GREY='\033[0;37m'