From 6a6df00d1393f6c21b6969e87d431dd0da2a7a57 Mon Sep 17 00:00:00 2001 From: JinWang An Date: Fri, 8 Apr 2016 16:26:34 +0900 Subject: [PATCH] Applied TIZEN 3.0 Directory structure Change-Id: Id128c5373e55301c793724e56f16c7d1b5c9c419 Signed-off-by: JinWang An --- CMakeLists.txt | 5 +++++ TC/testcase/utc_system_settings.c | 2 +- TC_gui/main.c | 17 ++++++++++------- packaging/capi-system-system-settings.spec | 8 ++++++-- src/system_setting_platform.c | 30 +++++++++++++++++++----------- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4bc7b4..90a77be 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,11 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DSLP_DEBUG") +ADD_DEFINITIONS("-D_TZ_SYS_DATA=\"${TZ_SYS_DATA}\"") +ADD_DEFINITIONS("-D_TZ_SYS_ETC=\"${TZ_SYS_ETC}\"") +ADD_DEFINITIONS("-D_TZ_SYS_RO_SHARE=\"${TZ_SYS_RO_SHARE}\"") +ADD_DEFINITIONS("-D_TZ_SYS_SHARE=\"${TZ_SYS_SHARE}\"") + SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") aux_source_directory(src SOURCES) diff --git a/TC/testcase/utc_system_settings.c b/TC/testcase/utc_system_settings.c index 6bf37e4..b3a6da3 100644 --- a/TC/testcase/utc_system_settings.c +++ b/TC/testcase/utc_system_settings.c @@ -103,7 +103,7 @@ static void utc_system_settings_changed_motion_activation(system_settings_key_e static void utc_system_settings_set_string_p(void) { - int retcode = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, "/opt/share/settings/Ringtones/General_Over the horizon.mp3"); + int retcode = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, _TZ_SYS_SHARE"/settings/Ringtones/General_Over the horizon.mp3"); if (retcode == SYSTEM_SETTINGS_ERROR_NONE) { dts_pass(API_NAME_SETTINGS_SET_VALUE_STRING, "passed"); diff --git a/TC_gui/main.c b/TC_gui/main.c index 39b2ee1..939134e 100644 --- a/TC_gui/main.c +++ b/TC_gui/main.c @@ -16,6 +16,7 @@ #include "main.h" #include #include +#include #include #include @@ -290,7 +291,8 @@ void list_item_touch_handler8_1(void *data, Evas_Object *obj, void *event_info) void list_item_touch_handler7(void *data, Evas_Object *obj, void *event_info) { - char *path = "/opt/usr/media/Images/image16.jpg"; + char path[512]; + snprintf(path, 512, "%s/Images/image16.jpg", tzplatform_getenv(TZ_USER_CONTENT)); int ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, "/aaa.png"); SETTING_TRACE(">>>>>>>> home screen - error case :: %d ", ret); @@ -301,7 +303,8 @@ void list_item_touch_handler7(void *data, Evas_Object *obj, void *event_info) void list_item_touch_handler8(void *data, Evas_Object *obj, void *event_info) { - char *path = "/opt/usr/media/Images/image16.jpg"; + char path[512]; + snprintf(path, 512, "%s/Images/image16.jpg", tzplatform_getenv(TZ_USER_CONTENT)); int ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN, "aaa.png"); SETTING_TRACE(">>>>>>>> lock screen - error case : %d ", ret); @@ -371,7 +374,7 @@ void list_item_touch_handler16(void *data, Evas_Object *obj, void *event_info) int ret; char *ringtonepath = NULL; /*opt/share/settings/Ringtones/Over the horizon.mp3 */ - ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, "/opt/share/settings/Ringtones/Over the horizon.mp3"); + ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, _TZ_SYS_SHARE"/settings/Ringtones/Over the horizon.mp3"); ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_INCOMING_CALL_RINGTONE, &ringtonepath); SETTING_TRACE(" 1 current ringtone path : (%s) ", ringtonepath); /* set the key to the wrong value */ @@ -383,8 +386,8 @@ void list_item_touch_handler16(void *data, Evas_Object *obj, void *event_info) void list_item_touch_handler21(void *data, Evas_Object *obj, void *event_info) { - char *path1 = "/opt/usr/share/settings/Alerts/Over the horizon.mp3"; - char *path2 = "/opt/usr/share/settings/Alerts/Over the horizon.mp3.bak"; + char *path1 = _TZ_SYS_SHARE"/settings/Alerts/Over the horizon.mp3"; + char *path2 = _TZ_SYS_SHARE"/settings/Alerts/Over the horizon.mp3.bak"; SETTING_TRACE(">>>>>>>> get ringtone path "); char *ringtonepath = NULL; @@ -408,7 +411,7 @@ void list_item_touch_handler22(void *data, Evas_Object *obj, void *event_info) int ret; char *ringtonepath = NULL; /*opt/share/settings/Ringtones/Over the horizon.mp3 */ - ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, "/opt/share/settings/Ringtones/Over the horizon.mp3"); + ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, _TZ_SYS_SHARE"/settings/Ringtones/Over the horizon.mp3"); ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_EMAIL_ALERT_RINGTONE, &ringtonepath); SETTING_TRACE(" 1 current ringtone path : (%s) ", ringtonepath); /* set the key to the wrong value */ @@ -439,7 +442,7 @@ void list_item_touch_handler15_2(void *data, Evas_Object *obj, void *event_info) int ret; char *ringtonepath = NULL; /*opt/share/settings/ringtones/ringtone_sdk.mp3 */ - ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, "/opt/share/settings/Ringtones/ringtone_sdk.mp3"); + ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"); ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_SOUND_NOTIFICATION, &ringtonepath); SETTING_TRACE(" 1 current ringtone path : (%s) ", ringtonepath); /* set the key to the wrong value */ diff --git a/packaging/capi-system-system-settings.spec b/packaging/capi-system-system-settings.spec index 144f57d..e672838 100755 --- a/packaging/capi-system-system-settings.spec +++ b/packaging/capi-system-system-settings.spec @@ -69,8 +69,12 @@ export CXXFLAGS="$CXXFLAGS -DTIZEN_ENGINEER_MODE" export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" %endif -MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DCMAKE_LIBDIR=%{_libdir} +MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DCMAKE_LIBDIR=%{_libdir} \ + -DTZ_SYS_DATA=%{TZ_SYS_DATA} \ + -DTZ_SYS_ETC=%{TZ_SYS_ETC} \ + -DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \ + -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} make %{?jobs:-j%jobs} diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c index ed0bf7f..fb7f2c2 100644 --- a/src/system_setting_platform.c +++ b/src/system_setting_platform.c @@ -50,6 +50,8 @@ #include #include +#include + #ifdef USE_EFL_ASSIST #include #endif @@ -70,11 +72,11 @@ #define HUGE_FONT_DPI (-190) #define GIANT_FONT_DPI (-250) -#define SETTING_FONT_PRELOAD_FONT_PATH "/usr/share/fonts" -#define SETTING_FONT_DOWNLOADED_FONT_PATH "/opt/share/fonts" +#define SETTING_FONT_PRELOAD_FONT_PATH _TZ_SYS_RO_SHARE"/fonts" +#define SETTING_FONT_DOWNLOADED_FONT_PATH _TZ_SYS_RO_SHARE"/fonts" -#define SETTING_FONT_CONF_FILE "/opt/etc/fonts/conf.avail/99-slp.conf" -#define SETTING_DEFAULT_FONT_CONF_FILE "/usr/opt/etc/fonts/conf.avail/99-slp.conf" +#define SETTING_FONT_CONF_FILE _TZ_SYS_ETC"/fonts/conf.avail/99-tizen.conf" +#define SETTING_DEFAULT_FONT_CONF_FILE _TZ_SYS_ETC"/fonts/conf.avail/99-tizen.conf" #define SETTING_STR_LEN 256 @@ -468,7 +470,7 @@ static int system_setting_remove_oldest_extended_wallpaper() unsigned int temp_image_num = 0; int image_count = 0; - if ((dp = opendir("/opt/usr/data/setting/wallpaper")) == NULL) { + if ((dp = opendir(_TZ_SYS_DATA"/setting/wallpaper")) == NULL) { SETTING_TRACE("opendir error"); return SYSTEM_SETTINGS_ERROR_IO_ERROR; } @@ -492,7 +494,7 @@ static int system_setting_remove_oldest_extended_wallpaper() char buf[512]; if (min_image_name) { - snprintf(buf, sizeof(buf) - 1, "/opt/usr/data/setting/wallpaper/%s", min_image_name); + snprintf(buf, sizeof(buf) - 1, _TZ_SYS_DATA"/setting/wallpaper/%s", min_image_name); if (remove(buf) < 0) { /* remove oldest image */ return SYSTEM_SETTINGS_ERROR_IO_ERROR; } @@ -503,10 +505,12 @@ static int system_setting_remove_oldest_extended_wallpaper() static int system_setting_check_extended_wallpaper(const char *file_path) { + char buffer[512]; SETTING_TRACE_BEGIN; if (!file_path || !strlen(file_path)) return 0; - return (strstr(file_path, "/opt/usr/media/.bgwallpaper") != NULL); + snprintf(buffer, 512, "%s/.bgwallpaper", tzplatform_getenv(TZ_USER_CONTENT)); + return (strstr(file_path, buffer) != NULL); } #define WALLPAPER_MAX_COUNT 10 @@ -538,13 +542,13 @@ int system_setting_set_wallpaper_home_screen(system_settings_key_e key, system_s #ifdef TIZEN_WEARABLE if (system_setting_check_extended_wallpaper(vconf_value)) { /* New extended wallpaper */ - DIR *dp; + DIR *dp = NULL; struct dirent *dirp; unsigned int max_image_num = 0; unsigned int temp_image_num = 0; int image_count = 0; - if ((dp = opendir("/opt/usr/data/setting/wallpaper")) == NULL) { + if ((dp = opendir(_TZ_SYS_DATA"/setting/wallpaper")) == NULL) { SETTING_TRACE("Setting - dir open error!"); return SYSTEM_SETTINGS_ERROR_IO_ERROR; } @@ -556,6 +560,8 @@ int system_setting_set_wallpaper_home_screen(system_settings_key_e key, system_s if (system_setting_get_extended_wallpaper_num(dirp->d_name, &temp_image_num) != SYSTEM_SETTINGS_ERROR_NONE) { + if(dp) + closedir(dp); return SYSTEM_SETTINGS_ERROR_IO_ERROR; } @@ -565,6 +571,8 @@ int system_setting_set_wallpaper_home_screen(system_settings_key_e key, system_s image_count++; } + if(dp) + closedir(dp); /* Numbering rule: Gear is odd number */ max_image_num = (max_image_num % 2 == 0) ? max_image_num + 1 @@ -572,9 +580,9 @@ int system_setting_set_wallpaper_home_screen(system_settings_key_e key, system_s char file_name_buffer[512]; snprintf(file_name_buffer, sizeof(file_name_buffer) - 1, - "/opt/usr/data/setting/wallpaper/extended_wallpaper_%d.jpg", max_image_num); + _TZ_SYS_DATA"/setting/wallpaper/extended_wallpaper_%d.jpg", max_image_num); - /* Copy image to /opt/usr/data/setting/wallpaper/ */ + /* Copy image to _TZ_SYS_DATA/setting/wallpaper/ */ if (system_setting_copy_extended_wallpaper(file_name_buffer, vconf_value) != SYSTEM_SETTINGS_ERROR_NONE) { return SYSTEM_SETTINGS_ERROR_IO_ERROR; -- 2.7.4