add TZ_XXX config variables to init keys

Change-Id: I921e42e5f13311fd7abb8ed49642a631d8a9acae
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>
(cherry picked from commit 8b8fe783f34d6ced203d0c7e22c62d8ffa0b5454)

diff --git a/Makefile b/Makefile
index afe3f35..48fec4f 100644 (file)
--- 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 (file)
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 (file)
--- a/check.xsd
+++ b/check.xsd
@@ -28,6 +28,7 @@
                <xs:complexType>
                        <xs:sequence>
                                <xs:element ref="header" minOccurs='1' maxOccurs='1'/>
+                               <xs:element name="initscript" type="Value" minOccurs='0' maxOccurs='unbounded'/>
                                <xs:element name="val" type="Value" minOccurs='1' maxOccurs='unbounded'/>
                                <xs:element ref="creator" minOccurs='0' maxOccurs='1'/>
                                <xs:element ref="email" minOccurs='0' maxOccurs='1'/>

diff --git a/create_cmd.xsl b/create_cmd.xsl
index 4fa2479..1bb6155 100644 (file)
--- a/create_cmd.xsl
+++ b/create_cmd.xsl
@@ -12,6 +12,11 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
        <xsl:variable name="layer_path" select="./@name"/>
        <xsl:variable name="layer_name" select="substring-before($layer_path,'/')"/>
 
+<xsl:choose>
+       <xsl:when test="./initscript">
+<xsl:value-of select="initscript"/>
+  </xsl:when>
+</xsl:choose>
 
 <xsl:choose>
        <xsl:when test="@headeronly">
@@ -42,4 +47,12 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   </xsl:otherwise>
 </xsl:choose>
 </xsl:template>
+
+
+<xsl:template match="initscript">
+
+# INITSCRIPT HERE
+
+</xsl:template>
+
 </xsl:stylesheet>

diff --git a/data/vconf-internal-idle-lock-keys.xml b/data/vconf-internal-idle-lock-keys.xml
index ac633e1..2e8c4db 100644 (file)
--- a/data/vconf-internal-idle-lock-keys.xml
+++ b/data/vconf-internal-idle-lock-keys.xml
@@ -3,7 +3,7 @@
   <filedef name="__VCONF_INTERNAL_IDLE_LOCK_KEYS_H__"/>
   <vconfkey type="string" name="db/idle_lock/bgset" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_IDLE_LOCK_BGSET</header>
-    <val>/opt/share/settings/Wallpapers/home_001.png</val>
+       <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Wallpapers/home_001.png</val>
     <creator/>
     <email/>
     <comment><![CDATA[SYSTEM_SETTINGS_KEY_WALLPAPER_LOCK_SCREEN (system-settings) refers to this key, READ for public, WRITE for platform ]]></comment>

diff --git a/data/vconf-internal-setting-keys.xml b/data/vconf-internal-setting-keys.xml
index 0b33839..53fdc93 100644 (file)
--- a/data/vconf-internal-setting-keys.xml
+++ b/data/vconf-internal-setting-keys.xml
@@ -162,9 +162,15 @@ echo "--------------------------------------------------------------------------
   </vconfkey>
   <vconfkey type="string" name="db/setting/sound/call/ringtone_path" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR</header>
-    <val>/opt/share/settings/Ringtones/ringtone_sdk.mp3</val>
-    <val model="wearable">/opt/share/settings/Ringtones/Ringtone.ogg</val>
-    <val model="wearable/emulator">/opt/share/settings/Ringtones/Ringtone.ogg</val>
+       <!--
+    <initscript><![CDATA[
+# TEST HERE1
+GLOBALUSER_APP_DATA_PATH=`tzplatform-get TZ_SYS_GLOBALUSER_DATA | sed 's/^.*=//'`
+]]></initscript>
+-->
+    <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/ringtone_sdk.mp3</val>
+       <val model="wearable">${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg</val>
+       <val model="wearable/emulator">${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ ]]></comment>
@@ -185,9 +191,9 @@ echo "--------------------------------------------------------------------------
   </vconfkey>
   <vconfkey type="string" name="db/setting/sound/call/ringtone_default_path" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_SETAPPL_CALL_RINGTONE_DEFAULT_PATH_STR</header>
