Merge pull request #414 from WebPlatformForEmbedded/development/add-messaging-support

[Messaging] Add entries to enable messaging and coresponding plugin

Author: pwielders

package/wpe/wpeframework-plugins/Config.in

@@ -1217,7 +1217,13 @@ config BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL
     bool "TraceControl"
     help
       TraceControl Plugin
-    
+
+config BR2_PACKAGE_WPEFRAMEWORK_MESSAGECONTROL
+    select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES
+    depends on BR2_PACKAGE_WPEFRAMEWORK_MESSAGING
+    bool "MessageControl"
+    help
+        MessageControl Plugin
 
 config BR2_PACKAGE_WPEFRAMEWORK_WARNINGREPORTINGCONTROL
     select BR2_PACKAGE_WPEFRAMEWORK_RDKSERVICES

package/wpe/wpeframework-rdkservices/wpeframework-rdkservices.mk

@@ -83,6 +83,10 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_TRACECONTROL),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_TRACECONTROL=ON
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_MESSAGECONTROL),y)
+WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_MESSAGECONTROL=ON
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_WARNINGREPORTINGCONTROL),y)
 WPEFRAMEWORK_RDKSERVICES_CONF_OPTS += -DPLUGIN_WARNINGREPORTINGCONTROL=ON
 endif

package/wpe/wpeframework/Config.in

@@ -88,7 +88,19 @@ config BR2_PACKAGE_WPEFRAMEWORK_PROXYSTUB_PATH
     string "proxystub path"
     default "/usr/lib/wpeframework/proxystubs"
 
+config BR2_PACKAGE_WPEFRAMEWORK_MESSAGING
+    bool "Use new messaging"
+    default n
+    help
+      Use a new version of messaging - tracing + logging
+
+config BR2_PACKAGE_WPEFRAMEWORK_MESSAGE_SETTINGS
+    depends on BR2_PACKAGE_WPEFRAMEWORK_MESSAGING
+    string "message settings"
+    default ""
+
 config BR2_PACKAGE_WPEFRAMEWORK_TRACE_SETTINGS
+    depends on !BR2_PACKAGE_WPEFRAMEWORK_MESSAGING
     string "trace settings"
     default ""
 

package/wpe/wpeframework/wpeframework.mk

@@ -61,6 +61,14 @@ ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_WARNING_REPORTING), y)
 WPEFRAMEWORK_CONF_OPTS += -DWARNING_REPORTING=ON
 endif
 
+ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_MESSAGING), y)
+WPEFRAMEWORK_CONF_OPTS += -DMESSAGING=ON
+WPEFRAMEWORK_CONF_OPTS += -DTRACING=OFF
+else
+WPEFRAMEWORK_CONF_OPTS += -DMESSAGING=OFF
+WPEFRAMEWORK_CONF_OPTS += -DTRACING=ON
+endif
+
 ifeq ($(BR2_PACKAGE_WPEFRAMEWORK_EXCEPTION_CATCHING), y)
 WPEFRAMEWORK_CONF_OPTS += -DEXCEPTION_CATCHING=ON
 endif
@@ -73,6 +81,10 @@ ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_TRACE_SETTINGS),"")
 WPEFRAMEWORK_CONF_OPTS += -DTRACE_SETTINGS="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_TRACE_SETTINGS))"
 endif
 
+ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_MESSAGE_SETTINGS),"")
+WPEFRAMEWORK_CONF_OPTS += -DMESSAGE_SETTINGS="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_MESSAGE_SETTINGS))"
+endif
+
 ifneq ($(BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PREFIX),"")
 WPEFRAMEWORK_CONF_OPTS += -DSYSTEM_PREFIX="$(call qstrip,$(BR2_PACKAGE_WPEFRAMEWORK_SYSTEM_PREFIX))"
 endif