From 1be23aeffdf0214a2848e229bfd74b6b0946acf6 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Tue, 10 Jan 2023 17:00:52 +0200 Subject: [PATCH] Update Copyright year and cleanup scripts (#1149) IB-7627 Signed-off-by: Raul Metsma Signed-off-by: Raul Metsma --- client/CMakeLists.txt | 108 +++++++++++++++++++++--------------------- client/qdigidoc4.rc | 4 +- cmake | 2 +- common | 2 +- debian/copyright | 2 +- extensions | 2 +- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index c7260cfd1..5344d3e1c 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,5 +1,3 @@ -set_app_name( PROGNAME qdigidoc4 ) - add_executable( TSLDownload TSLDownload.cpp ) target_link_libraries(TSLDownload Qt${QT_VERSION_MAJOR}::Network) get_target_property(qtCore_install_prefix Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION) @@ -14,8 +12,8 @@ add_custom_command( configure_file( translations/tr.qrc tr.qrc COPYONLY ) qt_add_translation(SOURCES translations/en.ts translations/et.ts translations/ru.ts) -add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE - ${PROGNAME}.rc +add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE + ${PROJECT_NAME}.rc ${SOURCES} images/images.qrc fonts/fonts.qrc @@ -125,7 +123,7 @@ add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE widgets/WarningRibbon.cpp ) -target_link_libraries( ${PROGNAME} +target_link_libraries(${PROJECT_NAME} qdigidoccommon Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::Svg @@ -139,20 +137,22 @@ endif() if(${QT_VERSION_MAJOR} STREQUAL "6") find_package(Qt6 COMPONENTS Core5Compat SvgWidgets REQUIRED) - target_link_libraries(${PROGNAME} Qt6::Core5Compat Qt6::SvgWidgets) + target_link_libraries(${PROJECT_NAME} Qt6::Core5Compat Qt6::SvgWidgets) elseif(WIN32) find_package(Qt5 COMPONENTS WinExtras) - target_compile_definitions(${PROGNAME} PRIVATE QT_WIN_EXTRAS) - target_link_libraries(${PROGNAME} Qt5::WinExtras) + target_compile_definitions(${PROJECT_NAME} PRIVATE QT_WIN_EXTRAS) + target_link_libraries(${PROJECT_NAME} Qt5::WinExtras) endif() -set_target_properties(${PROGNAME} PROPERTIES +set_target_properties(${PROJECT_NAME} PROPERTIES AUTOUIC ON AUTORCC ON MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/mac/Info.plist.cmake + MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME} + MACOSX_BUNDLE_GUI_IDENTIFIER "ee.ria.${PROJECT_NAME}" ) -target_include_directories(${PROGNAME} PRIVATE ${CMAKE_SOURCE_DIR} ${LIBDIGIDOCPP_INCLUDE_DIR} ) -target_compile_definitions(${PROGNAME} PRIVATE +target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR} ${LIBDIGIDOCPP_INCLUDE_DIR} ) +target_compile_definitions(${PROJECT_NAME} PRIVATE MOBILEID_URL="${MOBILEID_URL}" SMARTID_URL="${SMARTID_URL}" BUILD_DATE="${BUILD_DATE}" @@ -168,58 +168,58 @@ if( APPLE ) set_source_files_properties( ${_file} PROPERTIES MACOSX_PACKAGE_LOCATION ${_file_dir}) endforeach(_file) - target_sources( ${PROGNAME} PRIVATE ${RESOURCE_FILES} Application_mac.mm MacMenuBar.cpp dialogs/CertificateDetails_mac.mm Diagnostics_unix.cpp) + target_sources(${PROJECT_NAME} PRIVATE ${RESOURCE_FILES} Application_mac.mm MacMenuBar.cpp dialogs/CertificateDetails_mac.mm Diagnostics_unix.cpp) set_source_files_properties( Application_mac.mm dialogs/CertificateDetails_mac.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc" ) set_source_files_properties( LdapSearch.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) - target_link_libraries( ${PROGNAME} "-framework Security" "-framework Quartz" "-framework Cocoa" "-fobjc-arc") - add_custom_command( TARGET ${PROGNAME} POST_BUILD - COMMAND cp -a ${PKCS11_MODULE} $ - COMMAND mkdir -p $/Library/QuickLook - COMMAND cp -a $ $/Library/QuickLook + target_link_libraries(${PROJECT_NAME} "-framework Security" "-framework Quartz" "-framework Cocoa" "-fobjc-arc") + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND cp -a ${PKCS11_MODULE} $ + COMMAND mkdir -p $/Library/QuickLook + COMMAND cp -a $ $/Library/QuickLook ) - add_custom_target( macdeployqt DEPENDS ${PROGNAME} - COMMAND ${qtCore_install_prefix}/macdeployqt $ - COMMAND rm -rf $/PlugIns/bearer - COMMAND cp -a /Library/Frameworks/digidocpp.framework $/Frameworks - COMMAND rm $/Frameworks/digidocpp.framework/Resources/digidoc-tool - COMMAND find $/Frameworks -name Headers | xargs rm -rf - COMMAND install_name_tool -delete_rpath /Library/Frameworks $ + add_custom_target(macdeployqt DEPENDS ${PROJECT_NAME} + COMMAND ${qtCore_install_prefix}/macdeployqt $ + COMMAND rm -rf $/PlugIns/bearer + COMMAND cp -a /Library/Frameworks/digidocpp.framework $/Frameworks + COMMAND rm $/Frameworks/digidocpp.framework/Resources/digidoc-tool + COMMAND find $/Frameworks -name Headers | xargs rm -rf + COMMAND install_name_tool -delete_rpath /Library/Frameworks $ COMMAND ln -sf digidocpp.framework/Libraries/libcrypto.dylib - $/Frameworks/libcrypto.1.1.dylib + $/Frameworks/libcrypto.1.1.dylib COMMAND ln -sf digidocpp.framework/Libraries/libssl.dylib - $/Frameworks/libssl.1.1.dylib + $/Frameworks/libssl.1.1.dylib ) - add_custom_target( codesign DEPENDS ${PROGNAME} + add_custom_target(codesign DEPENDS ${PROJECT_NAME} COMMAND codesign -f -s \"$$SIGNCERT\" - $/*.* - $/Frameworks/digidocpp.framework/Libraries/* - $/Frameworks/*.framework - $/PlugIns/*/* - $/Library/QuickLook/DigiDocQL.qlgenerator + $/*.* + $/Frameworks/digidocpp.framework/Libraries/* + $/Frameworks/*.framework + $/PlugIns/*/* + $/Library/QuickLook/DigiDocQL.qlgenerator COMMAND if echo \"$$SIGNCERT\" | grep -q "Developer ID" \; then - codesign -f -s \"$$SIGNCERT\" $ --entitlements ${CMAKE_SOURCE_DIR}/${PROGNAME}.eToken.entitlements\; + codesign -f -s \"$$SIGNCERT\" $ --entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.eToken.entitlements\; else - codesign -f -s \"$$SIGNCERT\" $ --entitlements ${CMAKE_SOURCE_DIR}/${PROGNAME}.entitlements\; + codesign -f -s \"$$SIGNCERT\" $ --entitlements ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.entitlements\; fi ) - add_custom_target( productbuild DEPENDS ${PROGNAME} - COMMAND productbuild --component $ /Applications + add_custom_target(productbuild DEPENDS ${PROJECT_NAME} + COMMAND productbuild --component $ /Applications --sign \"$$INSTCERT\" ${CMAKE_BINARY_DIR}/qdigidoc4-store_${VERSION}$ENV{VER_SUFFIX}.pkg ) - add_custom_target( zip DEPENDS ${PROGNAME} - COMMAND zip --symlinks -r -D ${CMAKE_BINARY_DIR}/qdigidoc4_${VERSION}$ENV{VER_SUFFIX}.zip ${PROGNAME}.app + add_custom_target(zip DEPENDS ${PROJECT_NAME} + COMMAND zip --symlinks -r -D ${CMAKE_BINARY_DIR}/qdigidoc4_${VERSION}$ENV{VER_SUFFIX}.zip ${PROJECT_NAME}.app ) - add_custom_target( zipdebug DEPENDS ${PROGNAME} - COMMAND dsymutil -o ${PROGNAME}.dSYM $ - COMMAND zip -r ${CMAKE_BINARY_DIR}/qdigidoc4-dbg_${VERSION}$ENV{VER_SUFFIX}.zip ${PROGNAME}.dSYM + 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 ) elseif(WIN32) - target_sources( ${PROGNAME} PRIVATE QCNG.cpp CertStore.cpp Diagnostics_win.cpp) - target_compile_options(${PROGNAME} PRIVATE "/guard:cf") - target_link_options(${PROGNAME} PRIVATE "/guard:cf" $<$:/INTEGRITYCHECK>) - target_link_libraries(${PROGNAME} NCrypt Crypt32 Cryptui) + target_sources(${PROJECT_NAME} PRIVATE QCNG.cpp CertStore.cpp Diagnostics_win.cpp) + target_compile_options(${PROJECT_NAME} PRIVATE "/guard:cf") + target_link_options(${PROJECT_NAME} PRIVATE "/guard:cf" $<$:/INTEGRITYCHECK>) + target_link_libraries(${PROJECT_NAME} NCrypt Crypt32 Cryptui) get_filename_component(LIBS_PATH ${LIBDIGIDOCPP_LIBRARIES} DIRECTORY) if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(PLATFORM x64) @@ -230,7 +230,7 @@ elseif(WIN32) endif() set(MSI_FILE "Digidoc4_Client-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}") 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 + -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 ${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg2.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal2.wxs) @@ -238,7 +238,7 @@ elseif(WIN32) qdigidoc4.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 ${PROGNAME} + 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" @@ -252,8 +252,8 @@ elseif(WIN32) if(SIGNCERT) list(APPEND SIGNCMD signtool.exe sign /a /v /s MY /n "${SIGNCERT}" /fd SHA256 /du http://installer.id.ee /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256) - add_custom_command(TARGET ${PROGNAME} POST_BUILD - COMMAND ${SIGNCMD} "$<$:/ph;/ac;${CROSSSIGNCERT}>" $ + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${SIGNCMD} "$<$:/ph;/ac;${CROSSSIGNCERT}>" $ COMMAND_EXPAND_LISTS ) add_custom_command(TARGET msi POST_BUILD @@ -262,12 +262,12 @@ elseif(WIN32) ) endif() configure_file(${CMAKE_SOURCE_DIR}/AppxManifest.xml.cmake ${CMAKE_BINARY_DIR}/AppxManifest.xml) - add_custom_target(appx DEPENDS ${PROGNAME} + add_custom_target(appx DEPENDS ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E remove ${MSI_FILE}.appx COMMAND ${CMAKE_COMMAND} -E remove_directory appx COMMAND ${CMAKE_COMMAND} -E make_directory appx COMMAND ${CMAKE_COMMAND} -E copy AppxManifest.xml appx - COMMAND ${CMAKE_COMMAND} -E copy $ appx + COMMAND ${CMAKE_COMMAND} -E copy $ appx COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/qt.conf appx COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/798.p12 appx COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/libcrypto-1_1${OPENSSL_SUFFIX}.dll appx @@ -293,10 +293,10 @@ elseif(WIN32) ) else() find_package( Threads REQUIRED ) - target_sources( ${PROGNAME} PRIVATE Diagnostics_unix.cpp) - target_link_libraries( ${PROGNAME} Threads::Threads ) + target_sources(${PROJECT_NAME} PRIVATE Diagnostics_unix.cpp) + target_link_libraries(${PROJECT_NAME} Threads::Threads ) configure_file( qdigidoc4.1.cmake qdigidoc4.1 ) - install( TARGETS ${PROGNAME} DESTINATION ${CMAKE_INSTALL_BINDIR} ) + install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qdigidoc4.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) install( FILES qdigidoc4.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications ) install( FILES qdigidoc4.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages ) diff --git a/client/qdigidoc4.rc b/client/qdigidoc4.rc index ac6d91532..fb5d0c891 100644 --- a/client/qdigidoc4.rc +++ b/client/qdigidoc4.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "DigiDoc4 Client" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "qdigidoc4" - VALUE "LegalCopyright", "Copyright (C) 2017-2022 Estonian Information System Authority" + VALUE "LegalCopyright", "Copyright (C) 2017-2023 Estonian Information System Authority" VALUE "OriginalFilename", "qdigidoc4.exe" VALUE "ProductName", "DigiDoc4 Client" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) @@ -35,7 +35,7 @@ BEGIN VALUE "FileDescription", "DigiDoc4 Klient" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "qdigidoc4" - VALUE "LegalCopyright", "Copyright (C) 2017-2022 Riigi Infosüsteemi Amet" + VALUE "LegalCopyright", "Copyright (C) 2017-2023 Riigi Infosüsteemi Amet" VALUE "OriginalFilename", "qdigidoc4.exe" VALUE "ProductName", "DigiDoc4 Klient" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) diff --git a/cmake b/cmake index c06a7cd78..7b34cc036 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit c06a7cd7803de16f61efef34827b72fe6b2e01db +Subproject commit 7b34cc036c350e2ac13e4f3f529361003e36394a diff --git a/common b/common index 58780f1bd..254b3ceed 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 58780f1bd14d578ad51974e7e2cab35b19fafcb6 +Subproject commit 254b3ceedfecff91508a098d3055287178624a80 diff --git a/debian/copyright b/debian/copyright index 6be59c613..ab7616e07 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Contact: info@ria.ee Source: https://github.com/open-eid/DigiDoc4-Client Files: * -Copyright: 2017-2022 Estonian Information System's Authority +Copyright: 2017-2023 Estonian Information System's Authority License: LGPL-2.1 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/extensions b/extensions index d5c946f5b..d428a88c8 160000 --- a/extensions +++ b/extensions @@ -1 +1 @@ -Subproject commit d5c946f5b1cfaf38bec74bbe28049aaee1ac7fee +Subproject commit d428a88c8acdd2f89dbefd4c4c5691761518160a