From: MyoungJune Park Date: Fri, 13 Jan 2017 06:13:14 +0000 (+0900) Subject: add TZ_XXX config variables to init keys X-Git-Tag: accepted/tizen/common/20170117.174912~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ef4ceaaf91a0bb94efe5b2f33977643abdda088;p=platform%2Fcore%2Fappfw%2Fvconf-internal-keys.git add TZ_XXX config variables to init keys Change-Id: I921e42e5f13311fd7abb8ed49642a631d8a9acae Signed-off-by: MyoungJune Park (cherry picked from commit 8b8fe783f34d6ced203d0c7e22c62d8ffa0b5454) --- diff --git a/Makefile b/Makefile index afe3f35..48fec4f 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ init: # then \ # rm ./scripts/all.sh; \ # fi; + cp all.sh.in ./scripts/all.sh %.html:%.xml xsltproc $(xsltopt) test_report.xsl $< > $@ diff --git a/all.sh.in b/all.sh.in new file mode 100644 index 0000000..fc9ca74 --- /dev/null +++ b/all.sh.in @@ -0,0 +1,11 @@ +!/bin/bash +############################################################ +# SYSTEM VARIABLES # +############################################################ + +TZ_SYS_GLOBALUSER_DATA=`tzplatform-get TZ_SYS_GLOBALUSER_DATA | sed 's/^.*=//'` +TZ_SYS_GLOBALUSER_DB=`tzplatform-get TZ_SYS_GLOBALUSER_DB | sed 's/^.*=//'` +TZ_SYS_MEDIA=`tzplatform-get TZ_SYS_MEDIA | sed 's/^.*=//'` +TZ_SYS_RW_APP=`tzplatform-get TZ_SYS_RW_APP | sed 's/^.*=//'` +TZ_SYS_RO_APP=`tzplatform-get TZ_SYS_RO_APP | sed 's/^.*=//'` +############################################################ diff --git a/check.xsd b/check.xsd index 58115ec..4b7b9d1 100644 --- a/check.xsd +++ b/check.xsd @@ -28,6 +28,7 @@ + diff --git a/create_cmd.xsl b/create_cmd.xsl index 4fa2479..1bb6155 100644 --- a/create_cmd.xsl +++ b/create_cmd.xsl @@ -12,6 +12,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + + + + @@ -42,4 +47,12 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + + + +# INITSCRIPT HERE + + + diff --git a/data/vconf-internal-idle-lock-keys.xml b/data/vconf-internal-idle-lock-keys.xml index ac633e1..2e8c4db 100644 --- a/data/vconf-internal-idle-lock-keys.xml +++ b/data/vconf-internal-idle-lock-keys.xml @@ -3,7 +3,7 @@
VCONFKEY_IDLE_LOCK_BGSET
- /opt/share/settings/Wallpapers/home_001.png + ${TZ_SYS_GLOBALUSER_DATA}/settings/Wallpapers/home_001.png diff --git a/data/vconf-internal-setting-keys.xml b/data/vconf-internal-setting-keys.xml index 0b33839..53fdc93 100644 --- a/data/vconf-internal-setting-keys.xml +++ b/data/vconf-internal-setting-keys.xml @@ -162,9 +162,15 @@ echo "--------------------------------------------------------------------------
VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR
- /opt/share/settings/Ringtones/ringtone_sdk.mp3 - /opt/share/settings/Ringtones/Ringtone.ogg - /opt/share/settings/Ringtones/Ringtone.ogg + + ${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/ringtone_sdk.mp3 + ${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg Myoungjune Park mj2004.park@samsung.com @@ -185,9 +191,9 @@ echo "--------------------------------------------------------------------------
VCONFKEY_SETAPPL_CALL_RINGTONE_DEFAULT_PATH_STR
- /opt/share/settings/Ringtones/ringtone_sdk.mp3 - /opt/share/settings/Ringtones/Ringtone.ogg - /opt/share/settings/Ringtones/Ringtone.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/ringtone_sdk.mp3 + ${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg Myoungjune Park mj2004.park@samsung.com @@ -234,25 +240,25 @@ echo "--------------------------------------------------------------------------
VCONFKEY_SETAPPL_NOTI_RINGTONE_PATH_STR
- /opt/share/settings/Alerts/General notification_sdk.wav + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/General notification_sdk.wav Myoungjune Park mj2004.park@samsung.com
VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR
- /opt/share/settings/Alerts/General notification_sdk.wav - /opt/share/settings/Alerts/Notification.ogg - /opt/share/settings/Alerts/Notification.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/General notification_sdk.wav + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg Myoungjune Park mj2004.park@samsung.com
VCONFKEY_SETAPPL_NOTI_RINGTONE_DEFAULT_PATH_STR
- /opt/share/settings/Alerts/General notification_sdk.wav - /opt/share/settings/Alerts/Notification.ogg - /opt/share/settings/Alerts/Notification.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/General notification_sdk.wav + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg Myoungjune Park mj2004.park@samsung.com @@ -781,7 +787,11 @@ echo "--------------------------------------------------------------------------
VCONFKEY_SETAPPL_TIMEZONE_ID
- Asia/Seoul + + ${CUR_TZ_PATH} Myoungjune Park mj2004.park@samsung.com @@ -1010,7 +1020,7 @@ echo "Do Nothing on TV"
VCONFKEY_BGSET
- /opt/share/settings/Wallpapers/home_001.png + ${TZ_SYS_GLOBALUSER_DATA}/settings/Wallpapers/home_001.png /usr/apps/org.tizen.watch-setting/shared/res/settings/Wallpapers/Home_default.jpg Myoungjune Park mj2004.park@samsung.com diff --git a/data/vconf-internal-uncategorized-keys.xml b/data/vconf-internal-uncategorized-keys.xml index c9ef731..41b9c12 100644 --- a/data/vconf-internal-uncategorized-keys.xml +++ b/data/vconf-internal-uncategorized-keys.xml @@ -17,7 +17,7 @@
VCONFKEY_UNCATEGORIZED_41
- /opt/usr/share/settings/Alerts/Over the horizon.mp3 + ${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Over the horizon.mp3 diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec index 98f5bfb..7e6dd9e 100755 --- a/packaging/vconf-internal-keys.spec +++ b/packaging/vconf-internal-keys.spec @@ -9,6 +9,9 @@ BuildRequires: cmake BuildRequires: xsltproc BuildRequires: libxml2-tools Requires: vconf +Requires: tizen-platform-config +Requires: tizen-platform-config-tools + Requires: findutils Requires: vconf-internal-keys-config