diff --git a/.github/actions/build-native-binary/action.yaml b/.github/actions/build-native-binary/action.yaml index 0ac1cc0..f81283f 100644 --- a/.github/actions/build-native-binary/action.yaml +++ b/.github/actions/build-native-binary/action.yaml @@ -135,7 +135,7 @@ runs: if: ${{ inputs.arch == 'amd64' }} run: | cd dist_${{ inputs.arch }}/utest - ./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt --gtest_output=xml:../../unit_tests_report_${{ inputs.arch }}.xml + LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent > ../../unit_tests_report_${{ inputs.arch }}.txt --gtest_output=xml:../../unit_tests_report_${{ inputs.arch }}.xml shell: bash - uses: uraimo/run-on-arch-action@v2 @@ -163,7 +163,7 @@ runs: if: ${{ inputs.arch == 'amd64' }} run: | cd dist_${{ inputs.arch }}_codecov/utest - ./TestSelfUpdateAgent + LD_LIBRARY_PATH=../lib ./TestSelfUpdateAgent shell: bash - name: Generate code-coverage report diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 4d7dc72..ea38627 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -32,8 +32,9 @@ install( DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) -install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0) -install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0) -install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0) -install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7300.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0) +install(FILES ${CMAKE_BINARY_DIR}/glib/gio/libgio-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgio-2.0.so.0) +install(FILES ${CMAKE_BINARY_DIR}/glib/glib/libglib-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libglib-2.0.so.0) +install(FILES ${CMAKE_BINARY_DIR}/glib/gmodule/libgmodule-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgmodule-2.0.so.0) +install(FILES ${CMAKE_BINARY_DIR}/glib/gobject/libgobject-2.0.so.0.7800.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libgobject-2.0.so.0) install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/libffi/src/libffi.so.7.1.0 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libffi.so.7) +install(FILES ${CMAKE_BINARY_DIR}/glib/subprojects/proxy-libintl/libintl.so.8 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RENAME libintl.so.8) diff --git a/3rdparty/curl b/3rdparty/curl index db12037..6fa1d81 160000 --- a/3rdparty/curl +++ b/3rdparty/curl @@ -1 +1 @@ -Subproject commit db1203781cd703ab7975bb37b1673214946dd3c9 +Subproject commit 6fa1d817e5b1a00d7d0c8168091877476b499317 diff --git a/3rdparty/glib b/3rdparty/glib index da27026..3c543ef 160000 --- a/3rdparty/glib +++ b/3rdparty/glib @@ -1 +1 @@ -Subproject commit da2702646c1065eaa2d501a7f33776dcc2f0f11c +Subproject commit 3c543ef69ffab7c78e29eaf383e7fe2c7df6cd49 diff --git a/3rdparty/googletest b/3rdparty/googletest index 9c33214..f8d7d77 160000 --- a/3rdparty/googletest +++ b/3rdparty/googletest @@ -1 +1 @@ -Subproject commit 9c332145b71c36a5bad9688312c79184f98601ff +Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571 diff --git a/3rdparty/nlohmann-json b/3rdparty/nlohmann-json index 7f72eed..bc889af 160000 --- a/3rdparty/nlohmann-json +++ b/3rdparty/nlohmann-json @@ -1 +1 @@ -Subproject commit 7f72eedc2d4fc196d389f5aa0b2659f70dabe278 +Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d diff --git a/3rdparty/openssl b/3rdparty/openssl index a275afc..17a2c51 160000 --- a/3rdparty/openssl +++ b/3rdparty/openssl @@ -1 +1 @@ -Subproject commit a275afc527d05b5187b457bdbcd0e1dcb18839f1 +Subproject commit 17a2c5111864d8e016c5f2d29c40a3746b559e9d diff --git a/3rdparty/paho.mqtt.c b/3rdparty/paho.mqtt.c index 556cd56..f7799da 160000 --- a/3rdparty/paho.mqtt.c +++ b/3rdparty/paho.mqtt.c @@ -1 +1 @@ -Subproject commit 556cd568345e47b70da603edc92f11ff94a6161f +Subproject commit f7799da95e347bbc930b201b52a1173ebbad45a7 diff --git a/3rdparty/paho.mqtt.cpp b/3rdparty/paho.mqtt.cpp index 2ff3d15..33921c8 160000 --- a/3rdparty/paho.mqtt.cpp +++ b/3rdparty/paho.mqtt.cpp @@ -1 +1 @@ -Subproject commit 2ff3d155dcd10564f1816675789284b4efd79eb7 +Subproject commit 33921c8b68b351828650c36816e7ecf936764379 diff --git a/3rdparty/spdlog b/3rdparty/spdlog index 4f80077..7e635fc 160000 --- a/3rdparty/spdlog +++ b/3rdparty/spdlog @@ -1 +1 @@ -Subproject commit 4f800773393d3ebac13c1fcd946a315d4d72bcd9 +Subproject commit 7e635fca68d014934b4af8a1cf874f63989352b7 diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 0653360..44d31d9 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -76,9 +76,10 @@ COPY --from=build /work/dist_amd64/lib/libsua.so /sua/lib/ COPY --from=build /work/build_amd64/glib/gio/libgio-2.0.so.0 /sua/lib/ COPY --from=build /work/build_amd64/glib/gobject/libgobject-2.0.so.0 /sua/lib/ COPY --from=build /work/build_amd64/glib/glib/libglib-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ -COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ +COPY --from=build /work/build_amd64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ +COPY --from=build /work/build_amd64/glib/subprojects/proxy-libintl/libintl.so.8 /sua/lib/ COPY --from=build /etc/ssl/certs /etc/ssl/certs/ COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates COPY --from=build /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index ca843cd..4488c0b 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -76,9 +76,10 @@ COPY --from=build /work/dist_arm64/lib/libsua.so /sua/lib/ COPY --from=build /work/build_arm64/glib/gio/libgio-2.0.so.0 /sua/lib/ COPY --from=build /work/build_arm64/glib/gobject/libgobject-2.0.so.0 /sua/lib/ COPY --from=build /work/build_arm64/glib/glib/libglib-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ -COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ -COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ +COPY --from=build /work/build_arm64/glib/gmodule/libgmodule-2.0.so.0 /sua/lib/ +COPY --from=build /work/build_arm64/glib/subprojects/libffi/src/libffi.so.7 /sua/lib/ +COPY --from=build /work/build_arm64/glib/subprojects/zlib-1.2.11/libz.so /sua/lib/ +COPY --from=build /work/build_arm64/glib/subprojects/proxy-libintl/libintl.so.8 /sua/lib/ COPY --from=build /etc/ssl/certs /etc/ssl/certs/ COPY --from=build /usr/share/ca-certificates /usr/share/ca-certificates COPY --from=build /usr/aarch64-linux-gnu/lib/ld-linux-aarch64.so.1 /lib/ld-linux-aarch64.so.1 diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 1a0339e..5b458b6 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -59,3 +59,9 @@ set_property( TARGET z_lib PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/zlib-1.2.11/libz.so ) + +add_library(intl_lib SHARED IMPORTED) +set_property( + TARGET intl_lib + PROPERTY IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/glib/subprojects/proxy-libintl/libintl.so +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11819d5..22ad408 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -58,6 +58,7 @@ target_link_libraries(${PROJECT_NAME} glib_lib ffi_lib z_lib + intl_lib ${SUA_PLATFORM_LIBS} ssl_lib crypto_lib