diff --git a/.github/workflows/native_full_build.yml b/.github/workflows/native_full_build.yml index 757298bf..b241c8d2 100755 --- a/.github/workflows/native_full_build.yml +++ b/.github/workflows/native_full_build.yml @@ -2,9 +2,9 @@ name: Build Component in Native Environment on: push: - branches: [ main, 'sprint/**', 'release/**', topic/*, develop, topic/RDKEMW-4129 ] + branches: [ main, 'sprint/**', 'release/**', topic/*, develop ] pull_request: - branches: [ main, 'sprint/**', 'release/**', topic/*, develop, topic/RDKEMW-4129 ] + branches: [ main, 'sprint/**', 'release/**', topic/*, develop ] jobs: build-entservices-on-pr: diff --git a/build_dependencies.sh b/build_dependencies.sh index 041b10da..86d6c353 100755 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -26,22 +26,20 @@ cd .. ########################################### # Clone the required repositories -rm -rf iarmbus +rm -rf iarmbus ThunderTools Thunder entservices-apis entservices-testframework gssdp + + git clone https://github.com/rdkcentral/iarmbus.git export IARMBUS_PATH=$GITHUB_WORKSPACE/iarmbus -rm -rf ThunderTools git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git -rm -rf Thunder git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git -rm -rf entservices-apis git clone --branch main https://github.com/rdkcentral/entservices-apis.git -#git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git +git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git -rm -rf gssdp git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git ############################ diff --git a/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch b/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch deleted file mode 100755 index dbb94881..00000000 --- a/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/JsonGenerator/source/class_emitter.py b/JsonGenerator/source/class_emitter.py -index 7f2fb01..67a6469 100644 ---- a/JsonGenerator/source/class_emitter.py -+++ b/JsonGenerator/source/class_emitter.py -@@ -113,7 +113,6 @@ - emit.Line("#include ") - emit.Line() - -- emit.Line("#include \"definitions.h\"") - - if not config.NO_INCLUDES: - if if_file.endswith(".h"): -diff --git a/ProxyStubGenerator/StubGenerator.py b/ProxyStubGenerator/StubGenerator.py -index 6e079b6..d2de681 100755 ---- a/ProxyStubGenerator/StubGenerator.py -+++ b/ProxyStubGenerator/StubGenerator.py -@@ -193,7 +193,7 @@ - - - # Generate interface information in lua --def GenerateLuaData(emit, interfaces_list, enums_list, source_file=None, tree=None, ns=None): -+def GenerateLuaData(emit, interfaces_list, enums_list, project_dir, source_file=None, tree=None, ns=None): - - if not source_file: - assert(tree==None) -@@ -535,7 +535,7 @@ - - return tree - --def GenerateStubs2(output_file, source_file, tree, ns, scan_only=False): -+def GenerateStubs2(output_file, source_file, project_dir, tree, ns, scan_only=False): - log.Info("Scanning '%s' (in %s)..." % (source_file, ns)) - - if not FORCE and (os.path.exists(output_file) and (os.path.getmtime(source_file) < os.path.getmtime(output_file))): -@@ -579,7 +579,7 @@ - emit.Line - emit.Line() - -- if os.path.isfile(os.path.join(os.path.dirname(source_file), "Module.h")): -+ if os.path.isfile(os.path.join(project_dir, "Module.h")): - emit.Line('#include "Module.h"') - - if os.path.isfile(os.path.join(os.path.dirname(source_file), interface_header_name)): -@@ -2085,6 +2085,8 @@ - help="include an additional C++ header file, may be used multiple times (default: include 'Ids.h')") - argparser.add_argument('-I', dest="includePaths", metavar="INCLUDE_DIR", action='append', default=[], type=str, - help='add an include search path, can be used multiple times') -+ argparser.add_argument("--projectdir",dest="project_dir",metavar="DIR",type=str,default="", -+ help="specify the project directory") - - args = argparser.parse_args(sys.argv[1:]) - SHOW_WARNINGS = not args.no_warnings -@@ -2221,7 +2223,10 @@ - - for source_file in interface_files: - try: -- _extra_includes = [ os.path.join("@" + os.path.dirname(source_file), IDS_DEFINITIONS_FILE) ] -+ if args.project_dir is not None: -+ _extra_includes = [ os.path.join("@" + args.project_dir, IDS_DEFINITIONS_FILE) ] -+ else: -+ _extra_includes = [ os.path.join("@" + os.path.dirname(source_file), IDS_DEFINITIONS_FILE) ] - _extra_includes.extend(args.extra_includes) - - tree = Parse(source_file, args.includePaths, -@@ -2242,7 +2247,7 @@ - some_omitted = False - - for ns in INTERFACE_NAMESPACES: -- output, some_omitted = GenerateStubs2(output_file, source_file, tree, ns, scan_only) -+ output, some_omitted = GenerateStubs2(output_file, source_file, args.project_dir, tree, ns, scan_only) - - new_faces += output - -@@ -2265,7 +2270,7 @@ - log.Print("(lua generator) Scanning %s..." % os.path.basename(source_file)) - - for ns in INTERFACE_NAMESPACES: -- GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums, source_file, tree, ns) -+ GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums, args.project_dir, source_file, tree, ns) - - except NotModifiedException as err: - log.Print("skipped file %s, up-to-date" % os.path.basename(output_file)) -@@ -2316,7 +2321,7 @@ - if args.lua_code: - # Epilogue - for ns in INTERFACE_NAMESPACES: -- GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums) -+ GenerateLuaData(Emitter(lua_file, INDENT_SIZE), lua_interfaces, lua_enums,args.project_dir) - log.Print("Created %s (%s interfaces, %s enums)" % (lua_file.name, len(lua_interfaces), len(lua_enums))) - - else: - -diff --git a/cmake/FindProxyStubGenerator.cmake.in b/cmake/FindProxyStubGenerator.cmake.in -index 1344452..a8dbcea 100644 ---- a/cmake/FindProxyStubGenerator.cmake.in -+++ b/cmake/FindProxyStubGenerator.cmake.in. -@@ -31,7 +31,7 @@ function(ProxyStubGenerator) - endif() - - set(optionsArgs SECURE COHERENT TRACES VERBOSE NO_WARNINGS KEEP FORCE_GENERATE) -- set(oneValueArgs OUTDIR) -+ set(oneValueArgs OUTDIR PROJECT_DIR) - set(multiValueArgs INPUT INCLUDE INCLUDE_PATH NAMESPACE) - - cmake_parse_arguments(Argument "${optionsArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) -@@ -81,6 +81,10 @@ function(ProxyStubGenerator) - list(APPEND _execute_command "--outdir" "${Argument_OUTDIR}") - endif() - -+ if(Argument_PROJECT_DIR) -+ list(APPEND _execute_command "--projectdir" "${Argument_PROJECT_DIR}") -+ endif() -+ - foreach(_include ${Argument_INCLUDE}) - list(APPEND _execute_command "-I" "${_include}") - endforeach(_include) diff --git a/entservices-testframework/patches/1004-Add-support-for-project-dir.patch b/entservices-testframework/patches/1004-Add-support-for-project-dir.patch deleted file mode 100755 index 26fdee12..00000000 --- a/entservices-testframework/patches/1004-Add-support-for-project-dir.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Source/plugins/CMakeLists.txt b/Source/plugins/CMakeLists.txt -index 4d362d545..9357c647c 100644 ---- a/Source/plugins/CMakeLists.txt -+++ b/Source/plugins/CMakeLists.txt -@@ -20,14 +20,14 @@ - string(TOLOWER ${NAMESPACE} NAMESPACE_LIB) - - option(VIRTUALINPUT_TOOLS "Build VirtualInput tools" OFF) -- --ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IPlugin.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") --ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IShell.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") --ProxyStubGenerator(NAMESPACE "WPEFramework::Exchange" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IController.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..") --ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IControllerDeprecated.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/..") --ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IStateControl.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") --ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") --ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+set(PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IPlugin.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR}) -+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IShell.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR}) -+ProxyStubGenerator(NAMESPACE "WPEFramework::Exchange" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IController.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." PROJECT_DIR ${PROJECT_DIR}) -+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IControllerDeprecated.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." PROJECT_DIR ${PROJECT_DIR}) -+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IStateControl.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR}) -+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR}) -+ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR}) - - JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES LEGACY_ALT) - -diff --git a/Source/com/CMakeLists.txt b/Source/com/CMakeLists.txt -index 1de9ac176..bcf9489d1 100644 ---- a/Source/com/CMakeLists.txt -+++ b/Source/com/CMakeLists.txt -@@ -16,8 +16,8 @@ - # limitations under the License. - - set(TARGET ${NAMESPACE}COM) -- --ProxyStubGenerator(NAMESPACE "WPEFramework::RPC" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ICOM.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+set(PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") -+ProxyStubGenerator(NAMESPACE "WPEFramework::RPC" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ICOM.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated" PROJECT_DIR ${PROJECT_DIR}) - - add_library(${TARGET} SHARED - Administrator.cpp diff --git a/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch b/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch deleted file mode 100755 index c8fd3213..00000000 --- a/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Sitaram, Soundaryaa -Date: 05 Feb 2025 17:24:43 +0000 -Subject: [PATCH] ENTOS IDs offset to be adjusted in rdkservices-apis - -Upstream-Status: None -Signed-off-by: ssitar583 ---- -diff --git a/Source/com/Ids.h b/Source/com/Ids.h -index cf2060333..75d235bbd 100644 ---- a/Source/com/Ids.h -+++ b/Source/com/Ids.h -@@ -74,7 +74,8 @@ namespace RPC { - ID_COMREQUEST_NOTIFICATION = (ID_OFFSET_INTERNAL + 0x003D), - ID_SYSTEM_METADATA = (ID_OFFSET_INTERNAL + 0x003E), - -- ID_EXTERNAL_INTERFACE_OFFSET = (ID_OFFSET_INTERNAL + 0x0040) -+ ID_EXTERNAL_INTERFACE_OFFSET = (ID_OFFSET_INTERNAL + 0x0040), -+ ID_EXTERNAL_CC_INTERFACE_OFFSET = (0xCC00) // ends on 0xDFFF - }; - } - } diff --git a/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch b/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch deleted file mode 100755 index c5b4a36f..00000000 --- a/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 810aae64cb31c907698e468b615797750094b847 -Author: Pesala Lakshmi Jwala Priya -Date: Thu Aug 29 12:31:30 2024 +0530 - - Alt change - -diff --git a/Source/plugins/CMakeLists.txt b/Source/plugins/CMakeLists.txt -index 4d362d54..cdb53cdc 100644 ---- a/Source/plugins/CMakeLists.txt -+++ b/Source/plugins/CMakeLists.txt -@@ -29,7 +29,7 @@ ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_S - ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") - ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated") - --JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES) -+JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES LEGACY_ALT) - - add_library(${TARGET} SHARED - Channel.cpp - diff --git a/entservices-testframework/patches/error_code_R4_4.patch b/entservices-testframework/patches/error_code_R4_4.patch deleted file mode 100644 index 954ca083..00000000 --- a/entservices-testframework/patches/error_code_R4_4.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/Source/WPEFramework/PluginServer.h b/Source/WPEFramework/PluginServer.h -index e87933d9a..591385222 100644 ---- a/Source/WPEFramework/PluginServer.h -+++ b/Source/WPEFramework/PluginServer.h -@@ -1535,6 +1535,22 @@ namespace PluginHost { - response->Error.SetError(Core::ERROR_ILLEGAL_STATE); - response->Error.Text = _T("The service is in an illegal state!!!."); - break; -+ case Core::ERROR_INVALID_PARAMETER: -+ response->Error.SetError(Core::ERROR_INVALID_SIGNATURE); -+ response->Error.Text = _T("Invalid Parameter"); -+ break; -+ case Core::ERROR_INVALID_DEVICENAME: -+ response->Error.SetError(Core::ERROR_INVALID_DEVICENAME); -+ response->Error.Text = _T("Invalid device name"); -+ break; -+ case Core::ERROR_INVALID_MOUNTPOINT: -+ response->Error.SetError(Core::ERROR_INVALID_MOUNTPOINT); -+ response->Error.Text = _T("Invalid mount path"); -+ break; -+ case Core::ERROR_FIRMWAREUPDATE_INPROGRESS: -+ response->Error.SetError(Core::ERROR_FIRMWAREUPDATE_INPROGRESS); -+ response->Error.Text = _T("Firmware update already in progress"); -+ break; - case static_cast(~0): - response.Release(); - break; -diff --git a/Source/core/JSONRPC.h b/Source/core/JSONRPC.h -index a9c4360fb..5fcef161d 100644 ---- a/Source/core/JSONRPC.h -+++ b/Source/core/JSONRPC.h -@@ -98,6 +98,15 @@ namespace Core { - case Core::ERROR_TIMEDOUT: - Code = -32000; // Server defined, now mapped to Timed out - break; -+ case Core::ERROR_INVALID_DEVICENAME: -+ Code = -32001; // Invalid device name -+ break; -+ case Core::ERROR_INVALID_MOUNTPOINT: -+ Code = -32002; // Invalid mount path -+ break; -+ case Core::ERROR_FIRMWAREUPDATE_INPROGRESS: -+ Code = -32003; // Firmware update inprogress -+ break; - default: - Code = static_cast(frameworkError); - break; -diff --git a/Source/core/Portability.h b/Source/core/Portability.h -index 01e34d398..a5728eebf 100644 ---- a/Source/core/Portability.h -+++ b/Source/core/Portability.h -@@ -874,7 +874,11 @@ namespace Core { - ERROR_CODE(ERROR_HIBERNATED, 46) \ - ERROR_CODE(ERROR_INPROC, 47) \ - ERROR_CODE(ERROR_FAILED_REGISTERED, 48) \ -- ERROR_CODE(ERROR_FAILED_UNREGISTERED, 49) -+ ERROR_CODE(ERROR_FAILED_UNREGISTERED, 49) \ -+ ERROR_CODE(ERROR_INVALID_PARAMETER, 54) \ -+ ERROR_CODE(ERROR_INVALID_DEVICENAME, 59) \ -+ ERROR_CODE(ERROR_INVALID_MOUNTPOINT, 60) \ -+ ERROR_CODE(ERROR_FIRMWAREUPDATE_INPROGRESS,61) - - #define ERROR_CODE(CODE, VALUE) CODE = VALUE, -