-    <val>/opt/share/settings/Ringtones/ringtone_sdk.mp3</val>
-    <val model="wearable">/opt/share/settings/Ringtones/Ringtone.ogg</val>
-    <val model="wearable/emulator">/opt/share/settings/Ringtones/Ringtone.ogg</val>
+       <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/ringtone_sdk.mp3</val>
+       <val model="wearable">${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg</val>
+       <val model="wearable/emulator">${TZ_SYS_GLOBALUSER_DATA}/settings/Ringtones/Ringtone.ogg</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ ]]></comment>
@@ -234,25 +240,25 @@ echo "--------------------------------------------------------------------------
   </vconfkey>
   <vconfkey type="string" name="db/setting/sound/noti/msg_ringtone_path" headeronly="true" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_SETAPPL_NOTI_RINGTONE_PATH_STR</header>
-    <val>/opt/share/settings/Alerts/General notification_sdk.wav</val>
+       <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/General notification_sdk.wav</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ Header only key to keep ABI test successful ]]></comment>
   </vconfkey>
   <vconfkey type="string" name="db/setting/sound/noti/msg_ringtone_path" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR</header>
-    <val>/opt/share/settings/Alerts/General notification_sdk.wav</val>
-    <val model="wearable">/opt/share/settings/Alerts/Notification.ogg</val>
-    <val model="wearable/emulator">/opt/share/settings/Alerts/Notification.ogg</val>
+       <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/General notification_sdk.wav</val>
+       <val model="wearable">${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg</val>
+       <val model="wearable/emulator">${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ msg-service is using this key. so DO NOT REMOVE. (sangkoo.kim@samsung.com) ]]></comment>
   </vconfkey>
   <vconfkey type="string" name="db/setting/sound/noti/ringtone_default_path" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_SETAPPL_NOTI_RINGTONE_DEFAULT_PATH_STR</header>
-    <val>/opt/share/settings/Alerts/General notification_sdk.wav</val>
-    <val model="wearable">/opt/share/settings/Alerts/Notification.ogg</val>
-    <val model="wearable/emulator">/opt/share/settings/Alerts/Notification.ogg</val>
+       <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/General notification_sdk.wav</val>
+       <val model="wearable">${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg</val>
+       <val model="wearable/emulator">${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Notification.ogg</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ ]]></comment>
@@ -781,7 +787,11 @@ echo "--------------------------------------------------------------------------
   </vconfkey>
   <vconfkey type="string" name="db/setting/timezone_id" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_SETAPPL_TIMEZONE_ID</header>
-    <val>Asia/Seoul</val>
+    <initscript><![CDATA[
+# GET CURRENT TIMEZONE LINK
+CUR_TZ_PATH=`readlink /opt/etc/localtime | sed "s/\/usr\/share\/zoneinfo\///"`
+]]></initscript>
+       <val>${CUR_TZ_PATH}</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>
     <comment><![CDATA[ ]]></comment>
@@ -1010,7 +1020,7 @@ echo "Do Nothing on TV"
   </vconfkey>
   <vconfkey type="string" name="db/menu_widget/bgset" readPriv="http://tizen.org/privilege/internal/default/public" writePriv="http://tizen.org/privilege/systemsettings.admin">
     <header>VCONFKEY_BGSET</header>
-    <val>/opt/share/settings/Wallpapers/home_001.png</val>
+       <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Wallpapers/home_001.png</val>
     <val model="wearable">/usr/apps/org.tizen.watch-setting/shared/res/settings/Wallpapers/Home_default.jpg</val>
     <creator> Myoungjune Park </creator>
     <email>mj2004.park@samsung.com</email>

diff --git a/data/vconf-internal-uncategorized-keys.xml b/data/vconf-internal-uncategorized-keys.xml
index c9ef731..41b9c12 100644 (file)
--- a/data/vconf-internal-uncategorized-keys.xml
+++ b/data/vconf-internal-uncategorized-keys.xml
@@ -17,7 +17,7 @@
   </vconfkey>
   <vconfkey type="string" name="db/private/email-service/noti_ringtone_path" readPriv="http://tizen.org/privilege/internal/default/platform" writePriv="http://tizen.org/privilege/internal/default/platform">
     <header>VCONFKEY_UNCATEGORIZED_41</header>
-    <val>/opt/usr/share/settings/Alerts/Over the horizon.mp3</val>
+    <val>${TZ_SYS_GLOBALUSER_DATA}/settings/Alerts/Over the horizon.mp3</val>
     <creator/>
     <email/>
     <comment><![CDATA[ ]]></comment>

diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec
index 98f5bfb..7e6dd9e 100755 (executable)
--- 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