Merge pull request #669 from metsma/rel

Add release notes

Author: kristelmerilain

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         brew update
-        brew install --formula ninja swig doxygen boost
+        brew install --formula swig doxygen boost
         brew unlink [email protected] || true
         brew unlink [email protected] || true
         brew unlink openssl@3 || true
@@ -108,7 +108,7 @@ jobs:
     container: fedora:${{ matrix.container }}
     strategy:
       matrix:
-        container: [40, 41, 42, rawhide]
+        container: [41, 42, rawhide]
     steps:
     - name: Install Deps
       run: |
@@ -132,7 +132,7 @@ jobs:
     container: ubuntu:${{ matrix.container }}
     strategy:
       matrix:
-        container: ['22.04', '24.04', '24.10']
+        container: ['22.04', '24.04', '24.10', '25.04']
         arch: ['amd64', 'arm64']
     env:
       DEBIAN_FRONTEND: noninteractive

CMakeLists.txt

@@ -100,10 +100,6 @@ if(TARGET Doxygen::doxygen)
     install( DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} )
 endif()
 
-if( WIN32 )
-    add_definitions( -DUNICODE -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN )
-endif()
-
 enable_testing()
 add_subdirectory(src)
 add_subdirectory(examples)

RELEASE-NOTES.md

@@ -1,3 +1,14 @@
+Libdigidocpp library [4.2.0](https://github.com/open-eid/libdigidocpp/releases/tag/v4.2.0) release notes
+--------------------------------------
+- Update libraries and platform support
+  (#620, #651, #654, #655, #662, #659, #667)
+- Improve signature and container compatibility
+  (#660)
+- Other fixes and optimizations
+  (#653, #664, #657, #666, #663, #661)
+
+[Full Changelog](https://github.com/open-eid/libdigidocpp/compare/v4.1.0...v4.2.0)
+
 Libdigidocpp library [4.1.0](https://github.com/open-eid/libdigidocpp/releases/tag/v4.1.0) release notes
 --------------------------------------
 - Update libraries and platform support

prepare_osx_build_environment.sh

@@ -51,7 +51,7 @@ esac
 function xmlsec {
     echo Building ${XMLSEC_DIR}
     if [ ! -f ${XMLSEC_DIR}.tar.gz ]; then
-        curl -O -L http://www.aleksey.com/xmlsec/download/${XMLSEC_DIR}.tar.gz
+        curl -O -L https://www.aleksey.com/xmlsec/download/${XMLSEC_DIR}.tar.gz
     fi
     rm -rf ${XMLSEC_DIR}
     tar xf ${XMLSEC_DIR}.tar.gz

src/CMakeLists.txt

@@ -49,12 +49,15 @@ set( CRYPTO_HEADER
 )
 
 add_library(digidocpp_ver INTERFACE)
-target_compile_definitions(digidocpp_ver INTERFACE
-    VERSION_STR="${VERSION}"
-    $<$<PLATFORM_ID:Windows>:VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_NUMBER}>
-    $<$<PLATFORM_ID:Windows>:TARGET_NAME="$<TARGET_PROPERTY:NAME>">
-    $<$<PLATFORM_ID:Windows>:$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:APP>>
-)
+target_compile_definitions(digidocpp_ver INTERFACE VERSION_STR="${VERSION}")
+if(WIN32)
+    target_compile_definitions(digidocpp_ver INTERFACE
+        UNICODE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN
+        VERSION=${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH},${BUILD_NUMBER}
+        TARGET_NAME="$<TARGET_PROPERTY:NAME>"
+        $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:APP>
+    )
+endif()
 target_sources(digidocpp_ver INTERFACE libdigidocpp.rc)
 
 add_library(digidocpp_util STATIC

src/util/File.cpp

@@ -261,7 +261,7 @@ void File::createDirectory(string path)
 #endif
     if(result == 0 || errno == EEXIST)
     {
-        DEBUG("Created directory or direcotry exists '%s'", path.c_str());
+        DEBUG("Created directory or directory exists '%s'", path.c_str());
         return;
     }
     if(errno != ENOENT)