From a4607c94c2ba8ba5329eb9a0b8061a1c98b812f1 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Thu, 9 Apr 2026 10:03:26 +0300 Subject: [PATCH] Update copyright year Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 10 +++++----- CMakeLists.txt | 3 --- cdoc/CMakeLists.txt | 2 ++ cdoc/libcdoc.rc | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bce4b112..2c5e1cdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: container: ubuntu:${{ matrix.container }} strategy: matrix: - container: ['22.04', '24.04', '25.10'] + container: ['22.04', '24.04', '25.10', '26.04'] arch: ['amd64', 'arm64'] env: DEBIAN_FRONTEND: noninteractive @@ -41,7 +41,7 @@ jobs: - name: Lintian run: lintian *.deb; - name: Archive artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: ubuntu_${{ matrix.container }}_${{ matrix.arch }} path: libcdoc*.* @@ -73,7 +73,7 @@ jobs: cmake --build --preset ${{ matrix.target }} cmake --build --preset ${{ matrix.target }} --target install/strip - name: Archive artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: ${{ matrix.target }} path: | @@ -112,7 +112,7 @@ jobs: - name: Install run: cmake --build --preset ${{ matrix.target }} --target install/strip - name: Archive artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: ${{ matrix.target }} path: ${{ env.DEST }} @@ -155,7 +155,7 @@ jobs: ctest -V -C RelWithDebInfo --test-dir build cmake --install build --config RelWithDebInfo --prefix ${{ env.DEST }} - name: Archive artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: ${{ matrix.image }}_${{ matrix.platform }} path: ${{ env.DEST }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 41b600d9..eb29326a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,6 @@ set(CPACK_PACKAGING_INSTALL_PREFIX /usr) list(APPEND CPACK_RPM_RELOCATION_PATHS ${CMAKE_INSTALL_SYSCONFDIR}) set(CPACK_RPM_FILE_NAME RPM-DEFAULT) set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) -set(MACOSX_BUNDLE_COPYRIGHT "(C) 2017-2025 Estonian Information System Authority") -set(MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION}) -set(MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_NUMBER}) if(APPLE) set(FRAMEWORK YES CACHE BOOL "Build library as Mac OS X Framework") set(FRAMEWORK_DESTINATION /Library/Frameworks CACHE PATH "Mac OS X Framework install destination") diff --git a/cdoc/CMakeLists.txt b/cdoc/CMakeLists.txt index 5adaa8e3..7012d242 100644 --- a/cdoc/CMakeLists.txt +++ b/cdoc/CMakeLists.txt @@ -67,6 +67,8 @@ set_target_properties(cdoc PROPERTIES FRAMEWORK_VERSION 1 FRAMEWORK "${FRAMEWORK}" MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.cdoc" + MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION} + MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_NUMBER} MACOSX_RPATH YES POSITION_INDEPENDENT_CODE YES ) diff --git a/cdoc/libcdoc.rc b/cdoc/libcdoc.rc index 6836920e..8170929d 100644 --- a/cdoc/libcdoc.rc +++ b/cdoc/libcdoc.rc @@ -25,7 +25,7 @@ BEGIN VALUE "FileDescription", TARGET_NAME VALUE "FileVersion", VERSION_STR VALUE "InternalName", TARGET_NAME - VALUE "LegalCopyright", "(C) 2025 Estonian Information System Authority" + VALUE "LegalCopyright", "(C) 2025-2026 Estonian Information System Authority" #ifdef APP VALUE "OriginalFilename", TARGET_NAME ".exe" #else