Fixing network logging build

Change-Id: Ib8f184875b41c33fec6b2826daaacd6558ba3a6e

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index cde27d6..802f5aa 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -412,7 +412,7 @@ MESSAGE( STATUS "Data Dir (Read/Write):            ${dataReadWriteDir}")
 MESSAGE( STATUS "Data Dir (Read Only):             ${dataReadOnlyDir}")
 MESSAGE( STATUS "WebP:                             ${webp_available_ENABLED}")
 MESSAGE( STATUS "Shader Binary Cache:              ${ENABLE_SHADERBINCACHE}")
-MESSAGE( STATUS "Network logging enabled:          ${ENABLE_NETWORKLOGGING}")
+MESSAGE( STATUS "Network logging enabled:          ${ENABLE_NETWORK_LOGGING}")
 MESSAGE( STATUS "Font config file:                 ${fontConfigurationFile}")
 MESSAGE( STATUS "Using Tizen APP FW libraries:     ${ENABLE_APPFW}")
 MESSAGE( STATUS "Use pkg configure:                ${ENABLE_PKG_CONFIGURE}" )

diff --git a/build/tizen/common.cmake b/build/tizen/common.cmake
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
old mode 100644 (file)
new mode 100755 (executable)
index d5beb9c..8eecbda
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -5,7 +5,7 @@ INCLUDE( common.cmake )
 ARG_ENABLE( ENABLE_EXPORTALL enable_exportall 1 "Enables the exporting of all the symbols in the library" )
 ARG_ENABLE( ENABLE_DEBUG enable_debug ${ENABLE_VAL} "Turns on debugging" )
 ARG_ENABLE( ENABLE_SHADERBINCACHE enable_shaderbincache ${ENABLE_VAL} "Enables shader binary cache" )
-ARG_ENABLE( ENABLE_NETWORKLOGGING enable_networklogging ${ENABLE_VAL} "Enables network for debug tool" )
+ARG_ENABLE( ENABLE_NETWORK_LOGGING enable_network_logging ${ENABLE_VAL} "Enables network for debug tool" )
 
 # Currently, dali-adaptor requires appfw on Tizen
 # and does not require it on Ubuntu.
@@ -169,7 +169,7 @@ IF( enable_shaderbincache )
   ADD_DEFINITIONS( -DSHADERBIN_CACHE_ENABLED )
 ENDIF()
 
-IF( enable_networklogging )
+IF( enable_network_logging )
   ADD_DEFINITIONS( -DNETWORK_LOGGING_ENABLED )
 ENDIF()
 

diff --git a/build/tizen/module-list.cmake b/build/tizen/module-list.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/android-profile.cmake b/build/tizen/profiles/android-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/common-profile.cmake b/build/tizen/profiles/common-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/ivi-profile.cmake b/build/tizen/profiles/ivi-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)
index df656aa..a685163
--- a/build/tizen/profiles/ivi-profile.cmake
+++ b/build/tizen/profiles/ivi-profile.cmake
@@ -79,4 +79,3 @@ IF( COMPONENT_APPLICATION_SUPPORT )
         ${adaptor_adaptor_component_application_src_files}
       )
 ENDIF()
-

diff --git a/build/tizen/profiles/macos-profile.cmake b/build/tizen/profiles/macos-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/mobile-profile.cmake b/build/tizen/profiles/mobile-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/tizen-post-install.cmake b/build/tizen/profiles/tizen-post-install.cmake
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/build/tizen/profiles/tv-profile.cmake b/build/tizen/profiles/tv-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/ubuntu-profile.cmake b/build/tizen/profiles/ubuntu-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/build/tizen/profiles/wearable-profile.cmake b/build/tizen/profiles/wearable-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)
index ca3b54b..8afc122
--- a/build/tizen/profiles/wearable-profile.cmake
+++ b/build/tizen/profiles/wearable-profile.cmake
@@ -80,4 +80,3 @@ IF( COMPONENT_APPLICATION_SUPPORT )
         ${adaptor_adaptor_component_application_src_files}
       )
 ENDIF()
-

diff --git a/build/tizen/profiles/windows-profile.cmake b/build/tizen/profiles/windows-profile.cmake
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/dali/internal/network/common/automation.cpp b/dali/internal/network/common/automation.cpp
index 0666232..18d1fa6 100644 (file)
--- a/dali/internal/network/common/automation.cpp
+++ b/dali/internal/network/common/automation.cpp
@@ -21,6 +21,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/public-api/dali-core.h>
 #include <stdio.h>
 #include <iomanip>
@@ -164,6 +165,8 @@ void SetProperty(Dali::Handle handle, int propertyId, JsonPropertyValue& propert
 
 int SetProperties(const std::string& setPropertyMessage)
 {
+  Dali::Actor root = Dali::Internal::Adaptor::Adaptor::Get().GetWindows()[0].GetRootLayer();
+
   std::istringstream iss(setPropertyMessage);
   std::string        token;
   getline(iss, token, '|'); // swallow command name
@@ -177,9 +180,8 @@ int SetProperties(const std::string& setPropertyMessage)
       getline(propss, propName, ';');
       getline(propss, propValue);
 
-      Dali::Actor root = Dali::Stage::GetCurrent().GetRootLayer();
-      int         id   = atoi(actorId.c_str());
-      Dali::Actor a    = root.FindChildById(id);
+      int         id = atoi(actorId.c_str());
+      Dali::Actor a  = root.FindChildById(id);
       if(a)
       {
         // lookup by name for custom properties
@@ -343,8 +345,9 @@ std::string DumpJson(Dali::Actor actor, int level)
 {
   // All the information about this actor
   std::ostringstream msg;
-  msg << "{ " << Quote("Name") << " : " << Quote(actor.GetProperty<std::string>(Actor::Property::NAME)) << ", " << Quote("level") << " : " << level << ", " << Quote("id") << " : " << actor.GetId() << ", " << Quote("IsVisible")
-      << " : " << actor.GetCurrentProperty<bool>(Actor::Property::VISIBLE) << ", " << Quote("IsSensitive") << " : " << actor.GetProperty<bool>(Actor::Property::SENSITIVE);
+  int                id = actor["id"];
+  msg << "{ " << Quote("Name") << " : " << Quote(actor.GetProperty<std::string>(Dali::Actor::Property::NAME)) << ", " << Quote("level") << " : " << level << ", " << Quote("id") << " : " << id << ", " << Quote("IsVisible")
+      << " : " << actor.GetCurrentProperty<bool>(Dali::Actor::Property::VISIBLE) << ", " << Quote("IsSensitive") << " : " << actor.GetProperty<bool>(Dali::Actor::Property::SENSITIVE);
 
   msg << ", " << Quote("properties") << ": [ ";
 
@@ -401,7 +404,7 @@ std::string DumpJson(Dali::Actor actor, int level)
 
 std::string GetActorTree()
 {
-  Dali::Actor actor = Dali::Stage::GetCurrent().GetRootLayer();
+  Dali::Actor actor = Dali::Internal::Adaptor::Adaptor::Get().GetWindows()[0].GetRootLayer();
   std::string str   = DumpJson(actor, 0);
   return str;
 }