Merge pull request rdkcentral#1397 from vijs/sprint/2103 (DELIA-49468)

DELIA-49468: Fixed MODULE_NAME
jaroslaw-bojko-red · Jul 14, 2021 · 2091b20 · 2091b20
1 parent 3ca2480
commit 2091b20
Show file tree

Hide file tree

Showing 46 changed files with 59 additions and 35 deletions.
diff --git a/AVInput/CMakeLists.txt b/AVInput/CMakeLists.txt
@@ -32,6 +32,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 target_link_libraries(${MODULE_NAME}

diff --git a/AVInput/Module.h b/AVInput/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME AVInput
+#define MODULE_NAME Plugin_AVInput
 #endif
 
 #include <plugins/plugins.h>

diff --git a/ActivityMonitor/Module.h b/ActivityMonitor/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME CoPilot
+#define MODULE_NAME Plugin_ActivityMonitor
 #endif
 
 #include <plugins/plugins.h>

diff --git a/Bluetooth/Module.h b/Bluetooth/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Bluetooth
+#define MODULE_NAME Plugin_Bluetooth
 #endif
 
 #include <plugins/plugins.h>

diff --git a/CompositeInput/Module.h b/CompositeInput/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME CompositeInput
+#define MODULE_NAME Plugin_CompositeInput
 #endif
 
 #include <plugins/plugins.h>

diff --git a/ContinueWatching/Module.h b/ContinueWatching/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME ContinueWatching
+#define MODULE_NAME Plugin_ContinueWatching
 #endif
 
 #include <plugins/plugins.h>

diff --git a/ControlService/Module.h b/ControlService/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME VrexManager
+#define MODULE_NAME Plugin_ControlService
 #endif
 
 #include <plugins/plugins.h>

diff --git a/DataCapture/Module.h b/DataCapture/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DataCapture
+#define MODULE_NAME Plugin_DataCapture
 #endif
 
 #include <plugins/plugins.h>

diff --git a/DeviceDiagnostics/Module.h b/DeviceDiagnostics/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DeviceDiagnostics
+#define MODULE_NAME Plugin_DeviceDiagnostics
 #endif
 
 #include <plugins/plugins.h>

diff --git a/DisplayInfo/CMakeLists.txt b/DisplayInfo/CMakeLists.txt
@@ -38,6 +38,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_link_libraries(${MODULE_NAME}
     PRIVATE
         CompileSettingsDebug::CompileSettingsDebug

diff --git a/DisplaySettings/CMakeLists.txt b/DisplaySettings/CMakeLists.txt
@@ -30,6 +30,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 find_package(DS)

diff --git a/DisplaySettings/Module.h b/DisplaySettings/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME DisplaySettings
+#define MODULE_NAME Plugin_DisplaySettings
 #endif
 
 #include <plugins/plugins.h>

diff --git a/FrameRate/FrameRate.h b/FrameRate/FrameRate.h
@@ -21,9 +21,8 @@
 
 #include <mutex>
 
-#include "tptimer.h"
-
 #include "Module.h"
+#include "tptimer.h"
 #include "utils.h"
 #include "AbstractPlugin.h"
 

diff --git a/FrameRate/Module.h b/FrameRate/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME FrameRate
+#define MODULE_NAME Plugin_FrameRate
 #endif
 
 #include <plugins/plugins.h>

diff --git a/FrontPanel/CMakeLists.txt b/FrontPanel/CMakeLists.txt
@@ -31,6 +31,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_package(DS)
 if (DS_FOUND)
     find_package(IARMBus)

diff --git a/FrontPanel/Module.h b/FrontPanel/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME FrontPanel
+#define MODULE_NAME Plugin_FrontPanel
 #endif
 
 #include <plugins/plugins.h>

diff --git a/HdcpProfile/Module.h b/HdcpProfile/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdcpProfile
+#define MODULE_NAME Plugin_HdcpProfile
 #endif
 
 #include <plugins/plugins.h>

diff --git a/HdmiCec/Module.h b/HdmiCec/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiCec
+#define MODULE_NAME Plugin_HdmiCec
 #endif
 
 #include <plugins/plugins.h>

diff --git a/HdmiCecSink/CMakeLists.txt b/HdmiCecSink/CMakeLists.txt
@@ -29,6 +29,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_package(DS)
 find_package(IARMBus)
 find_package(CEC)

diff --git a/HdmiCecSink/Module.h b/HdmiCecSink/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiCecSink
+#define MODULE_NAME Plugin_HdmiCecSink
 #endif
 
 #include <plugins/plugins.h>

diff --git a/HdmiCec_2/Module.h b/HdmiCec_2/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiCec_2
+#define MODULE_NAME Plugin_HdmiCec_2
 #endif
 
 #include <plugins/plugins.h>

diff --git a/HdmiInput/Module.h b/HdmiInput/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME HdmiInput
+#define MODULE_NAME Plugin_HdmiInput
 #endif
 
 #include <plugins/plugins.h>

diff --git a/LoggingPreferences/Module.h b/LoggingPreferences/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME LoggingPreferences
+#define MODULE_NAME Plugin_LoggingPreferences
 #endif
 
 #include <plugins/plugins.h>

diff --git a/MaintenanceManager/CMakeLists.txt b/MaintenanceManager/CMakeLists.txt
@@ -33,6 +33,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 

diff --git a/MaintenanceManager/Module.h b/MaintenanceManager/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME MaintenanceManager
+#define MODULE_NAME Plugin_MaintenanceManager
 #endif
 
 #include <plugins/plugins.h>

diff --git a/MotionDetection/Module.h b/MotionDetection/Module.h
@@ -21,7 +21,7 @@
 #define __MODULE_PLUGIN_MOTION_DETECTION_MODULE_H
 
 #ifndef MODULE_NAME
-#define MODULE_NAME MotionDetection
+#define MODULE_NAME Plugin_MotionDetection
 #endif
 
 #include <plugins/plugins.h>

diff --git a/Network/Module.h b/Network/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Network
+#define MODULE_NAME Plugin_Network
 #endif
 
 #include <plugins/plugins.h>

diff --git a/OCIContainer/Module.h b/OCIContainer/Module.h
@@ -1,6 +1,6 @@
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME OCIContainer
+#define MODULE_NAME Plugin_OCIContainer
 #endif
 
 #include <plugins/plugins.h>

diff --git a/PersistentStore/Module.h b/PersistentStore/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME PersistentStore
+#define MODULE_NAME Plugin_PersistentStore
 #endif
 
 #include <plugins/plugins.h>

diff --git a/RDKShell/CMakeLists.txt b/RDKShell/CMakeLists.txt
@@ -41,6 +41,8 @@ if (PLUGIN_RDKSHELL_READ_MAC_ON_STARTUP)
   set(PLUGIN_RDKSHELL_EXTRA_LIBRARIES "-lFactory-hal")
 endif (PLUGIN_RDKSHELL_READ_MAC_ON_STARTUP)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers ${IARMBUS_INCLUDE_DIRS} )
 
 set(RDKSHELL_INCLUDES $ENV{RDKSHELL_INCLUDES})

diff --git a/RDKShell/Module.h b/RDKShell/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME RDKShell
+#define MODULE_NAME Plugin_RDKShell
 #endif
 
 #include <plugins/plugins.h>

diff --git a/RemoteActionMapping/CMakeLists.txt b/RemoteActionMapping/CMakeLists.txt
@@ -32,6 +32,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 target_include_directories(${MODULE_NAME} PRIVATE ../helpers)
 
 find_package(CTRLM)

diff --git a/RemoteActionMapping/Module.h b/RemoteActionMapping/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME RemoteActionMapping
+#define MODULE_NAME Plugin_RemoteActionMapping
 #endif
 
 #include <plugins/plugins.h>

diff --git a/ScreenCapture/CMakeLists.txt b/ScreenCapture/CMakeLists.txt
@@ -29,6 +29,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_path(FRAMEBUFFER_API_HEADER NAMES framebuffer-api.h)
 if (NOT ${FRAMEBUFFER_API_HEADER} STREQUAL "FRAMEBUFFER_API_HEADER-NOTFOUND")
     message("Found framebuffer-api.h")

diff --git a/ScreenCapture/Module.h b/ScreenCapture/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME ScreenCapture
+#define MODULE_NAME Plugin_ScreenCapture
 #endif
 
 #include <plugins/plugins.h>

diff --git a/ScreenCapture/ScreenCapture.h b/ScreenCapture/ScreenCapture.h
@@ -22,9 +22,8 @@
 #include <mutex>
 #include <vector>
 
-#include "tptimer.h"
-
 #include "Module.h"
+#include "tptimer.h"
 #include "utils.h"
 #include "AbstractPlugin.h"
 

diff --git a/SystemServices/CMakeLists.txt b/SystemServices/CMakeLists.txt
@@ -40,6 +40,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 

diff --git a/SystemServices/Module.h b/SystemServices/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME SystemServices
+#define MODULE_NAME Plugin_SystemServices
 #endif
 
 #include <plugins/plugins.h>

diff --git a/Timer/CMakeLists.txt b/Timer/CMakeLists.txt
@@ -30,6 +30,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 

diff --git a/Timer/Module.h b/Timer/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Timer
+#define MODULE_NAME Plugin_Timer
 #endif
 
 #include <plugins/plugins.h>

diff --git a/UsbAccess/Module.h b/UsbAccess/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME UsbAccess
+#define MODULE_NAME Plugin_UsbAccess
 #endif
 
 #include <plugins/plugins.h>

diff --git a/UserPreferences/Module.h b/UserPreferences/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME UserPreferences
+#define MODULE_NAME Plugin_UserPreferences
 #endif
 
 #include <plugins/plugins.h>

diff --git a/Warehouse/CMakeLists.txt b/Warehouse/CMakeLists.txt
@@ -32,6 +32,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=Plugin_${PLUGIN_NAME})
+
 find_package(DS)
 if (DS_FOUND)
     find_package(IARMBus)

diff --git a/Warehouse/Module.h b/Warehouse/Module.h
@@ -19,7 +19,7 @@
 
 #pragma once
 #ifndef MODULE_NAME
-#define MODULE_NAME Warehouse
+#define MODULE_NAME Plugin_Warehouse
 #endif
 
 #include <plugins/plugins.h>