log: Enable dlog logging on Tizen platform

Additionally minor changes were added to make 3.0 building possible

Change-Id: Ieae9cdd7e742ca909506a9748bf4cd208247f559

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4afbe25..e6daff2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,16 +41,21 @@ ADD_DEFINITIONS("-DBOOST_ASIO_DISABLE_STD_ARRAY")
 
 ADD_DEFINITIONS("-D_GNU_SOURCE")
 
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+
 # Set compiler warning flags
 # TODO uncomment these when it's cleanup time
 ADD_DEFINITIONS("-Werror")                      # Make all warnings into errors.
 #ADD_DEFINITIONS("-Wall")                        # Generate all warnings
 #ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warnings
 
-ADD_DEFINITIONS("-D_CYNARA_INTEGRATION")
+# Enable tizen-specific preprocessor defines
+IF(DEFINED TIZEN)
+    ADD_DEFINITIONS("-D__TIZEN__")
+    ADD_DEFINITIONS("-D_CYNARA_INTEGRATION")
+ENDIF(DEFINED TIZEN)
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-    ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
     ADD_DEFINITIONS("-DBUILD_TYPE_DEBUG")
     ADD_DEFINITIONS("-ggdb -O0")
     # undefine _FORTIFY_SOURCE - it makes no sense without optimization and produces warnings

diff --git a/TEEStub/PropertyAccess/Property.h b/TEEStub/PropertyAccess/Property.h
index 36b8552..f7413ea 100644 (file)
--- a/TEEStub/PropertyAccess/Property.h
+++ b/TEEStub/PropertyAccess/Property.h
@@ -28,6 +28,7 @@
  *  Include files\r
  *-----------------------------------------------------------------------------*/\r
 #include <string>\r
+#include <cstdint>\r
 using namespace std;\r
 \r
 /*-----------------------------------------------------------------------------\r

diff --git a/log/log.h b/log/log.h
index 84695f1..eea9bd8 100644 (file)
--- a/log/log.h
+++ b/log/log.h
@@ -43,8 +43,8 @@ typedef int timer_t;
 #endif
 
 #ifdef __TIZEN__
-#include <dlog.h>
-#define TA_SDK_TAG     "TA_SDK"
+#include <dlog/dlog.h>
+#define TA_SDK_TAG "TA_SDK"
 #endif
 
 #ifdef _ANDROID_NDK
@@ -80,6 +80,28 @@ typedef enum {
        ALL_MODULES = 0xFFFFFFF,
 } ModuleLevel;
 
+// if we use dlog, we need to replace its macros with our own
+#ifdef __TIZEN__
+       #ifdef LOGE
+               #undef LOGE
+       #endif
+       #ifdef LOGV
+               #undef LOGV
+       #endif
+       #ifdef LOGD
+               #undef LOGD
+       #endif
+       #ifdef LOGI
+               #undef LOGI
+       #endif
+       #ifdef LOGS
+               #undef LOGS
+       #endif
+       #ifdef LOGP
+               #undef LOGP
+       #endif
+#endif // __TIZEN__
+
 #ifdef _LOGGING
 
 #define _LOG(module_level,debug_level,...) PrintLog(__FUNCTION__,__LINE__,module_level,debug_level,##__VA_ARGS__)

diff --git a/packaging/tef-simulator.spec b/packaging/tef-simulator.spec
index 521bcbf..f7fb586 100644 (file)
--- a/packaging/tef-simulator.spec
+++ b/packaging/tef-simulator.spec
@@ -82,7 +82,8 @@ cmake . \
         -DPKGCFG_LIB_DIR=%{lib_dir} \
         -DPKGCFG_PREFIX=/usr \
         -DPKGCFG_VERSION=%{version} \
-        -DSMACK_DOMAIN_NAME=%{smack_domain_name}
+        -DSMACK_DOMAIN_NAME=%{smack_domain_name} \
+        -DTIZEN=1
 make %{?jobs:-j%jobs}
 
 %install

diff --git a/simulatordaemon/CMakeLists.txt b/simulatordaemon/CMakeLists.txt
index ad60059..54aa690 100644 (file)
--- a/simulatordaemon/CMakeLists.txt
+++ b/simulatordaemon/CMakeLists.txt
@@ -24,6 +24,7 @@ PKG_CHECK_MODULES(DAEMON_DEPS REQUIRED
                   security-manager
                   libsystemd-daemon
                   libtzplatform-config
+                  dlog
                   )
 
 # We require tef-libteec only for tee_client_api.h header