Merge branch 'develop' into feature/RestApiv2

# Conflicts:
#	tests/unit/sources/plugins/Linky/TestLinkyReceiveBufferHandler.cpp
#	tests/unit/sources/plugins/TeleInfo/TestTeleInfoReceiveBufferHandler.cpp
#	tests/unit/sources/server/pluginSystem/information/TestPluginInformation.cpp
#	tests/unit/sources/server/startupOptions/TestLoader.cpp
#	tests/unit/sources/shared/TestDataContainer.cpp

Author: sgallou

.github/workflows/generate_binaries.yml

@@ -39,7 +39,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Yadoms build script
-        uses: Yadoms/build-yadoms-action@v4.0.2
+        uses: Yadoms/build-yadoms-action@v4.0.3-beta.2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -65,89 +65,89 @@ jobs:
           docker logout ghcr.io || true
           rm -f ~/.docker/config.json
 
-  build-windows:
-    name: Build (Windows)
-    runs-on: windows-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Login to GitHub Container Repository (GHCR)
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Yadoms build script
-        uses: Yadoms/build-yadoms-windows-action@v2.0.2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          buildImage: ghcr.io/yadoms/build_for_windows:latest
-          entrypoint: "powershell.exe -Command C:\\work\\build-scripts\\windows\\entrypoint_docker.ps1"  #TODO utile ?
-
-      - name: Archive binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows-Binaries
-          path: ./bin-windows/package/Yadoms*
-
-      - name: Archive update packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: Windows-Update
-          path: ./bin-windows/package/update*
-
-      - name: Cleanup Docker credentials
-        if: always()
-        shell: powershell
-        run: |
-          docker logout ghcr.io 2>$null
-          Remove-Item "$env:USERPROFILE\.docker\config.json" -Force -ErrorAction SilentlyContinue
-
-  rpi-image:
-    name: RaspberryPI image - ${{ matrix.language.label }}
-    runs-on: ubuntu-latest
-    needs: build-linux
-    strategy:
-      fail-fast: false
-      matrix:
-        language:
-          - lang: fr
-            label: FR
-          - lang: en
-            label: EN
-
-    steps:
-      - name: Download RaspberryPI binaries
-        uses: actions/download-artifact@v4
-        with:
-          name: RaspberryPI-Binaries
-          path: ./
-
-      - name: Build RaspberryPI image (${{ matrix.language.label }})
-        uses: Yadoms/build-yadoms-rpiimage-action@v1.0.1
-        with:
-          output_folder: $GITHUB_WORKSPACE/bin-RaspberryPI/pi_image
-          language: ${{ matrix.language.lang }}
-          branch_or_tag_name: 2020-12-02-raspbian-buster
-
-      - name: Archive RPi image (${{ matrix.language.label }})
-        uses: actions/upload-artifact@v4
-        with:
-          name: Raspbian-Lite-${{ matrix.language.label }}-Yadoms-Image
-          path: ./bin-RaspberryPI/pi_image/*.zip
+  # build-windows:
+    # name: Build (Windows)
+    # runs-on: windows-latest
+    # steps:
+      # - name: Checkout code
+        # uses: actions/checkout@v4
+
+      # - name: Login to GitHub Container Repository (GHCR)
+        # uses: docker/login-action@v3
+        # with:
+          # registry: ghcr.io
+          # username: ${{ github.actor }}
+          # password: ${{ secrets.GITHUB_TOKEN }}
+
+      # - name: Yadoms build script
+        # uses: Yadoms/build-yadoms-windows-action@v2.0.2
+        # with:
+          # registry: ghcr.io
+          # username: ${{ github.actor }}
+          # password: ${{ secrets.GITHUB_TOKEN }}
+          # buildImage: ghcr.io/yadoms/build_for_windows:latest
+          # entrypoint: "powershell.exe -Command C:\\work\\build-scripts\\windows\\entrypoint_docker.ps1"  #TODO utile ?
+
+      # - name: Archive binaries
+        # uses: actions/upload-artifact@v4
+        # with:
+          # name: Windows-Binaries
+          # path: ./bin-windows/package/Yadoms*
+
+      # - name: Archive update packages
+        # uses: actions/upload-artifact@v4
+        # with:
+          # name: Windows-Update
+          # path: ./bin-windows/package/update*
+
+      # - name: Cleanup Docker credentials
+        # if: always()
+        # shell: powershell
+        # run: |
+          # docker logout ghcr.io 2>$null
+          # Remove-Item "$env:USERPROFILE\.docker\config.json" -Force -ErrorAction SilentlyContinue
+
+  # rpi-image:
+    # name: RaspberryPI image - ${{ matrix.language.label }}
+    # runs-on: ubuntu-latest
+    # needs: build-linux
+    # strategy:
+      # fail-fast: false
+      # matrix:
+        # language:
+          # - lang: fr
+            # label: FR
+          # - lang: en
+            # label: EN
+
+    # steps:
+      # - name: Download RaspberryPI binaries
+        # uses: actions/download-artifact@v4
+        # with:
+          # name: RaspberryPI-Binaries
+          # path: ./
+
+      # - name: Build RaspberryPI image (${{ matrix.language.label }})
+        # uses: Yadoms/build-yadoms-rpiimage-action@v1.0.1
+        # with:
+          # output_folder: $GITHUB_WORKSPACE/bin-RaspberryPI/pi_image
+          # language: ${{ matrix.language.lang }}
+          # branch_or_tag_name: 2020-12-02-raspbian-buster
+
+      # - name: Archive RPi image (${{ matrix.language.label }})
+        # uses: actions/upload-artifact@v4
+        # with:
+          # name: Raspbian-Lite-${{ matrix.language.label }}-Yadoms-Image
+          # path: ./bin-RaspberryPI/pi_image/*.zip
 
 
   release:
     name: Create/Update Release (tag only)
     runs-on: ubuntu-latest
     needs:
       - build-linux
-      - build-windows
-      - rpi-image
+      # - build-windows
+      # - rpi-image
     if: github.ref_type == 'tag'
     steps:
       - name: Download all artifacts

.github/workflows/unit_tests.yml

@@ -25,15 +25,15 @@ jobs:
 
     - name: Generate unittests binary
       id: yadoms_build_step
-      uses: Yadoms/build-yadoms-action@v4.0.2
+      uses: Yadoms/build-yadoms-action@v4.0.3-beta.2
       with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 # TODO          buildImage: ghcr.io/yadoms/build_for_linux:latest
           buildImage: ghcr.io/yadoms/build_for_linux:feature-updateRPiBuild_notSureBestMethod
           privileged: ${{ matrix.target.privileged }}          
-          entrypoint: 'sh /work/build-scripts/linux/entrypoint_docker_unittests.sh'
+          entrypoint: '/entrypoint_tests.sh'
 
     - name: Archive unittests artifacts
       uses: actions/upload-artifact@v4

build-scripts/linux/entrypoint_docker_unittests.sh

@@ -108,7 +108,7 @@ set(Boost_USE_STATIC_RUNTIME ON)
 add_definitions(-DBOOST_SPIRIT_THREADSAFE)
 
 # define all needed boost libraries
-set(BOOST_LIBS 
+set(BOOST_COMPONENTS
    atomic
    chrono
    date_time
@@ -119,8 +119,8 @@ set(BOOST_LIBS
 )
 
 # search boost libs
-find_package(Boost 1.89.0 CONFIG REQUIRED COMPONENTS ${BOOST_LIBS})
-message("-- Found Boost: ${BOOST_LIBS}")
+find_package(Boost 1.89.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+message("-- Found Boost ${Boost_VERSION_STRING} : ${BOOST_COMPONENTS}")
 
 
 ## Thread Library
@@ -185,6 +185,7 @@ endif()
 SET(OPENSSL_USE_STATIC_LIBS TRUE)
 SET(OPENSSL_MSVC_STATIC_RT TRUE)
 FIND_PACKAGE(OpenSSL REQUIRED)
+message("-- Found OpenSSL ${OPENSSL_VERSION}")
 #Do not add OPENSSL_SSL_LIBRARY and OPENSSL_CRYPTO_LIBRARY here; it will be later
 #if done here, this is too early, and for gcc the libraries appears in bad order regarding Poco for example
 
@@ -217,7 +218,7 @@ endif(MSVC)
 add_definitions(-DPOCO_EXTERNAL_OPENSSL=42) #force an unknown value (empty value do not work correctly)
 
 find_package(Poco CONFIG REQUIRED COMPONENTS ${POCO_COMPONENTS})
-message("-- Found Poco: ${POCO_COMPONENTS}")
+message("-- Found Poco ${Poco_VERSION} : ${POCO_COMPONENTS}")
 set(Poco_TARGETS)
 foreach(c IN LISTS POCO_COMPONENTS)
   list(APPEND Poco_TARGETS Poco::${c})
@@ -241,7 +242,7 @@ if(PROTOBUF_ROOT)
 endif()
 set(Protobuf_USE_STATIC_LIBS ON)
 find_package(Protobuf MODULE 3.1.0 REQUIRED)
-message("-- Found Protobuf: ${Protobuf_VERSION}")
+message("-- Found Protobuf ${Protobuf_VERSION}")
 
 
 ###############################################

build-scripts/macos/entrypoint_docker_unittests.sh

@@ -59,7 +59,7 @@ endif(CMAKE_TOOLCHAIN_FILE)
 ExternalProject_Add (curlpp_build
    DEPENDS           curl_build
    GIT_REPOSITORY    https://github.com/jpbarrette/curlpp.git
-   GIT_TAG           de69e17c10f481d8e60da30d47f902ca81e52341
+   GIT_TAG           ec1b66e699557cd9d608d322c013a1ebda16bd08
    GIT_CONFIG        advice.detachedHead=false
    PATCH_COMMAND     ${CURLPP_PATHCMD}   
    PREFIX            ${CURLPP_ROOT}

build-scripts/windows/entrypoint_docker.ps1

@@ -14,6 +14,7 @@ list(APPEND OATPP_OPENSSL_BUILD_ARGS "-DOATPP_MSVC_LINK_STATIC_RUNTIME=ON")
 if(NOT WIN32)
    list(APPEND OATPP_OPENSSL_BUILD_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 endif()
+list(APPEND OATPP_OPENSSL_BUILD_ARGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5") # TODO remove when OATPP version will be > 1.3.0
 
 
 if(CMAKE_TOOLCHAIN_FILE)

build-scripts/windows/entrypoint_docker_unittests.ps1

@@ -15,6 +15,7 @@ list(APPEND OATPP_WEBSOCKET_BUILD_ARGS "-DOATPP_MSVC_LINK_STATIC_RUNTIME=ON")
 if(NOT WIN32)
    list(APPEND OATPP_WEBSOCKET_BUILD_ARGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
 endif()
+list(APPEND OATPP_WEBSOCKET_BUILD_ARGS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5") # TODO remove when OATPP version will be > 1.3.0
 
 
 if(CMAKE_TOOLCHAIN_FILE)