Fix Python module compatibility and fix some warnings

IB-8176 Signed-off-by: Raul Metsma <[email protected]>
open-eid · Nov 12, 2024 · 943981b · 943981b
1 parent 82729b4
commit 943981b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,17 +60,12 @@ jobs:
         cd /Library
         zip -q -r ${OLDPWD}/libdigidocpp.${{ matrix.target }}.zip libdigidocpp.*
     - name: Archive artifacts
-      if: matrix.target == 'macos'
-      uses: actions/upload-artifact@v4
-      with:
-        name: macOS
-        path: build/macos/libdigidocpp*.*
-    - name: Archive artifacts
-      if: matrix.target != 'macos'
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.target }}
-        path: libdigidocpp*.zip
+        path: |
+          build/macos/libdigidocpp*.*
+          libdigidocpp*.zip
   fedora:
     name: Build on Fedora ${{ matrix.container }}
     runs-on: ubuntu-latest

diff --git a/build.ps1 b/build.ps1
@@ -52,6 +52,7 @@ foreach($type in @("Debug", "RelWithDebInfo")) {
   $buildpath = $platform+$type
   & $vcvars $platform "&&" $cmake --fresh -B $buildpath -S $libdigidocpp "-G$generator" `
     "-DCMAKE_BUILD_TYPE=$type" `
+    "-DCMAKE_VERBOSE_MAKEFILE=YES" `
     "-DCMAKE_INSTALL_PREFIX=$platform" `
     "-DCMAKE_INSTALL_LIBDIR=bin" `
     "-DCMAKE_TOOLCHAIN_FILE=$vcpkg_dir/scripts/buildsystems/vcpkg.cmake" `

diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh
@@ -168,7 +168,7 @@ function openssl {
         do
             case "${ARGS}" in
             *simulator*) CC="" CFLAGS="-arch ${ARCH}" ./Configure iossimulator-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-module no-engine no-tests no-ui-console enable-ec_nistp_64_gcc_128 ;;
-            *catalyst*) CC="" CFLAGS="-target ${ARCH}-apple-ios-macabi" ./Configure darwin64-${ARCH} --prefix=${TARGET_PATH} no-shared no-dso no-module no-engine no-tests no-ui-console enable-ec_nistp_64_gcc_128 ;;
+            *catalyst*) CC="" CFLAGS="-target ${ARCH}-apple-ios${IPHONEOS_DEPLOYMENT_TARGET}-macabi" ./Configure darwin64-${ARCH} --prefix=${TARGET_PATH} no-shared no-dso no-module no-engine no-tests no-ui-console enable-ec_nistp_64_gcc_128 ;;
             *iphone*) CC="" CFLAGS="" ./Configure ios64-xcrun --prefix=${TARGET_PATH} no-shared no-dso no-module no-engine no-tests no-ui-console enable-ec_nistp_64_gcc_128 ;;
             *) CC="" CFLAGS="" ./Configure darwin64-${ARCH} --prefix=${TARGET_PATH} shared no-module no-tests enable-ec_nistp_64_gcc_128
             esac

diff --git a/src/XMLDocument.h b/src/XMLDocument.h
@@ -186,8 +186,8 @@ struct XMLElem
 
 struct XMLName
 {
-    std::string_view name;
-    std::string_view ns;
+    std::string_view name {};
+    std::string_view ns {};
 };
 
 struct XMLNode: public XMLElem<xmlNode>

diff --git a/src/XmlConf.cpp b/src/XmlConf.cpp
@@ -600,7 +600,10 @@ SET1CONST(string, setProxyPass, proxyPass)
  * @fn void digidoc::XmlConfV5::setPKCS12Cert(const std::string &cert)
  * @copydoc digidoc::XmlConf::setPKCS12Cert(const std::string &cert)
  */
+DIGIDOCPP_WARNING_PUSH
+DIGIDOCPP_WARNING_DISABLE_GCC("-Wunused-parameter")
 SET1CONSTEX(string, setPKCS12Cert, {})
+DIGIDOCPP_WARNING_POP
 
 /**
  * @fn void digidoc::XmlConf::setPKCS12Pass(const std::string &pass)
@@ -625,7 +628,10 @@ SET1CONSTEX(string, setPKCS12Cert, {})
  * @fn void digidoc::XmlConfV5::setPKCS12Pass(const std::string &pass)
  * @copydoc digidoc::XmlConf::setPKCS12Pass(const std::string &pass)
  */
+DIGIDOCPP_WARNING_PUSH
+DIGIDOCPP_WARNING_DISABLE_GCC("-Wunused-parameter")
 SET1CONSTEX(string, setPKCS12Pass, {})
+DIGIDOCPP_WARNING_POP
 
 /**
  * @fn void digidoc::XmlConf::setTSUrl(const std::string &url)
@@ -700,7 +706,10 @@ SET1CONST(string, setVerifyServiceUri, verifyServiceUri)
  * @fn void digidoc::XmlConfV5::setPKCS12Disable(bool disable)
  * @copydoc digidoc::XmlConf::setPKCS12Disable(bool disable)
  */
+DIGIDOCPP_WARNING_PUSH
+DIGIDOCPP_WARNING_DISABLE_GCC("-Wunused-parameter")
 SET1EX(bool, setPKCS12Disable, {})
+DIGIDOCPP_WARNING_POP
 
 /**
  * @fn void digidoc::XmlConf::setProxyTunnelSSL(bool enable)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -12,8 +12,6 @@ target_link_libraries(TSLTests digidocpp digidocpp_util Boost::unit_test_framewo
 if(WIN32)
     string(REPLACE "/EHsc" "/EHa" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
     set_target_properties(unittests TSLTests PROPERTIES COMPILE_FLAGS "/bigobj")
-else()
-    set_target_properties(unittests TSLTests PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-unused-variable")
 endif()
 add_test(NAME runtest
     COMMAND ${CMAKE_CURRENT_BINARY_DIR}/unittests --build_info=YES --report_level=no --logger=${TEST_FORMAT},all,${CMAKE_CURRENT_BINARY_DIR}/libdigidocpp.xml -- ${CMAKE_CURRENT_SOURCE_DIR}/data