From 16b42fa5ca4a2804db4f84be532ba5f3ef69b451 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Wed, 8 Jan 2025 12:50:30 +0200 Subject: [PATCH] Update version number IB-8336 Signed-off-by: Raul Metsma --- CMakeLists.txt | 5 ++++- RELEASE-NOTES.md | 11 +++++++++++ build.ps1 | 7 ++++--- libdigidocpp.wxs | 17 +++++------------ src/CMakeLists.txt | 37 +++++++++++++++++++++++-------------- vcpkg.json | 2 +- 6 files changed, 48 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 259dd0e4b..b1feeca85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,10 @@ endif() if(POLICY CMP0167) cmake_policy(SET CMP0167 NEW) endif() -project(libdigidocpp VERSION 4.1.0) +if(POLICY CMP0177) + cmake_policy(SET CMP0177 NEW) +endif() +project(libdigidocpp VERSION 4.2.0) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index c70450f17..44681dd56 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,14 @@ +Libdigidocpp library [4.1.0](https://github.com/open-eid/libdigidocpp/releases/tag/v4.1.0) release notes +-------------------------------------- +- Update libraries and platform support + (#629, #633, #642, #638, #621, #643, #648, #636) +- Improve signature and container compatibility + (#623, #626, #624, #646, #640, #645, #647, #644) +- Other fixes and optimizations + (#625, #632, #631, #594, #649) + +[Full Changelog](https://github.com/open-eid/libdigidocpp/compare/v4.0.0...v4.1.0) + Libdigidocpp library [4.0.0](https://github.com/open-eid/libdigidocpp/releases/tag/v4.0.0) release notes -------------------------------------- - Major rewrite of library internals due upstream dependecy xalan-c and xml-security-c package has been retired. diff --git a/build.ps1 b/build.ps1 index 3d8ca3fd4..09ade3ba8 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,9 +1,9 @@ #powershell -ExecutionPolicy ByPass -File build.ps1 param( [string]$libdigidocpp = $PSScriptRoot, - [string]$platform = $env:VSCMD_ARG_TGT_ARCH, + [string]$platform = $env:PLATFORM, [string]$build_number = $(if ($null -eq $env:BUILD_NUMBER) {"0"} else {$env:BUILD_NUMBER}), - [string]$msiversion = "4.1.0.$build_number", + [string]$msiversion = "4.2.0.$build_number", [string]$msi_name = "libdigidocpp-$msiversion$env:VER_SUFFIX.$platform.msi", [string]$git = "git.exe", [string]$vcpkg = "vcpkg\vcpkg.exe", @@ -57,7 +57,8 @@ foreach($type in @("Debug", "RelWithDebInfo")) { & $cmake --fresh -B $buildpath -S $libdigidocpp "-G$generator" $cmakeext ` "-DCMAKE_BUILD_TYPE=$type" ` "-DCMAKE_INSTALL_PREFIX=$platform" ` - "-DCMAKE_INSTALL_LIBDIR=bin" ` + "-DCMAKE_INSTALL_BINDIR=." ` + "-DCMAKE_INSTALL_LIBDIR=." ` "-DCMAKE_TOOLCHAIN_FILE=$vcpkg_dir/scripts/buildsystems/vcpkg.cmake" ` "-DVCPKG_INSTALLED_DIR=$vcpkg_installed_platform" ` "-DVCPKG_TARGET_TRIPLET=$vcpkg_triplet" ` diff --git a/libdigidocpp.wxs b/libdigidocpp.wxs index 2ff2ed099..667db1d1f 100644 --- a/libdigidocpp.wxs +++ b/libdigidocpp.wxs @@ -56,7 +56,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -97,24 +97,17 @@ - - - - - - - - - + - + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6be139719..7988fe0d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,15 +9,8 @@ else() target_link_libraries(minizip ZLIB::ZLIB) endif() -if($ENV{BUILD_NUMBER}) - set(BUILD_VER $ENV{BUILD_NUMBER}) -elseif(PROJECT_VERSION_TWEAK) - set(BUILD_VER ${PROJECT_VERSION_TWEAK}) -else() - set(BUILD_VER 0) -endif() - -set(VERSION ${PROJECT_VERSION}.${BUILD_VER}) +set_env(BUILD_NUMBER 0) +set(VERSION ${PROJECT_VERSION}.${BUILD_NUMBER}) configure_file( libdigidocpp.pc.cmake libdigidocpp.pc @ONLY ) configure_file( ${CMAKE_SOURCE_DIR}/etc/digidocpp.conf.cmake digidocpp.conf ) @@ -59,7 +52,7 @@ set( CRYPTO_HEADER add_library(digidocpp_ver INTERFACE) target_compile_definitions(digidocpp_ver INTERFACE VERSION_STR="${VERSION}" - $<$:VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_VER}> + $<$:VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_NUMBER}> $<$:TARGET_NAME="$"> $<$:$<$,EXECUTABLE>:APP>> ) @@ -147,14 +140,15 @@ set_target_properties(digidocpp PROPERTIES FRAMEWORK "${FRAMEWORK}" MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.digidocpp" MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PROJECT_VERSION} - MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_VER} + MACOSX_FRAMEWORK_BUNDLE_VERSION ${BUILD_NUMBER} MACOSX_RPATH YES POSITION_INDEPENDENT_CODE YES ) -target_include_directories(digidocpp - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_CURRENT_BINARY_DIR} +target_include_directories(digidocpp PUBLIC + $ + $ + $ ) target_link_libraries(digidocpp PRIVATE ${CMAKE_DL_LIBS} minizip digidocpp_priv) @@ -236,6 +230,7 @@ if(SWIG_FOUND) endif() install( TARGETS digidocpp + EXPORT libdigidocppExport LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} @@ -243,6 +238,20 @@ install( TARGETS digidocpp PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/digidocpp FRAMEWORK DESTINATION ${FRAMEWORK_DESTINATION} ) +if(NOT ANDROID) + install(EXPORT libdigidocppExport + FILE libdigidocpp-config.cmake + NAMESPACE digidocpp:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + ) + include(CMakePackageConfigHelpers) + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/libdigidocpp-config-version.cmake" + VERSION ${PROJECT_VERSION} + COMPATIBILITY AnyNewerVersion + ) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libdigidocpp-config-version.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) +endif() if(WIN32) list(APPEND CRYPTO_HEADER crypto/WinSigner.h) diff --git a/vcpkg.json b/vcpkg.json index c5875ef42..4afb815ee 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdigidocpp", - "version": "4.1.0", + "version": "4.2.0", "dependencies": [ { "name": "libxml2",