Replace db-util package to sqlite3

Change-Id: I9102a3a729a59f5c5a7fd90623b15f8c79ce6c9a
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5c545e..36ada8d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,8 @@ ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warni
 PKG_CHECK_MODULES(DRM_SERVICE_CORE_DEP
     REQUIRED
     cryptsvc
-    db-util
+    sqlite3
+    glib-2.0
     dlog
     openssl
 )

diff --git a/drm-service-core-tizen.pc.in b/drm-service-core-tizen.pc.in
index 0895e4a..740d721 100644 (file)
--- a/drm-service-core-tizen.pc.in
+++ b/drm-service-core-tizen.pc.in
@@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@
 Name: drm-service-core-tizen
 Description: Tizen Application DRM Plugin
 Version: @VERSION@
-Requires: dlog openssl db-util
+Requires: dlog openssl sqlite3
 Libs: -L${libdir} -ldrm-service-core-tizen
 Cflags: -I${includedir}/drm-tizen

diff --git a/initializer/CMakeLists.txt b/initializer/CMakeLists.txt
index 576ea75..e36c571 100644 (file)
--- a/initializer/CMakeLists.txt
+++ b/initializer/CMakeLists.txt
@@ -1,7 +1,8 @@
 #################################################################
 PKG_CHECK_MODULES(DRM_INITIALIZE_DEP
     REQUIRED
-    db-util
+    sqlite3
+    glib-2.0
     dlog
     openssl
 )

diff --git a/packaging/drm-service-core-tizen.spec b/packaging/drm-service-core-tizen.spec
index 7609944..fbd7a56 100755 (executable)
--- a/packaging/drm-service-core-tizen.spec
+++ b/packaging/drm-service-core-tizen.spec
@@ -9,7 +9,8 @@ License:    Flora-1.1 and Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(db-util)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(cryptsvc)
 BuildRequires:  pkgconfig(libtzplatform-config)

diff --git a/tappsd/inc/drm_intf_tapps.h b/tappsd/inc/drm_intf_tapps.h
index 85ed411..d9b0d8e 100644 (file)
--- a/tappsd/inc/drm_intf_tapps.h
+++ b/tappsd/inc/drm_intf_tapps.h
@@ -41,11 +41,15 @@
 #include <string.h>
 #include <errno.h>
 
-#include "db-util.h"
+#include <sqlite3.h>
 
 #include "drm-tizen-mid.h"
 #include <openssl/aes.h>
 
+#ifndef EXPORT_API
+#define EXPORT_API __attribute__ ((visibility("default")))
+#endif
+
 /* Enable this flag during development time */
 #define _TAPPS_DEBUG_ENABLE_
 

diff --git a/tappsd/src/db/DTapps2SqliteDB.cpp b/tappsd/src/db/DTapps2SqliteDB.cpp
index 51e2653..d2f2584 100644 (file)
--- a/tappsd/src/db/DTapps2SqliteDB.cpp
+++ b/tappsd/src/db/DTapps2SqliteDB.cpp
@@ -114,7 +114,7 @@ BOOL DTappsDBOpen(void *&pDb, const char *CallingFun)
                DRM_TAPPS_FRQ_LOG("Opening DB connection.");
 
                sqlite3 *h_db = NULL;
-               int result = db_util_open(DTAPPS_DB_NAME, &h_db, 0);
+               int result = sqlite3_open(DTAPPS_DB_NAME, &h_db);
 
                if (result != SQLITE_OK) {
                        DRM_TAPPS_EXCEPTION("sqlite msg :[%d]%s", result, sqlite3_errmsg(h_db));
@@ -217,8 +217,8 @@ BOOL DTappsDBClose(const char *CallingFun)
 
        DRM_TAPPS_LOG(" Closing DB connection..pDBConnection=[0x%x]", pDBConnection);
 
-       if (db_util_close(pDBConnection) != SQLITE_OK) {
-               DRM_TAPPS_EXCEPTION("db_util_close failed. errmsg:%s",
+       if (sqlite3_close(pDBConnection) != SQLITE_OK) {
+               DRM_TAPPS_EXCEPTION("sqlite3_close failed. errmsg:%s",
                                                        sqlite3_errmsg(pDBConnection));
                ret = FALSE;
        }

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b203cbf..79b416d 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,7 +1,8 @@
 pkg_check_modules(DRM_TEST_DEP
     REQUIRED
     cryptsvc
-    db-util
+    sqlite3
+    glib-2.0
     dlog
     openssl
 )