[dali_2.0.6] Merge branch 'devel/master'

Change-Id: I5cf5bb4079c4cfeb323e042c7f3c8665fffe2736

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index da3510f..18b4591 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -415,6 +415,9 @@ MESSAGE( STATUS "Enable AT-SPI:                    ${ENABLE_ATSPI}" )
 MESSAGE( STATUS "Tizen Platform Config supported   ${TIZEN_PLATFORM_CONFIG_SUPPORTED_LOGMSG}")
 MESSAGE( STATUS "Compile flags:                    ${CMAKE_CXX_FLAGS}")
 MESSAGE( STATUS "Compile flags:                    ${CMAKE_C_FLAGS}")
+MESSAGE( STATUS "CMAKE_SYSROOT:                    ${CMAKE_SYSROOT}")
+MESSAGE( STATUS "CMAKE_SYSTEM_INCLUDE_PATH:        ${CMAKE_SYSTEM_INCLUDE_PATH}")
+MESSAGE( STATUS "CMAKE_SYSTEM_LIBRARY_PATH:        ${CMAKE_SYSTEM_LIBRARY_PATH}")
 IF( enable_feedback )
   ADD_SUBDIRECTORY( plugins )
 ENDIF()

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index 7ce0606..6ed3a2d 100644 (file)
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -114,8 +114,8 @@ IF( ANDROID_PROFILE )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android/native_app_glue )
-  INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr )
-  INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr/include/android )
+  INCLUDE_DIRECTORIES( ${CMAKE_SYSROOT}/usr )
+  INCLUDE_DIRECTORIES( ${CMAKE_SYSROOT}/usr/include/android )
 ENDIF()
 
 IF( enable_wayland )

diff --git a/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp b/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp
index f81d01f..0baa2bf 100644 (file)
--- a/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp
+++ b/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp
@@ -18,7 +18,7 @@
 #include <dali/internal/adaptor-framework/common/file-loader-impl.h>
 
 // EXTERNAL INCLUDES
-#include <string>
+#include <cstring>
 #include <fstream>
 
 #include <dali/integration-api/debug.h>
@@ -81,7 +81,8 @@ int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector
   }
   else
   {
-    DALI_LOG_ERROR( "file open failed for: \"%s\"\n", filename.c_str() );
+    char buf[512];
+    DALI_LOG_ERROR( "file open failed for: \"%s\", error : %s\n", filename.c_str(), strerror_r( errno, buf, 512 )  );
   }
 
   return errorCode;

diff --git a/dali/internal/adaptor-framework/generic/file-stream-impl-generic.cpp b/dali/internal/adaptor-framework/generic/file-stream-impl-generic.cpp
index 3f40285..98bdb96 100644 (file)
--- a/dali/internal/adaptor-framework/generic/file-stream-impl-generic.cpp
+++ b/dali/internal/adaptor-framework/generic/file-stream-impl-generic.cpp
@@ -18,7 +18,7 @@
 #include <dali/internal/adaptor-framework/common/file-stream-impl.h>
 
 // EXTERNAL INCLUDES
-#include <string>
+#include <cstring>
 #include <fstream>
 
 #include <dali/integration-api/debug.h>
@@ -190,7 +190,9 @@ FILE* FileStream::Impl::GetFile()
     mFile = fopen( mFileName.c_str(), openMode );
     if( !mFile )
     {
+      char buf[512];
       DALI_LOG_ERROR( "file open failed for: \"%s\", in mode: \"%s\".\n", mFileName.c_str(), openMode );
+      DALI_LOG_ERROR( "file open failed error : %s\n", strerror_r( errno, buf, 512 )  );
     }
   }
   else if( mBuffer )
@@ -198,8 +200,10 @@ FILE* FileStream::Impl::GetFile()
     mFile = fmemopen( mBuffer, mDataSize, openMode );
     if( !mFile )
     {
+      char buf[512];
       DALI_LOG_ERROR( "File open failed for memory buffer at location: \"%p\", of size: \"%u\", in mode: \"%s\".\n",
           static_cast<void*>( mBuffer ), static_cast<unsigned>( mDataSize ), openMode );
+      DALI_LOG_ERROR( "file open failed error : %s\n",  strerror_r( errno, buf, 512 )  );
     }
   }
 

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index c0cba53..abf2afe 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -27,7 +27,7 @@ namespace Dali
 {
 const unsigned int ADAPTOR_MAJOR_VERSION = 2;
 const unsigned int ADAPTOR_MINOR_VERSION = 0;
-const unsigned int ADAPTOR_MICRO_VERSION = 5;
+const unsigned int ADAPTOR_MICRO_VERSION = 6;
 const char* const  ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 6fdc308..0d6aaa6 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -17,7 +17,7 @@
 
 Name:       dali2-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    2.0.5
+Version:    2.0.6
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT