Renaming WPEFramework to Thunder

CMakeLists.txt

@@ -18,7 +18,7 @@
 cmake_minimum_required(VERSION 3.3)
 project(NanoServicesRDK)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 option(PLUGIN_DEVICEIDENTIFICATION "Include DeviceIdentification plugin" OFF)
 option(PLUGIN_DEVICEINFO "Include DeviceInfo plugin" OFF)

DeviceIdentification/CMakeLists.txt

@@ -19,7 +19,7 @@ project(DeviceIdentification)
 
 cmake_minimum_required(VERSION 3.3)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 

DeviceIdentification/DeviceIdentification.cpp

@@ -21,7 +21,7 @@
 #include "IdentityProvider.h"
 #include <interfaces/IConfiguration.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     namespace {
@@ -200,4 +200,4 @@ namespace Plugin {
         }
     }
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

DeviceIdentification/DeviceIdentification.h

@@ -22,7 +22,7 @@
 #include "Module.h"
 #include <interfaces/json/JsonData_DeviceIdentification.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class DeviceIdentification : public PluginHost::IPlugin, public PluginHost::JSONRPC {
@@ -108,4 +108,4 @@ namespace Plugin {
     };
 
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder

DeviceIdentification/DeviceIdentificationJsonRpc.cpp

@@ -19,7 +19,7 @@
 
 #include "DeviceIdentification.h"
 
