Merge "Remove multi-assistant vconfkey" into tizen

diff --git a/Makefile b/Makefile
index 9837361..f7276f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,11 +19,17 @@ check:
        echo $(XMLS)
        $(foreach var, $(XMLS), xmllint --noout --schema check.xsd $(var) || exit;)
 
+ifneq ($(profile), )
+xsltopt = --stringparam profile $(profile)
+else
+xsltopt = --stringparam profile ''
+endif
 ifneq ($(model), )
-xsltopt=--stringparam target $(MODEL)
+xsltopt += --stringparam target $(MODEL)
 else
-xsltopt=--stringparam target ''
+xsltopt += --stringparam target ''
 endif
+
 init:
        @mkdir -p report
        @mkdir -p scripts

diff --git a/create_cmd.xsl b/create_cmd.xsl
index a80d6f6..34f5ae7 100644 (file)
--- a/create_cmd.xsl
+++ b/create_cmd.xsl
@@ -21,7 +21,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   </xsl:when>
   <xsl:otherwise>
          <xsl:choose>
-                 <xsl:when test="./@profile=$target">
+                 <xsl:when test="./@profile=$profile">
 /usr/bin/buxton2ctl -i -d create-<xsl:value-of select="@type"/> <xsl:choose><xsl:when test="$layer_name = 'db' or $layer_name = 'file' "> "system" </xsl:when><xsl:otherwise> "memory" </xsl:otherwise></xsl:choose> "<xsl:value-of select="./@name"/>"  <xsl:choose><xsl:when test="./val[@model=$target]"> "<xsl:value-of select="./val[@model=$target]"/>" </xsl:when><xsl:otherwise> "<xsl:value-of select="./val[not(@model)]"/>" </xsl:otherwise></xsl:choose> "<xsl:value-of select="./@readPriv"/>" "<xsl:value-of select="./@writePriv"/>"<xsl:text>&#10;</xsl:text>
                  </xsl:when>
                  <xsl:otherwise>

diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec
index 70ebedb..4b20408 100755 (executable)
--- a/packaging/vconf-internal-keys.spec
+++ b/packaging/vconf-internal-keys.spec
@@ -93,35 +93,35 @@ mkdir -p scripts_wearable
 mkdir -p scripts_ivi
 
 %ifarch %arm aarch64
-make model=mobile
+make profile=mobile model=mobile
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_mobile/
 cp remove_keys.sh scripts_mobile/
 cp scripts/*.txt scripts_mobile/
 make clean
-make model=tv
+make profile=tv model=tv
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_tv/
 cp remove_keys.sh scripts_tv/
 cp scripts/*.txt scripts_tv/
 make clean
-make model=wearable
+make profile=wearable model=wearable
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_wearable/
 cp remove_keys.sh scripts_wearable/
 cp scripts/*.txt scripts_wearable/
 make clean
-make model=ivi
+make profile=ivi model=ivi
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_ivi/
 cp remove_keys.sh scripts_ivi/
 cp scripts/*.txt scripts_ivi/
 make clean
-make model=common
+make profile=common model=common
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_common/
@@ -129,35 +129,35 @@ cp remove_keys.sh scripts_common/
 cp scripts/*.txt scripts_common/
 
 %else
-make model=mobile/emulator
+make profile=mobile model=mobile/emulator
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_mobile/
 cp remove_keys.sh scripts_mobile/
 cp scripts/*.txt scripts_mobile/
 make clean
-make model=tv/emulator
+make profile=tv model=tv/emulator
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_tv/
 cp remove_keys.sh scripts_tv/
 cp scripts/*.txt scripts_tv/
 make clean
-make model=wearable/emulator
+make profile=wearable model=wearable/emulator
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_wearable/
 cp remove_keys.sh scripts_wearable/
 cp scripts/*.txt scripts_wearable/
 make clean
-make model=ivi/emulator
+make profile=ivi model=ivi/emulator
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_ivi/
 cp remove_keys.sh scripts_ivi/
 cp scripts/*.txt scripts_ivi/
 make clean
-make model=common/emulator
+make profile=common model=common/emulator
 awk '{ if ($5 == "\"memory\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_memory.txt
 awk '{ if ($5 == "\"system\"" ) print $LR }' ./scripts/all.sh | awk '{ print $6}' | sed -e 's/^"//' -e 's/"$//' | sort > ./scripts/vk_system.txt
 cp scripts/*.sh scripts_common/