Remove build dependency to EFL

Change-Id: I1803dfb8d0a3b2448ca7f0a19a515e6c9df648b5
Signed-off-by: Semun Lee <semun.lee@samsung.com>
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7982879..05ff033 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ SET(LIBDIR "${CMAKE_LIBDIR}")
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(requires "dlog vconf fontconfig libxml-2.0 pkgmgr pkgmgr-info alarm-service capi-media-metadata-extractor eina elementary aul json-glib-1.0 capi-appfw-app-manager capi-appfw-package-manager capi-system-info glib-2.0")
+SET(requires "dlog vconf fontconfig libxml-2.0 pkgmgr pkgmgr-info alarm-service capi-media-metadata-extractor aul json-glib-1.0 capi-appfw-app-manager capi-appfw-package-manager capi-system-info glib-2.0")
 SET(pc_requires "capi-base-common")
 
 

diff --git a/include/system_settings_ringtones.h b/include/system_settings_ringtones.h
index 6271d4f..49c84d3 100644 (file)
--- a/include/system_settings_ringtones.h
+++ b/include/system_settings_ringtones.h
@@ -4,7 +4,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <metadata_extractor.h>
-#include <Eina.h>
 
 typedef struct _ugFsNodeInfo fileNodeInfo;
 struct _ugFsNodeInfo {
@@ -13,7 +12,7 @@ struct _ugFsNodeInfo {
        char *media_name;
 };
 
-int get_filelist_from_dir_path(char *path, Eina_List **file_list);
+int get_filelist_from_dir_path(char *path, GList **file_list);
 char *get_filename_from_fullname(const char *fullname);
 
 #if 0

diff --git a/packaging/capi-system-system-settings.spec b/packaging/capi-system-system-settings.spec
index dee82ef..761b524 100755 (executable)
--- a/packaging/capi-system-system-settings.spec
+++ b/packaging/capi-system-system-settings.spec
@@ -12,9 +12,6 @@ Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(eina)
 BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -26,7 +23,6 @@ BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(capi-media-metadata-extractor)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(efl-extension)
 
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(glib-2.0)

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index c0b6d8b..b7e76e2 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -26,10 +26,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <aul.h>
-
 #include <regex.h>
 
+#include <aul.h>
 #include <dlog.h>
 #include <vconf.h>
 
@@ -375,7 +374,7 @@ int system_setting_del_incoming_call_ringtone(system_settings_key_e key, void *v
 
 
 /*  LCOV_EXCL_START */
-static int _compare_cb(const void *d1, const void *d2)
+gint _compare_cb(gconstpointer d1, gconstpointer d2)
 {
        fileNodeInfo *pNode1 = (fileNodeInfo *)d1;
        fileNodeInfo *pNode2 = (fileNodeInfo *)d2;
@@ -391,8 +390,8 @@ static void _get_default_ringtones(system_settings_key_e key, system_settings_it
 {
        SETTING_TRACE_BEGIN;
        /*Get file list */
-       Eina_List *filelist = NULL;
-       Eina_List *l = NULL;
+       GList *filelist = NULL;
+       GList *iter;
        fileNodeInfo *node = NULL;
        int idx = 0;
 
@@ -403,10 +402,11 @@ static void _get_default_ringtones(system_settings_key_e key, system_settings_it
        if (ret != 0) {
                SETTING_TRACE("Failed to get filelist, ret = %d %s", ret, DEF_RINGTONE_FILE_PATH);
        }
-       filelist = eina_list_sort(filelist, eina_list_count(filelist), _compare_cb);
 
-       EINA_LIST_FOREACH(filelist, l, node)
-       {
+       filelist = g_list_sort(filelist, _compare_cb);
+
+       for (iter = filelist; iter != NULL; iter = g_list_next(iter)) {
+               node = (fileNodeInfo *)iter->data;
                SETTING_TRACE("file path = (%d) : name:%s path:%s [%s]", ret, node->name, node->path, node->media_name);
                // @todo assert NULL check
                if (callback) {
@@ -428,16 +428,14 @@ static void _get_default_ringtones(system_settings_key_e key, system_settings_it
                }
        }
 
-       l = NULL;
-       node = NULL;
-       EINA_LIST_FOREACH(filelist, l, node)
-       {
+       for (iter = filelist; iter != NULL; iter = g_list_next(iter)) {
+               node = (fileNodeInfo *)iter->data;
                FREE(node->path);
                FREE(node->name);
                FREE(node->media_name);
                FREE(node);
        }
-       eina_list_free(filelist);
+       g_list_free(filelist);
        filelist = NULL;
 
 }

diff --git a/src/system_settings_ringtones.c b/src/system_settings_ringtones.c
index 5cd5bd4..70402fc 100644 (file)
--- a/src/system_settings_ringtones.c
+++ b/src/system_settings_ringtones.c
@@ -19,6 +19,9 @@
  *
  */
 #include <pthread.h>
+#include <stdio.h>
+
+#include <glib.h>
 
 #include <system_settings.h>
 #include <system_settings_private.h>
@@ -74,7 +77,7 @@ char *get_media_basename(const char *dir_path, const char *name)
        }
 }
 
-int get_filelist_from_dir_path(char *path, Eina_List **file_list)
+int get_filelist_from_dir_path(char *path, GList **file_list)
 {
        SETTING_TRACE_BEGIN;
        DIR *pDir = NULL;
@@ -115,7 +118,7 @@ int get_filelist_from_dir_path(char *path, Eina_List **file_list)
                pNode->media_name = get_media_basename(
                                pNode->path, pNode->name);
 
-               *file_list = eina_list_append(*file_list, pNode);
+               *file_list = g_list_append(*file_list, pNode);
        }
        pthread_mutex_unlock(&mutex);
 

diff --git a/system-settings-util/CMakeLists.txt b/system-settings-util/CMakeLists.txt
index a8ae7b0..d5e9b43 100755 (executable)
--- a/system-settings-util/CMakeLists.txt
+++ b/system-settings-util/CMakeLists.txt
@@ -6,7 +6,7 @@ PROJECT(${SYSTEM_SETTINGS_UTIL})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-SET(requires "elementary ecore dlog vconf fontconfig libxml-2.0 pkgmgr pkgmgr-info libsystemd efl-extension")
+SET(requires "dlog vconf fontconfig libxml-2.0 pkgmgr pkgmgr-info libsystemd")
 
 PKG_CHECK_MODULES(system_settings_util REQUIRED ${requires})
 

diff --git a/system-settings-util/include/system_settings_font.h b/system-settings-util/include/system_settings_font.h
index bf716d4..34aef1c 100644 (file)
--- a/system-settings-util/include/system_settings_font.h
+++ b/system-settings-util/include/system_settings_font.h
@@ -66,29 +66,33 @@ void
 int
 (*d_evas_init) (void);
 
-Ecore_Evas *
+void *
 (*d_ecore_evas_new) (const char *engine_name, int x, int y, int w, int h, const char *extra_options);
 
-Evas *
-(*d_ecore_evas_get) (const Ecore_Evas *ee);
+void *
+(*d_ecore_evas_get) (const void *ee);
 
-Evas_Object *
-(*d_evas_object_image_add) (Evas *eo_e);
+void *
+(*d_evas_object_image_add) (void *eo_e);
 
 void
-(*d_evas_object_image_file_set) (Eo *obj, const char *file, const char *key);
+(*d_evas_object_image_file_set) (void *obj, const char *file, const char *key);
 
-Evas_Load_Error
-(*d_evas_object_image_load_error_get) (const Evas_Object *obj);
+int
+(*d_evas_object_image_load_error_get) (const void *obj);
 
 void
-(*d_ecore_evas_free) (Ecore_Evas *ee);
+(*d_ecore_evas_free) (void *ee);
 
 int
 (*d_evas_shutdown) (void);
 
 
-Eina_Bool
+bool
 (*d_eext_config_font_set)(char *name, int size);
 
+int
+(*d_ecore_evas_init) (void);
 
+int
+(*d_ecore_evas_shutdown) (void);

diff --git a/system-settings-util/src/system_settings_util.c b/system-settings-util/src/system_settings_util.c
index 64f1fb9..410bbe4 100644 (file)
--- a/system-settings-util/src/system_settings_util.c
+++ b/system-settings-util/src/system_settings_util.c
@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
+#include <locale.h>
 
 #include <regex.h>
 
@@ -15,10 +16,6 @@
 
 #include <fontconfig/fontconfig.h>
 
-#include <Elementary.h>
-#include <Evas.h>
-#include <Ecore_Evas.h>
-
 #include <pkgmgr-info.h>
 
 #include <system_settings.h>
@@ -123,7 +120,8 @@ int loading_dym_efl()
        if (!d_ecore_evas_handle) {
        d_ecore_evas_handle = dlopen(SETTING_ECORE_EVAS_SO_PATH,  RTLD_LAZY);
                if (!d_ecore_evas_handle) {
-                       SETTING_TRACE("ERROR!! canNOT find"SETTING_ECORE_EVAS_SO_PATH);
+                       SETTING_TRACE("ERROR!! canNOT find "SETTING_ECORE_EVAS_SO_PATH" %s", dlerror());
+
                        return false;
                }
        }
@@ -131,7 +129,7 @@ int loading_dym_efl()
        if (!d_evas_handle) {
        d_evas_handle = dlopen(SETTING_EVAS_SO_PATH,  RTLD_LAZY);
                if (!d_evas_handle) {
-                       SETTING_TRACE("ERROR!! canNOT find"SETTING_EVAS_SO_PATH);
+                       SETTING_TRACE("ERROR!! canNOT find "SETTING_EVAS_SO_PATH" %s", dlerror());
                        return false;
                }
        }
@@ -142,6 +140,8 @@ int loading_dym_efl()
        DYM_FUNC_LOADING(error, d_evas_handle, d_evas_object_image_load_error_get, "evas_object_image_load_error_get");
        DYM_FUNC_LOADING(error, d_evas_handle, d_evas_shutdown, "evas_shutdown");
 
+       DYM_FUNC_LOADING(error, d_ecore_evas_handle, d_ecore_evas_init, "ecore_evas_init");
+       DYM_FUNC_LOADING(error, d_ecore_evas_handle, d_ecore_evas_shutdown, "ecore_evas_shutdown");
        DYM_FUNC_LOADING(error, d_ecore_evas_handle, d_ecore_evas_new, "ecore_evas_new");
        DYM_FUNC_LOADING(error, d_ecore_evas_handle, d_ecore_evas_get, "ecore_evas_get");
        DYM_FUNC_LOADING(error, d_ecore_evas_handle, d_ecore_evas_free, "ecore_evas_free");
@@ -162,7 +162,7 @@ int loading_dym_efl_eext()
        if (!d_efl_eext_handle) {
                d_efl_eext_handle = dlopen(SETTING_EFL_EXTENSION_SO_PATH, RTLD_LAZY);
                if (!d_efl_eext_handle) {
-                       SETTING_TRACE("ERROR!! canNOT find "SETTING_EFL_EXTENSION_SO_PATH);
+                       SETTING_TRACE("ERROR!! canNOT find "SETTING_EFL_EXTENSION_SO_PATH" %s", dlerror());
                        return false;
                }
        }
@@ -240,12 +240,15 @@ char *__get_main_font_family_name_by_alias(char *alias)
 bool __is_supported_image_type_load(char *path)
 {
        SETTING_TRACE_BEGIN;
-       loading_dym_efl();
+       if (!loading_dym_efl()) {
+               SETTING_TRACE("ERROR!! canNOT loading efl!!");
+               return false;
+       }
 
-       Ecore_Evas      *ee;
-       Evas            *evas;
+       void *ee;
+       void *evas;
 
-       if (!d_evas_init()) {
+       if (!d_ecore_evas_init()) {
                close_dym_efl();
                return false;
        }
@@ -253,12 +256,12 @@ bool __is_supported_image_type_load(char *path)
        ee = d_ecore_evas_new(NULL, 0, 0, 100, 100, NULL);
        evas = d_ecore_evas_get(ee);
 
-       Evas_Object *img = d_evas_object_image_add(evas);
+       void *img = d_evas_object_image_add(evas);
        d_evas_object_image_file_set(img, path, NULL);
-       Evas_Load_Error ret = d_evas_object_image_load_error_get(img);
+       int ret = d_evas_object_image_load_error_get(img);
 
        bool result = false;
-       if (ret == EVAS_LOAD_ERROR_NONE) {
+       if (ret == 0) {
                SETTING_TRACE("%s - OK", path);
                result = true;
        } else {
@@ -266,7 +269,7 @@ bool __is_supported_image_type_load(char *path)
                result = false;
        }
        d_ecore_evas_free(ee);
-       d_evas_shutdown();
+       d_ecore_evas_shutdown();
        close_dym_efl();
        return result;
 }
@@ -276,12 +279,6 @@ bool __is_supported_image_type_load(char *path)
 void font_config_set_notification()
 {
        SETTING_TRACE_BEGIN;
-#if 0
-       /* notification */
-       Ecore_X_Window ecore_win = ecore_x_window_root_first_get();
-       Ecore_X_Atom atom = ecore_x_atom_get("FONT_TYPE_change");
-       ecore_x_window_prop_string_set(ecore_win, atom, "tizen");
-#endif
 }
 /*  LCOV_EXCL_STOP */
 

diff --git a/unit_test/CMakeLists.txt b/unit_test/CMakeLists.txt
index af08297..1d3e27f 100755 (executable)
--- a/unit_test/CMakeLists.txt
+++ b/unit_test/CMakeLists.txt
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(fw_name "capi-system-system-settings")
 SET(unit_test "system-setting-unittest")
 
-SET(requires "dlog vconf fontconfig libxml-2.0 pkgmgr pkgmgr-info alarm-service capi-media-metadata-extractor eina elementary aul json-glib-1.0 capi-appfw-app-manager capi-appfw-package-manager capi-system-info glib-2.0")
+SET(requires "dlog vconf fontconfig libxml-2.0 pkgmgr pkgmgr-info alarm-service capi-media-metadata-extractor aul json-glib-1.0 capi-appfw-app-manager capi-appfw-package-manager capi-system-info glib-2.0")
 
 PROJECT(${unit_test})
 
@@ -16,14 +16,17 @@ FOREACH(flag ${${fw_name}_CFLAGS})
 ENDFOREACH(flag)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${unit_test} REQUIRED ${requires} elementary ecore)
+pkg_check_modules(${unit_test} REQUIRED ${requires})
 FOREACH(flag ${${unit_test}_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
+
+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+
 ADD_DEFINITIONS("-DN_THREADS=${N_THREADS}")
 ADD_EXECUTABLE(${unit_test} src/unit_test.c
                                                        src/unit_test_fw.c)
 
-TARGET_LINK_LIBRARIES(${unit_test} ${fw_name})
+TARGET_LINK_LIBRARIES(${unit_test} ${fw_name} "-ldl")
 INSTALL(TARGETS ${unit_test} DESTINATION /usr/local/bin)
 

diff --git a/unit_test/include/unit_test_fw.h b/unit_test/include/unit_test_fw.h
index d3cc5f9..d4de420 100644 (file)
--- a/unit_test/include/unit_test_fw.h
+++ b/unit_test/include/unit_test_fw.h
@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <glib.h>
 #include <unistd.h>
-#include <Elementary.h>
 
 #include <unit_test_assert.h>
 

diff --git a/unit_test/src/unit_test.c b/unit_test/src/unit_test.c
index 5cc47b9..8c8eeee 100644 (file)
--- a/unit_test/src/unit_test.c
+++ b/unit_test/src/unit_test.c
@@ -1,6 +1,7 @@
 #include <system_settings.h>
 
 #include <unit_test_fw.h>
+#include <string.h>
 
 
 void unit_test_callback0(system_settings_key_e key, void *user_data) { }

diff --git a/unit_test/src/unit_test_fw.c b/unit_test/src/unit_test_fw.c
index 4f92c32..65a9a37 100644 (file)
--- a/unit_test/src/unit_test_fw.c
+++ b/unit_test/src/unit_test_fw.c
@@ -5,7 +5,6 @@ typedef struct __thread_test_table {
        GTestFunc t_func;
 } thread_test_node;
 
-
 static GThread *my_thread = NULL;
 static GMainLoop *main_loop = NULL;
 static thread_test_node thread_test_table[1000] = {0};
@@ -13,7 +12,6 @@ static int thread_test_idx = 0;
 static int loop = 100;
 static int thread_sw = 1;
 
-
 void *thread_function(void *data)
 {
        int cnt = 0;
@@ -88,10 +86,9 @@ static void stop_main_loop_thread()
        g_main_loop_unref(main_loop);
 }
 
+
 int main(int argc, char* argv[])
 {
-       ecore_evas_init();
-
        main_loop = g_main_loop_new(NULL, FALSE);
 
        g_test_init(&argc, &argv, NULL);