use TZ_SYS_GLOBALUSER_DATA env to set the setting res dir

Change-Id: I8290c29556d33bfb3bd292e5f7083073abe29e3d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1502ca1bb2a9ae189d4d2c5bbacd2bc073d35bed..a28ade61b375058102427a99e9f8de4f4199f913 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ ADD_DEFINITIONS("-D_TZ_SYS_RO_UG=\"${TZ_SYS_RO_UG}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_RO_ICONS=\"${TZ_SYS_RO_ICONS}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_MEDIA=\"${TZ_SYS_MEDIA}\"")
 ADD_DEFINITIONS("-D_TZ_SYS_DB=\"${TZ_SYS_DB}\"")
-
+ADD_DEFINITIONS("-D_TZ_SYS_GLOBALUSER_DATA=\"${TZ_SYS_GLOBALUSER_DATA}\"")
 #Create po header file
 SET(CREATE_PO_HEADER "./scripts/create_po_header.sh")
 EXECUTE_PROCESS(COMMAND  ${CREATE_PO_HEADER}

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 9fbfc7458245d7b6460f52f5e282fca879d7f56f..8481946464e73f7e8ab6ac9d77550589296ee594 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -155,8 +155,8 @@ export CFLAGS="$CFLAGS -DTIZEN_BUILD_EMULATOR"
                -DTZ_SYS_RO_UG=%{TZ_SYS_RO_UG} \
                -DTZ_SYS_RO_ICONS=%{TZ_SYS_RO_ICONS} \
                -DTZ_SYS_MEDIA=%{TZ_SYS_MEDIA} \
-               -DTZ_SYS_DB=%{TZ_SYS_DB}
-
+               -DTZ_SYS_DB=%{TZ_SYS_DB} \
+               -DTZ_SYS_GLOBALUSER_DATA=%{TZ_SYS_GLOBALUSER_DATA}
 # build all
 make
 
@@ -233,7 +233,7 @@ mkdir -p %{_prefix}/apps/org.tizen.mode-syspopup/bin/
 %{PREFIX}/res/*
 %{_datadir}/mime/packages/*
 
-%{TZ_SYS_SHARE}/settings/*
+%{TZ_SYS_GLOBALUSER_DATA}/settings/*
 
 %{PREFIX}/shared/res/*
 %attr(-,app,app) %dir %{PREFIX}/shared

diff --git a/setting-common/include/setting-common-string.h b/setting-common/include/setting-common-string.h
index c5b95abd2c9e04eb35827781b0b580ade9c1f13d..4dfa872fbbac56504c559c9352fbf0878b0dd2ff 100755 (executable)
--- a/setting-common/include/setting-common-string.h
+++ b/setting-common/include/setting-common-string.h
@@ -46,13 +46,13 @@
 #define SETTING_OTHER_UG_ICON_PATH \
        _TZ_SYS_RO_ICONS"/default/small/"
 #define SETTING_DEFAULT_CALL_TONE \
-       _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
+       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
 #define SETTING_DEFAULT_CALL_TONE_SDK \
-       _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
+       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
 #define SETTING_DEFAULT_CALL_VIB \
-       _TZ_SYS_SHARE"/settings/Vibrations/haptic/default/Ticktock.ivt"
+       _TZ_SYS_GLOBALUSER_DATA"/settings/Vibrations/haptic/default/Ticktock.ivt"
 #define DEF_RINGTONE\
-       _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
+       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
 #define SETTING_MMC_PATH \
        _TZ_SYS_MEDIA"/sdcard/"
 

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index 626bfdedd5d2925e5d91443a7586c3c69966b4c3..c0f5c779ec2a8a9d08cbc696fdb93db1399790c2 100644 (file)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -39,9 +39,9 @@
 #define SETTING_PROFILE_MMC_PATH \
        _TZ_SYS_MEDIA"/sdcard"
 #define SETTING_DEFAULT_MSG_TONE \
-       _TZ_SYS_SHARE"/settings/Alerts/Whistle.ogg"
+       _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts/Whistle.ogg"
 #define SETTING_DEFAULT_MEDIA_TONE \
-       _TZ_SYS_SHARE"/settings/Ringtones/ringtone_sdk.mp3"
+       _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/ringtone_sdk.mp3"
 #define SUPPORT_PLAYER_ASYNC 1
 
 /*Call ringtone:3 icon status */

diff --git a/setting-profile/src/setting-profile-common.c b/setting-profile/src/setting-profile-common.c
index 742235ebd8d512c78e5583176568468c503e3f3b..75f6d613f5fd7429ee665140104e3971d2d7d25a 100755 (executable)
--- a/setting-profile/src/setting-profile-common.c
+++ b/setting-profile/src/setting-profile-common.c
@@ -27,7 +27,7 @@
 #include <player.h>
 
 /*resolve P130805-7070 */
-#define SETTING_DEFAULT_FOLDER_PATH    _TZ_SYS_SHARE"/settings/"
+#define SETTING_DEFAULT_FOLDER_PATH    _TZ_SYS_GLOBALUSER_DATA"/settings/"
 #define SDCARD_PATH    _TZ_SYS_MEDIA"/sdcard/"
 #define EXP 0.001
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 8c8a5d451e799673644b230c978d196d7078e284..cdd1ddd2896e24cfd57d8c1b89febe6407f28b50 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -43,7 +43,7 @@
 #define NOTIFICATION_STR_ON_LOCK_SCREEN_SHOW_ALL \
        "IDS_QP_OPT_SHOW_ALL_CONTENT_ABB"
 #define SILENT_MODE "Silent"
-#define INIT_PATH      _TZ_SYS_SHARE"/settings/Vibrations/"
+#define INIT_PATH      _TZ_SYS_GLOBALUSER_DATA"/settings/Vibrations/"
 
 /* should be called in function to return void */
 #define ADD_GENLIST2(genlist, parent) \

diff --git a/setting-ringtone/include/setting-ringtone.h b/setting-ringtone/include/setting-ringtone.h
index a8129413289bb7725a6a3e6c5df8bf9d44115898..a009ac364f58ff7df70e9e9ae48ac4f2b72ec0b7 100644 (file)
--- a/setting-ringtone/include/setting-ringtone.h
+++ b/setting-ringtone/include/setting-ringtone.h
@@ -34,13 +34,13 @@
 
 #define SETTING_RINGTONE_PACKAGE_NAME "org.tizen.setting-ringtone"
 
-#define RINGTONE_DIR_PATH      _TZ_SYS_SHARE"/settings/Ringtones"
-#define RINGTONE_DIR_PATH_1    _TZ_SYS_SHARE"/settings/Ringtones/"
-#define ALERT_DIR_PATH         _TZ_SYS_SHARE"/settings/Alerts"
-#define ALERT_DIR_PATH_1       _TZ_SYS_SHARE"/settings/Alerts/"
-#define RINGTONE_FILE_PATH_DEF _TZ_SYS_SHARE\
+#define RINGTONE_DIR_PATH      _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones"
+#define RINGTONE_DIR_PATH_1    _TZ_SYS_GLOBALUSER_DATA"/settings/Ringtones/"
+#define ALERT_DIR_PATH         _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts"
+#define ALERT_DIR_PATH_1       _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts/"
+#define RINGTONE_FILE_PATH_DEF _TZ_SYS_GLOBALUSER_DATA\
                                "/settings/Ringtones/ringtone_sdk.mp3"
-#define ALERT_FILE_PATH_DEF    _TZ_SYS_SHARE\
+#define ALERT_FILE_PATH_DEF    _TZ_SYS_GLOBALUSER_DATA\
                                "/settings/Alerts/General notification_sdk.wav"
 
 /**

diff --git a/setting-ringtone/src/setting-ringtone.c b/setting-ringtone/src/setting-ringtone.c
index 61ce03ce41e6353bfcd77786d112616b1b10035f..ac0b9e46d1d8b31fc519032de9ed5729baf1f913 100644 (file)
--- a/setting-ringtone/src/setting-ringtone.c
+++ b/setting-ringtone/src/setting-ringtone.c
@@ -100,7 +100,7 @@ bool __parse_appctl_request(app_control_h service, void *priv)
                } else {
                        SETTING_TRACE("custom dir path is NULL, only setting "\
                                        "defaults will be shown %s",
-                                       _TZ_SYS_SHARE"/settings/Alerts");
+                                       _TZ_SYS_GLOBALUSER_DATA"/settings/Alerts");
                }
        }
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 55b0eeecbff87566e7ab3490d29df6a958c0c16e..c3fd1c785c7a44f1032056847316c0971e74ea4c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,7 +151,7 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${TZ_SYS_RO_APP
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
 
 # install media-data ; should be at /usr/share
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_SYS_SHARE} PATTERN "*")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media/settings DESTINATION ${TZ_SYS_GLOBALUSER_DATA} PATTERN "*")
 #IF("${BUILD_ARCH}" STREQUAL "arm")
 #      INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION ${TZ_SYS_RO_APP}/org.tizen.setting/shared/res PATTERN "*")
 #ELSE("${BUILD_ARCH}" STREQUAL "arm")