Merge branch 'master' into master

rdkcentral · Jun 21, 2024 · f9a7fa4 · f9a7fa4
2 parents 1b85e7f + 497cde7
commit f9a7fa4
Show file tree

Hide file tree

Showing 93 changed files with 143 additions and 143 deletions.
diff --git a/.github/workflows/Build ThunderInterfaces on Linux.yml b/.github/workflows/Build ThunderInterfaces on Linux.yml
@@ -1,6 +1,7 @@
 name: Build ThunderInterfaces on Linux
 
 on:
+  workflow_dispatch:
   push:
     branches: ["master"]
   pull_request:

diff --git a/.github/workflows/Build ThunderInterfaces on Windows.yml b/.github/workflows/Build ThunderInterfaces on Windows.yml
@@ -1,6 +1,7 @@
 name: Build ThunderInterfaces on Windows
 
 on:
+  workflow_dispatch:
   push:
     branches: ["master"]
   pull_request:
@@ -23,48 +24,50 @@ jobs:
 
     name: Build type - ${{matrix.type}}${{matrix.version}}
     steps:
+# ----- Checkout -----
     - name: Checkout ThunderOnWindows
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows
         repository: WebPlatformForEmbedded/ThunderOnWindows
 
     - name: Checkout Thunder
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows/Thunder
         repository: ${{github.repository_owner}}/Thunder
 
     - name: Checkout ThunderTools
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows/ThunderTools
         repository: ${{github.repository_owner}}/ThunderTools
 
     - name: Checkout ThunderClientLibraries
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows/ThunderClientLibraries
         repository: ${{github.repository_owner}}/ThunderClientLibraries
 
     - name: Checkout ThunderInterfaces
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows/ThunderInterfaces
         repository: ${{github.repository_owner}}/ThunderInterfaces
 
     - name: Checkout ThunderNanoServices
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows/ThunderNanoServices
         repository: ${{github.repository_owner}}/ThunderNanoServices
 
     - name: Checkout ThunderNanoServicesRDK
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderOnWindows/ThunderNanoServicesRDK
         repository: WebPlatformForEmbedded/ThunderNanoServicesRDK
 
+# ----- Building -----
     - name: Install jsonref
       run: pip install jsonref
 
@@ -74,12 +77,13 @@ jobs:
         cd ThunderOnWindows
         && "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%definitions%"  "%solution%"
         && "%devEnv%" /Build "${{matrix.type}}|x${{matrix.version}}" /Project "%interfaces%"  "%solution%"
-        
+
+# ----- Articats -----
     - name: Tar files
       run: tar -czvf ${{matrix.type}}${{matrix.version}}.tar.gz artifacts
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ThunderInterfaces-${{matrix.type}}${{matrix.version}}-artifact
         path: ${{matrix.type}}${{matrix.version}}.tar.gz
diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
@@ -12,10 +12,11 @@ jobs:
       matrix:
         build_type: [Debug, Release, MinSizeRel]
 
+# ----- Packages & artifacts -----
     name: Build type - ${{matrix.build_type}}
     steps:
     - name: Install necessary packages
-      uses: nick-fields/retry@v2
+      uses: nick-fields/retry@v3
       with:
         timeout_minutes: 10
         max_attempts: 10
@@ -27,14 +28,8 @@ jobs:
           pip install jsonref
           sudo apt install build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
 
-    - name: Checkout Thunder
-      uses: actions/checkout@v3
-      with:
-        path: Thunder
-        repository: rdkcentral/Thunder
-
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: Thunder-${{matrix.build_type}}-artifact
         path: ${{matrix.build_type}}
@@ -44,10 +39,10 @@ jobs:
         tar -xvzf ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
         rm ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
 
-# ----- ThunderInterfaces -----
+# ----- Regex & checkout -----
     - name: Checkout ThunderInterfaces - default
       if: ${{ !contains(github.event.pull_request.body, '[DependsOn=ThunderInterfaces:') }}
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderInterfaces
         repository: rdkcentral/ThunderInterfaces
@@ -63,13 +58,13 @@ jobs:
 
     - name: Checkout ThunderInterfaces - ${{steps.thunderinterfaces.outputs.first_match}}
       if: contains(github.event.pull_request.body, '[DependsOn=ThunderInterfaces:')
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: ThunderInterfaces
         repository: rdkcentral/ThunderInterfaces
         ref: ${{steps.thunderinterfaces.outputs.first_match}}
 
-# ----- Building -----
+# ----- Building & uploading -----
     - name: Build ThunderInterfaces
       run: |
         cmake -G Ninja -S ThunderInterfaces -B ${{matrix.build_type}}/build/ThunderInterfaces \
@@ -82,7 +77,7 @@ jobs:
       run: tar -czvf ${{matrix.build_type}}.tar.gz ${{matrix.build_type}}
 
     - name: Upload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ThunderInterfaces-${{matrix.build_type}}-artifact
         path: ${{matrix.build_type}}.tar.gz
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# If not stated otherwise in this file or this component's license file the
+# If not stated otherwise in this file or this component's license file the 
 # following copyright and licenses apply:
 #
 # Copyright 2020 Metrological
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.12)
 
 project(Interfaces)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 set(INTERFACES_PATTERNS "I*.h" CACHE STRING "Patterns matching files for which stubs should be generated")
 set(JSONRPC_PATTERNS "*.json" CACHE STRING "Patterns matching files for which json stubs should be generated")

