From f8411a3ec8667e78a2876d1345a2c8188c705f97 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Fri, 2 Feb 2024 13:27:01 +0200 Subject: [PATCH] Create locale neutral installer (#1233) IB-7694 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 8 +++++++- client/CMakeLists.txt | 8 +++----- client/mac/Info.plist.cmake | 10 ++++------ client/mac/Resources/en.lproj/InfoPlist.strings | 4 ---- client/mac/Resources/et.lproj/InfoPlist.strings | 4 ---- .../mac/Resources/et.lproj/ServicesMenu.strings | 4 ++-- client/mac/Resources/ru.lproj/InfoPlist.strings | 4 ---- .../mac/Resources/ru.lproj/ServicesMenu.strings | 4 ++-- client/qdigidoc4.desktop | 4 +--- client/qdigidoc4.rc | 8 ++++---- qdigidoc4.en-US.wxl | 5 ----- qdigidoc4.et-EE.wxl | 5 ----- qdigidoc4.wxs | 16 ++++------------ 13 files changed, 27 insertions(+), 57 deletions(-) delete mode 100644 client/mac/Resources/en.lproj/InfoPlist.strings delete mode 100644 client/mac/Resources/et.lproj/InfoPlist.strings delete mode 100644 client/mac/Resources/ru.lproj/InfoPlist.strings delete mode 100644 qdigidoc4.en-US.wxl delete mode 100644 qdigidoc4.et-EE.wxl diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d1b923e7..b9712a9bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -104,12 +104,18 @@ jobs: container: ${{ matrix.container }} strategy: matrix: - container: ['fedora:37', 'fedora:38'] + container: ['fedora:38', 'fedora:39'] steps: - name: Install Deps run: | dnf install -y --setopt=install_weak_deps=False \ git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel flatbuffers-devel flatbuffers-compiler zlib-devel + - name: Install CMake + if: matrix.container == 'fedora:39' + run: | + dnf install -y --setopt=install_weak_deps=False wget + wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh + sh cmake-3.28.1-linux-x86_64.sh --skip-license --prefix=/usr/local - name: Checkout uses: actions/checkout@v4 with: diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 59d524fcb..2594007aa 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -218,7 +218,7 @@ elseif(WIN32) set(PLATFORM x86) set(OPENSSL_SUFFIX "") endif() - set(MSI_FILE "Digidoc4_Client-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}") + set(MSI_FILE "Digidoc4-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}") list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM} -dMSI_VERSION=${VERSION} @@ -239,12 +239,10 @@ elseif(WIN32) 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}/${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" + COMMAND ${LIGHT_CMD} -o "${MSI_FILE}.msi" #Build MSI with QT COMMAND ${CANDLE_CMD} -dqt_path=${qtCore_install_prefix} - 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" + COMMAND ${LIGHT_CMD} -o "${MSI_FILE}.qt.msi" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) if(SIGNCERT) diff --git a/client/mac/Info.plist.cmake b/client/mac/Info.plist.cmake index dc9c0267c..a24261f41 100644 --- a/client/mac/Info.plist.cmake +++ b/client/mac/Info.plist.cmake @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} + DigiDoc4 CFBundlePackageType APPL CFBundleSupportedPlatforms @@ -31,9 +31,7 @@ NSHighResolutionCapable NSAppleEventsUsageDescription - DigiDoc4 Client can use AppleScript to talk with apps, for example to insert attachments to emails. - LSHasLocalizedDisplayName - + DigiDoc4 can use AppleScript to talk with apps, for example to insert attachments to emails. LSApplicationCategoryType public.app-category.productivity LSMinimumSystemVersion @@ -169,7 +167,7 @@ NSMenuItem default - Sign with DigiDoc4 Client + Sign with DigiDoc4 NSMessage signClient @@ -189,7 +187,7 @@ NSMenuItem default - Encrypt with DigiDoc4 Client + Encrypt with DigiDoc4 NSMessage openCrypto diff --git a/client/mac/Resources/en.lproj/InfoPlist.strings b/client/mac/Resources/en.lproj/InfoPlist.strings deleted file mode 100644 index 3811f7553..000000000 --- a/client/mac/Resources/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,4 +0,0 @@ -/* Localized versions of Info.plist keys */ - -CFBundleName = "DigiDoc4 Client"; -CFBundleDisplayName = "DigiDoc4 Client"; diff --git a/client/mac/Resources/et.lproj/InfoPlist.strings b/client/mac/Resources/et.lproj/InfoPlist.strings deleted file mode 100644 index 9853a4ec5..000000000 --- a/client/mac/Resources/et.lproj/InfoPlist.strings +++ /dev/null @@ -1,4 +0,0 @@ -/* Localized versions of Info.plist keys */ - -CFBundleName = "DigiDoc4 klient"; -CFBundleDisplayName = "DigiDoc4 klient"; diff --git a/client/mac/Resources/et.lproj/ServicesMenu.strings b/client/mac/Resources/et.lproj/ServicesMenu.strings index af69975da..36ab2c31c 100644 --- a/client/mac/Resources/et.lproj/ServicesMenu.strings +++ b/client/mac/Resources/et.lproj/ServicesMenu.strings @@ -1,2 +1,2 @@ -"Sign with DigiDoc4 Client" = "Allkirjasta DigiDoc4 klient rakendusega"; -"Encrypt with DigiDoc4 Client" = "Krüpteeri DigiDoc4 klient rakendusega"; +"Sign with DigiDoc4" = "Allkirjasta DigiDoc4 rakendusega"; +"Encrypt with DigiDoc4" = "Krüpteeri DigiDoc4 rakendusega"; diff --git a/client/mac/Resources/ru.lproj/InfoPlist.strings b/client/mac/Resources/ru.lproj/InfoPlist.strings deleted file mode 100644 index c334afd63..000000000 --- a/client/mac/Resources/ru.lproj/InfoPlist.strings +++ /dev/null @@ -1,4 +0,0 @@ -/* Localized versions of Info.plist keys */ - -CFBundleName = "DigiDoc4 Клиент"; -CFBundleDisplayName = "DigiDoc4 Клиент"; diff --git a/client/mac/Resources/ru.lproj/ServicesMenu.strings b/client/mac/Resources/ru.lproj/ServicesMenu.strings index 32db0bae3..9c37491ad 100644 --- a/client/mac/Resources/ru.lproj/ServicesMenu.strings +++ b/client/mac/Resources/ru.lproj/ServicesMenu.strings @@ -1,2 +1,2 @@ -"Sign with DigiDoc4 Client" = "Подпишите с помощью приложения DigiDoc4"; -"Encrypt with DigiDoc4 Client" = "Зашифруйте с помощью приложения DigiDoc4"; +"Sign with DigiDoc4" = "Подпишите с помощью приложения DigiDoc4"; +"Encrypt with DigiDoc4" = "Зашифруйте с помощью приложения DigiDoc4"; diff --git a/client/qdigidoc4.desktop b/client/qdigidoc4.desktop index 5b9b7a434..4a2beeee8 100644 --- a/client/qdigidoc4.desktop +++ b/client/qdigidoc4.desktop @@ -5,9 +5,7 @@ Type=Application Exec=qdigidoc4 %F Icon=qdigidoc4 -Name=DigiDoc4 Client -Name[et]=DigiDoc4 klient -Name[ru]=DigiDoc4 клиент +Name=DigiDoc4 Keywords=ID-card;Utility; Keywords[et_EE]=ID-kaart;Haldusvahend; diff --git a/client/qdigidoc4.rc b/client/qdigidoc4.rc index fb5d0c891..45e0cb00b 100644 --- a/client/qdigidoc4.rc +++ b/client/qdigidoc4.rc @@ -21,23 +21,23 @@ BEGIN BLOCK "040904B0" BEGIN VALUE "CompanyName", "RIA" - VALUE "FileDescription", "DigiDoc4 Client" + VALUE "FileDescription", "DigiDoc4" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "qdigidoc4" VALUE "LegalCopyright", "Copyright (C) 2017-2023 Estonian Information System Authority" VALUE "OriginalFilename", "qdigidoc4.exe" - VALUE "ProductName", "DigiDoc4 Client" + VALUE "ProductName", "DigiDoc4" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) END BLOCK "042504B0" BEGIN VALUE "CompanyName", "RIA" - VALUE "FileDescription", "DigiDoc4 Klient" + VALUE "FileDescription", "DigiDoc4" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "qdigidoc4" VALUE "LegalCopyright", "Copyright (C) 2017-2023 Riigi Infosüsteemi Amet" VALUE "OriginalFilename", "qdigidoc4.exe" - VALUE "ProductName", "DigiDoc4 Klient" + VALUE "ProductName", "DigiDoc4" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) END END diff --git a/qdigidoc4.en-US.wxl b/qdigidoc4.en-US.wxl deleted file mode 100644 index 2a6ba6d9b..000000000 --- a/qdigidoc4.en-US.wxl +++ /dev/null @@ -1,5 +0,0 @@ - - - DigiDoc4 client - ID-card - diff --git a/qdigidoc4.et-EE.wxl b/qdigidoc4.et-EE.wxl deleted file mode 100644 index 644fb09df..000000000 --- a/qdigidoc4.et-EE.wxl +++ /dev/null @@ -1,5 +0,0 @@ - - - DigiDoc4 klient - ID-kaart - diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs index 622fbe3d7..3302ec28a 100644 --- a/qdigidoc4.wxs +++ b/qdigidoc4.wxs @@ -51,20 +51,13 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target - - - - - - - - + DESKTOP_SHORTCUT = 1 - @@ -74,8 +67,8 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target - + @@ -188,7 +181,6 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target -