-namespace WPEFramework {
+namespace Thunder {
 
 namespace Plugin {
 

DeviceIdentification/Implementation/Amlogic/Amlogic.cpp

@@ -2,7 +2,7 @@
 
 #include <fstream>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
     class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {
         static constexpr const TCHAR* ChipsetInfo= _T("T962X3");

DeviceIdentification/Implementation/Broadcom/Broadcom.cpp

@@ -21,7 +21,7 @@
 
 #include <fstream>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
 class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {

DeviceIdentification/Implementation/Linux/Linux.cpp

@@ -23,7 +23,7 @@
 #include <fstream>
 #include <sys/utsname.h>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
     class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier, public Exchange::IConfiguration {
     private:
@@ -51,7 +51,7 @@ namespace Plugin {
         };
 
     private:
-       class AdapterObserver : public WPEFramework::Core::AdapterObserver::INotification {
+       class AdapterObserver : public Thunder::Core::AdapterObserver::INotification {
         public:
             static int32_t constexpr WaitTime = 5000; //Just wait for 5 seconds
 

DeviceIdentification/Implementation/MFR/MFR.cpp

@@ -25,7 +25,7 @@ extern "C" {
 #include <mfrApi.h>
 }
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
     class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {
 

DeviceIdentification/Implementation/RPI/RPI.cpp

@@ -22,7 +22,7 @@
 #include <bcm_host.h>
 #include <fstream>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {
@@ -92,7 +92,7 @@ namespace Plugin {
         }
         inline void UpdateDeviceIdentifier(string& identifier) const
         {
-            WPEFramework::Core::File serialFile(SerialInfoPath);
+            Thunder::Core::File serialFile(SerialInfoPath);
             if (serialFile.Open(true) == true) {
                 uint8_t* serialInfo = static_cast<uint8_t*>(ALLOCA(serialFile.Size()));
                 uint32_t size = serialFile.Read(serialInfo, static_cast<uint32_t>(serialFile.Size()));

DeviceIdentification/Implementation/Realtek/Realtek.cpp

@@ -20,7 +20,7 @@
 
 #include <fstream>
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {

DeviceIdentification/cmake/FindBCM_HOST.cmake

@@ -0,0 +1,62 @@
+# - Try to find bcm_host.
+# Once done, this will define
+#
+#  BCM_HOST_FOUND - the bcm_host is available
+#  BCM_HOST::BCM_HOST - The bcm_host library and all its dependecies
+#
+# Copyright (C) 2019 RDK Management
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+if(BCM_HOST_FIND_QUIETLY)
+    set(_BCM_HOST_MODE QUIET)
+elseif(BCM_HOST_FIND_REQUIRED)
+    set(_BCM_HOST_MODE REQUIRED)
+endif()
+
+find_package(PkgConfig)
+pkg_check_modules(PC_BCM_HOST ${_BCM_HOST_MODE} bcm_host)
+
+if(${PC_BCM_HOST_FOUND})
+    find_library(BCM_HOST_LIBRARY bcm_host
+        HINTS ${PC_BCM_LIBDIR} ${PC_BCM_LIBRARY_DIRS}
+    )
+    set(BCM_LIBRARIES ${PC_BCM_HOST_LIBRARIES})
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(BCM_HOST DEFAULT_MSG PC_BCM_HOST_FOUND PC_BCM_HOST_INCLUDE_DIRS BCM_HOST_LIBRARY PC_BCM_HOST_LIBRARIES)
+    mark_as_advanced(PC_BCM_HOST_INCLUDE_DIRS PC_BCM_HOST_LIBRARIES)
+
+    if(BCM_HOST_FOUND AND NOT TARGET BCM_HOST::BCM_HOST)
+        add_library(BCM_HOST::BCM_HOST UNKNOWN IMPORTED)
+
+        set_target_properties(BCM_HOST::BCM_HOST
+            PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION "${BCM_HOST_LIBRARY}"
+                INTERFACE_COMPILE_DEFINITIONS "PLATFORM_RPI"
+                INTERFACE_COMPILE_OPTIONS "${PC_BCM_HOST_CFLAGS_OTHER}"
+                INTERFACE_INCLUDE_DIRECTORIES "${PC_BCM_HOST_INCLUDE_DIRS}"
+                INTERFACE_LINK_LIBRARIES "${PC_BCM_HOST_LIBRARIES}"
+                )
+    endif()
+endif()

DeviceIdentification/cmake/FindNEXUS.cmake

@@ -0,0 +1,83 @@
+# - Try to find Broadcom Nexus.
+# Once done this will define
+#  NEXUS_FOUND  - System has Nexus
+#  NEXUS::NEXUS - The Nexus library
+#
+# Copyright (C) 2019 RDK Management
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_path(LIBNEXUS_INCLUDE nexus_config.h
+        PATH_SUFFIXES refsw)
+
+find_library(LIBNEXUS_LIBRARY nexus)
+
+if(EXISTS "${LIBNEXUS_LIBRARY}")
+    find_library(LIBB_OS_LIBRARY b_os)
+    find_library(LIBNEXUS_CLIENT_LIBRARY nexus_client)
+    find_library(LIBNXCLIENT_LIBRARY nxclient)
+
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(NEXUS DEFAULT_MSG LIBNEXUS_INCLUDE LIBNEXUS_LIBRARY)
+    mark_as_advanced(LIBNEXUS_INCLUDE LIBNEXUS_LIBRARY)
+
+    if(NEXUS_FOUND AND NOT TARGET NEXUS::NEXUS)
+        add_library(NEXUS::NEXUS UNKNOWN IMPORTED)
+        set_target_properties(NEXUS::NEXUS PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                INTERFACE_INCLUDE_DIRECTORIES "${LIBNEXUS_INCLUDE}"
+                    )
+
+        if(NOT EXISTS "${LIBNEXUS_CLIENT_LIBRARY}")
+            message(STATUS "Nexus in Proxy mode")
+            set_target_properties(NEXUS::NEXUS PROPERTIES
+                    IMPORTED_LOCATION "${LIBNEXUS_LIBRARY}"
+                    )
+        else()
+            message(STATUS "Nexus in Client mode")
+            set_target_properties(NEXUS::NEXUS PROPERTIES
+                    IMPORTED_LOCATION "${LIBNEXUS_CLIENT_LIBRARY}"
+                    )
+        endif()
+
+        if(NOT EXISTS "${LIBNXCLIENT_LIBRARY}")
+            set_target_properties(NEXUS::NEXUS PROPERTIES
+                    INTERFACE_COMPILE_DEFINITIONS NO_NXCLIENT
+                    )
+        endif()
+
+        if(EXISTS "${LIBB_OS_LIBRARY}")
+            set_target_properties(NEXUS::NEXUS PROPERTIES
+                    IMPORTED_LINK_INTERFACE_LIBRARIES "${LIBB_OS_LIBRARY}"
+                    )
+        endif()
+    endif()
+    set_target_properties(NEXUS::NEXUS PROPERTIES
+            INTERFACE_COMPILE_DEFINITIONS "PLATFORM_BRCM"
+            )
+else()
+    if(NEXUS_FIND_REQUIRED)
+        message(FATAL_ERROR "LIBNEXUS_LIBRARY not available")
+    elseif(NOT NEXUS_FIND_QUIETLY)
+        message(STATUS "LIBNEXUS_LIBRARY not available")
+    endif()
+endif()

DeviceIdentification/cmake/FindNXCLIENT.cmake

@@ -0,0 +1,53 @@
+# - Try to find Broadcom Nexus client.
+# Once done this will define
+#  NXCLIENT_FOUND     - System has a Nexus client
+#  NXCLIENT::NXCLIENT - The Nexus client library
+#
+# Copyright (C) 2019 RDK Management
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_path(LIBNXCLIENT_INCLUDE nexus_config.h
+        PATH_SUFFIXES refsw)
+
+find_library(LIBNXCLIENT_LIBRARY nxclient)
+
+if(EXISTS "${LIBNXCLIENT_LIBRARY}")
+    include(FindPackageHandleStandardArgs)
+    find_package_handle_standard_args(NXCLIENT DEFAULT_MSG LIBNXCLIENT_INCLUDE LIBNXCLIENT_LIBRARY)
+    mark_as_advanced(LIBNXCLIENT_LIBRARY)
+
+    if(NXCLIENT_FOUND AND NOT TARGET NXCLIENT::NXCLIENT)
+        add_library(NXCLIENT::NXCLIENT UNKNOWN IMPORTED)
+        set_target_properties(NXCLIENT::NXCLIENT PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+                IMPORTED_LOCATION "${LIBNXCLIENT_LIBRARY}"
+                INTERFACE_INCLUDE_DIRECTORIES "${LIBNXCLIENT_INCLUDE}"
+                )
+    endif()
+else()
+    if(NXCLIENT_FIND_REQUIRED)
+        message(FATAL_ERROR "LIBNXCLIENT_LIBRARY not available")
+    elseif(NOT NXCLIENT_FIND_QUIETLY)
+        message(STATUS "LIBNXCLIENT_LIBRARY not available")
+    endif()
+endif()

DeviceIdentification/doc/DeviceIdentificationPlugin.md

@@ -54,7 +54,7 @@ The table below provides and overview of terms and abbreviations used in this do
 | <a name="ref.HTTP">[HTTP](http://www.w3.org/Protocols)</a> | HTTP specification |
 | <a name="ref.JSON-RPC">[JSON-RPC](https://www.jsonrpc.org/specification)</a> | JSON-RPC 2.0 specification |
 | <a name="ref.JSON">[JSON](http://www.json.org/)</a> | JSON specification |
-| <a name="ref.Thunder">[Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx)</a> | Thunder API Reference |
+| <a name="ref.Thunder">[Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx)</a> | Thunder API Reference |
 
 <a name="head.Description"></a>
 # Description

DeviceInfo/CMakeLists.txt

@@ -19,7 +19,7 @@ project(DeviceInfo)
 
 cmake_minimum_required(VERSION 3.3)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 

DeviceInfo/DeviceInfo.cpp

@@ -19,7 +19,7 @@
 
 #include "DeviceInfo.h"
 
-namespace WPEFramework {
+namespace Thunder {
 namespace Plugin {
 
     namespace {
@@ -203,7 +203,7 @@ namespace Plugin {
 
     void DeviceInfo::AddressInfo(Core::JSON::ArrayType<JsonData::DeviceInfo::AddressesData>& addressInfo) const
     {
-        // Get the point of entry on WPEFramework..
+        // Get the point of entry on Thunder..
         Core::AdapterIterator interfaces;
 
         while (interfaces.Next() == true) {
@@ -314,7 +314,7 @@ namespace Plugin {
             while (audioIt->Next(audioOutput)) {
                 JsonData::DeviceInfo::DeviceaudiocapabilitiesData::AudiooutputcapabilitiesData audiocapabilities;
                 audiocapabilities.AudioPort =
-                    static_cast<WPEFramework::JsonData::DeviceInfo::AudioportType>(audioOutput);
+                    static_cast<Thunder::JsonData::DeviceInfo::AudioportType>(audioOutput);
 
                 AudioCapabilities(audioOutput, audiocapabilities.Audiocapabilities);
                 Ms12Capabilities(audioOutput, audiocapabilities.Ms12capabilities);
@@ -413,7 +413,7 @@ namespace Plugin {
             while (videoIt->Next(videoOutput) == true) {
                 JsonData::DeviceInfo::DevicevideocapabilitiesData::VideooutputcapabilitiesData videocapabilities;
                 videocapabilities.VideoDisplay =
-                    static_cast<WPEFramework::JsonData::DeviceInfo::VideodisplayType>(videoOutput);
+                    static_cast<Thunder::JsonData::DeviceInfo::VideodisplayType>(videoOutput);
 
                 Hdcp(videoOutput, videocapabilities.Hdcp);
 
@@ -500,4 +500,4 @@ namespace Plugin {
         }
     }
 } // namespace Plugin
-} // namespace WPEFramework
+} // namespace Thunder