diff --git a/definitions/CMakeLists.txt b/definitions/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(Definitions)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
@@ -58,7 +58,7 @@ endif()
 JsonGenerator(CODE INPUT ${JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/")
 JsonGenerator(CODE INPUT ${QA_JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../qa_interfaces/" IFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../jsonrpc/" CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json")
 JsonGenerator(CODE INPUT ${INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
-JsonGenerator(CODE NAMESPACE  WPEFramework::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
+JsonGenerator(CODE NAMESPACE  Thunder::QualityAssurance INPUT ${QA_INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/qa_generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPP_INTERFACE_PATH "qa_interfaces" JSON_INTERFACE_PATH "qa_interfaces/json" )
 
 file(GLOB JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/JsonEnum*.cpp")
 file(GLOB JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/generated/J*.h")

diff --git a/definitions/Definitions.cpp b/definitions/Definitions.cpp
@@ -98,7 +98,7 @@
 #include <qa_interfaces/ITestAutomation.h>
 #endif
 
-namespace WPEFramework {
+namespace Thunder {
 
 struct ScreenResolutionWidthHeight {
     Exchange::IDeviceVideoCapabilities::ScreenResolution resolution;

diff --git a/definitions/ValuePoint.h b/definitions/ValuePoint.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 #include <interfaces/IValuePoint.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     class ValuePoint : public IValuePoint {

diff --git a/definitions/definitions.h b/definitions/definitions.h
@@ -42,7 +42,7 @@
 #include <interfaces/json/ExternalMetadata.h>
 #include <interfaces/IDeviceInfo.h>
 
-namespace WPEFramework {
+namespace Thunder {
 
 	ENUM_CONVERSION_HANDLER(Exchange::IComposition::ScreenResolution)
 	ENUM_CONVERSION_HANDLER(Exchange::IStream::streamtype)

diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.3)
 
 project(Marshalling)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 

diff --git a/interfaces/IAVNClient.h b/interfaces/IAVNClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IAVNClient : virtual public Core::IUnknown {

diff --git a/interfaces/IAVSClient.h b/interfaces/IAVSClient.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed
@@ -68,4 +68,4 @@ namespace Exchange {
     };
 
 } // Exchange
-} // WPEFramework
+} // Thunder
diff --git a/interfaces/IAmazonPrime.h b/interfaces/IAmazonPrime.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed

diff --git a/interfaces/IApplication.h b/interfaces/IApplication.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0 @uncompliant:collapsed

diff --git a/interfaces/IBluetooth.h b/interfaces/IBluetooth.h
@@ -21,7 +21,7 @@
 #include "Module.h"
 
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 

diff --git a/interfaces/IBluetoothAudio.h b/interfaces/IBluetoothAudio.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 

diff --git a/interfaces/IBrowser.h b/interfaces/IBrowser.h
@@ -22,7 +22,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives direct access to a Browser to change

diff --git a/interfaces/IButler.h b/interfaces/IButler.h
@@ -25,7 +25,7 @@
 
 // @stubgen:include <com/IIteratorType.h>
 
-namespace WPEFramework {
+namespace Thunder {
 	namespace Exchange {
 
 		struct IValuePoint;

diff --git a/interfaces/ICapture.h b/interfaces/ICapture.h
@@ -22,7 +22,7 @@
 
 
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit

diff --git a/interfaces/ICommand.h b/interfaces/ICommand.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // This interface gives the possibility to create/defines commmands to be executed by

diff --git a/interfaces/IComposition.h b/interfaces/IComposition.h
@@ -25,7 +25,7 @@
 
 // @insert "IDeviceInfo.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IComposition : virtual public Core::IUnknown {
@@ -82,7 +82,7 @@ namespace Exchange {
                 virtual uint64_t Modifier() = 0;
             };
 
-            virtual WPEFramework::Core::instance_id Native() const { return 0; };
+            virtual Thunder::Core::instance_id Native() const { return 0; };
             virtual string Name() const = 0;
             virtual void Opacity(const uint32_t value) = 0;
             virtual uint32_t Opacity() const { return 0; };
@@ -116,7 +116,7 @@ namespace Exchange {
 
             ~IDisplay() override = default;
 
-            virtual WPEFramework::Core::instance_id Native() const = 0;
+            virtual Thunder::Core::instance_id Native() const = 0;
             virtual string Port() const = 0;
 
             virtual IClient* CreateClient(const string& name, const uint32_t width, const uint32_t height) = 0;

diff --git a/interfaces/ICompositionBuffer.h b/interfaces/ICompositionBuffer.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @stubgen:omit
@@ -79,4 +79,4 @@ namespace Exchange {
 
 } // namespace Exchange
 
-} // namespace WPEFramework
+} // namespace Thunder
diff --git a/interfaces/IConfiguration.h b/interfaces/IConfiguration.h
@@ -20,7 +20,7 @@
 #pragma once
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     struct EXTERNAL IConfiguration : virtual public Core::IUnknown {

diff --git a/interfaces/IContentDecryption.h b/interfaces/IContentDecryption.h
@@ -22,7 +22,7 @@
 #include "Module.h"
 #include "IDRM.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Exchange {
 

diff --git a/interfaces/ICryptography.h b/interfaces/ICryptography.h
@@ -21,7 +21,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     enum CryptographyVault : uint8_t {

diff --git a/interfaces/ICustomerCareOperations.h b/interfaces/ICustomerCareOperations.h
@@ -20,7 +20,7 @@
 
 #include "Module.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Exchange {
 
     // @json 1.0.0