From 9b5b524a5feeba3e62ba5118599d81e5d0b2de99 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Wed, 4 Jan 2023 13:08:12 +0200 Subject: [PATCH] Update Copyright year and cleanup scripts IB-7627 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 4 +++- CMakeLists.txt | 4 ++-- build.ps1 | 2 +- cmake | 2 +- debian/copyright | 2 +- examples/java/build.gradle | 6 +++--- prepare_osx_build_environment.sh | 11 ++++------- src/CMakeLists.txt | 16 ++++++++++------ src/digidoc-tool.rc | 2 +- src/libdigidocpp.rc | 2 +- 10 files changed, 27 insertions(+), 24 deletions(-) mode change 100644 => 100755 examples/java/build.gradle diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b8552331..0b0d64815 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ jobs: with: submodules: recursive - name: Install dependencies + env: + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: YES run: | brew update brew install doxygen boost xsd || brew link --overwrite xsd @@ -160,7 +162,7 @@ jobs: env: MAKEFLAGS: "" VER_SUFFIX: .VS${{ matrix.toolset }} - VERSION: 3.14.12.${{ github.run_number }} + VERSION: 3.15.0.${{ github.run_number }} VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/patches/vcpkg-triplets VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/patches/vcpkg-ports steps: diff --git a/CMakeLists.txt b/CMakeLists.txt index e4312e662..834e2b808 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(libdigidocpp VERSION 3.14.12) +project(libdigidocpp VERSION 3.15.0) if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) endif() @@ -47,7 +47,7 @@ endif() find_package(Doxygen) find_package(OpenSSL 1.1.1 REQUIRED) find_package(PKCS11) -find_package(PoDoFo) +#find_package(PoDoFo) find_package(Threads) find_package(XmlSecurityC REQUIRED) find_package(XSD 4.0 REQUIRED) diff --git a/build.ps1 b/build.ps1 index 9da53dd32..cf41a3e40 100644 --- a/build.ps1 +++ b/build.ps1 @@ -4,7 +4,7 @@ param( [string]$vcpkg = "vcpkg\vcpkg.exe", [string]$vcpkg_dir = (split-path -parent $vcpkg), [string]$buildver = "0", - [string]$msiversion = "3.14.12.$buildver", + [string]$msiversion = "3.15.0.$buildver", [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.msi", [string]$cmake = "cmake.exe", [string]$generator = "NMake Makefiles", 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/debian/copyright b/debian/copyright index 55eb1fd36..240141bb3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Contact: info@ria.ee Source: https://github.com/open-eid/libdigidocpp Files: * -Copyright: 2012-2022 Estonian Information System's Authority +Copyright: 2012-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/examples/java/build.gradle b/examples/java/build.gradle old mode 100644 new mode 100755 index 8a71c02ea..ad564eae9 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -4,7 +4,7 @@ plugins { group 'ee.ria' sourceCompatibility = 8 -sourceSets.main.java.srcDirs += ['/Library/libdigidocpp/include'] +sourceSets.main.java.srcDirs += ['/Library/libdigidocpp/include', '/usr/include'] repositories { mavenCentral() @@ -17,6 +17,6 @@ dependencies { jar { archivesBaseName = 'libdigidocpp' manifest { - attributes 'Main-Class': 'ee.ria.libdigidocpp' + attributes 'Main-Class': 'ee.ria.libdigidocpp.libdigidocpp' } -} \ No newline at end of file +} diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index f36189473..1c9fa18c2 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -259,12 +259,9 @@ function openssl { tar xf ${OPENSSL_DIR}.tar.gz cd ${OPENSSL_DIR} - sed -ie 's!, "apps"!!' Configure - sed -ie 's!, "fuzz"!!' Configure - sed -ie 's!, "test"!!' Configure case "${ARGS}" in *android*) - ./Configure android-${ARCH} -D__ANDROID_API__=${ABI} --prefix=${TARGET_PATH} --openssldir=${TARGET_PATH}/ssl no-hw no-engine no-tests no-shared + ./Configure android-${ARCH} -D__ANDROID_API__=${ABI} --prefix=${TARGET_PATH} --openssldir=${TARGET_PATH}/ssl no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio make -s sudo make install_sw ;; @@ -274,14 +271,14 @@ function openssl { case "${ARCH}" in *x86_64*) case "${ARGS}" in - *simulator*) CC="" CFLAGS="" ./Configure iossimulator-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-asm no-engine ;; - *catalyst*) CC="" CFLAGS="-target x86_64-apple-ios-macabi" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} no-shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128 ;; + *simulator*) CC="" CFLAGS="" ./Configure iossimulator-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio;; + *catalyst*) CC="" CFLAGS="-target x86_64-apple-ios-macabi" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio enable-ec_nistp_64_gcc_128 ;; *) CC="" CFLAGS="" KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128 esac ;; *arm64*) case "${ARGS}" in - *ios*) CC="" CFLAGS="" ./Configure ios64-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-asm no-engine ;; + *ios*) CC="" CFLAGS="" ./Configure ios64-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-hw no-engine no-tests no-ui-console no-stdio;; *) CC="" CFLAGS="" MACHINE=arm64 KERNEL_BITS=64 ./config --prefix=${TARGET_PATH} shared no-hw no-engine no-tests enable-ec_nistp_64_gcc_128 esac ;; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e1581be78..8d01b1dcb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,6 +4,9 @@ if(NOT MINIZIP_FOUND) target_compile_options(minizip PRIVATE $<$>:-Wno-unused-parameter -Wno-unused-value>) set_target_properties(minizip PROPERTIES COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT" POSITION_INDEPENDENT_CODE YES) target_link_libraries(minizip ZLIB::ZLIB) + if(ANDROID) + set_property(SOURCE minizip/ioapi.c APPEND PROPERTY COMPILE_DEFINITIONS IOAPI_NO_64) + endif() else() add_library(minizip INTERFACE) target_link_libraries(minizip INTERFACE PkgConfig::MINIZIP) @@ -269,8 +272,9 @@ if(SWIG_FOUND) set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/java) swig_add_library(digidoc_java TYPE SHARED LANGUAGE java SOURCES ../libdigidocpp.i) target_include_directories(digidoc_java PRIVATE ${JAVA_INCLUDE_PATH} $<$:${JAVA_INCLUDE_PATH2}>) - swig_link_libraries(digidoc_java digidocpp digidocpp_util) + target_link_libraries(digidoc_java digidocpp digidocpp_util) if(APPLE) + set_target_properties(digidoc_java PROPERTIES MACOSX_RPATH YES INSTALL_RPATH /Library/Frameworks) install(TARGETS digidoc_java DESTINATION /Library/Java/Extensions) else() install(TARGETS digidoc_java DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -278,6 +282,10 @@ if(SWIG_FOUND) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ee/ria/libdigidocpp FILES_MATCHING PATTERN "*.java") if(WIN32) install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) + elseif(ANDROID) + # Xerces-C requires iconv + find_package(Iconv) + target_link_libraries(digidoc_java Iconv::Iconv) endif() endif() if(TARGET PythonModule) @@ -305,7 +313,7 @@ if(SWIG_FOUND) set(CMAKE_SWIG_FLAGS -dllimport digidoc_csharp -namespace digidoc) set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/csharp) swig_add_library(digidoc_csharp TYPE SHARED LANGUAGE csharp SOURCES ../libdigidocpp.i) - swig_link_libraries(digidoc_csharp digidocpp digidocpp_util) + target_link_libraries(digidoc_csharp digidocpp digidocpp_util) install(TARGETS digidoc_csharp DESTINATION ${CMAKE_INSTALL_BINDIR}) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/csharp/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/digidocpp_csharp FILES_MATCHING PATTERN "*.cs") install(FILES $ DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL) @@ -343,10 +351,6 @@ if(WIN32) endif() elseif(APPLE) target_link_libraries(digidocpp PUBLIC "-framework CoreFoundation") -elseif(ANDROID) - find_package(Iconv) - target_link_libraries(digidocpp PRIVATE Iconv::Iconv) - set_property(SOURCE minizip/ioapi.c APPEND PROPERTY COMPILE_DEFINITIONS IOAPI_NO_64) endif() source_group( "Resources" FILES "${CMAKE_CURRENT_BINARY_DIR}/digidocpp.conf;${CMAKE_SOURCE_DIR}/etc/798.p12" ) diff --git a/src/digidoc-tool.rc b/src/digidoc-tool.rc index 719dba382..499efaefc 100644 --- a/src/digidoc-tool.rc +++ b/src/digidoc-tool.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "digidoc-tool" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "digidoc-tool" - VALUE "LegalCopyright", "(C) 2009-2022 Estonian Information System Authority" + VALUE "LegalCopyright", "(C) 2009-2023 Estonian Information System Authority" VALUE "OriginalFilename", "digidoc-tool.exe" VALUE "ProductName", "digidoc-tool" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) diff --git a/src/libdigidocpp.rc b/src/libdigidocpp.rc index 666b48afd..ba954bf95 100644 --- a/src/libdigidocpp.rc +++ b/src/libdigidocpp.rc @@ -24,7 +24,7 @@ BEGIN VALUE "FileDescription", "digidocpp" VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER) VALUE "InternalName", "digidocpp" - VALUE "LegalCopyright", "(C) 2009-2022 Estonian Information System Authority" + VALUE "LegalCopyright", "(C) 2009-2023 Estonian Information System Authority" VALUE "OriginalFilename", "digidocpp.dll" VALUE "ProductName", "digidocpp" VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)