Modify the PostBuild script and update rpk.

[Problem]
 1. TNINE-4668: Bluetooth item is missing in Settings main menu.
 2. TNINE-4715: Wi-Fi and Bluetooth item texts are not showing properly.

[Cause & Measure]
 Cause: Resource package destination have been changed from 'res/allowed' to 'res/allowed/<res-type>' from FW side.
 Measure: Modified postbuild script accordingly and been built rpk with latest build tools.

Change-Id: I87f30ccb8c39009dae1cbd68671154ce3c65ebb2
Signed-off-by: Azijur Rahman Sheatu <azijur.r@samsung.com>

diff --git a/.gitignore b/.gitignore
index aec47d27b63daa738675cfbd9bb5ecc4168d94c8..bd602bc1b081c00fc772651cc31726552de6d2a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,6 @@
 **/[Dd]ebug/\r
 **/[Bb]uild/\r
 **/.gn\r
-**/res/allowed/*.dll\r
+**/res/allowed/org.*\r
 tags\r
 msbuild.log\r

diff --git a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
index c1870c5bf13b06a2300e90912125cba3ece769c6..bcb1fb9ab4bbe5df78c43e90c26a8ce2258909ab 100644 (file)
--- a/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
+++ b/SettingBluetooth/SettingBluetooth/SettingBluetooth.csproj
@@ -38,8 +38,12 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <PropertyGroup>
+    <GadgetResourceType>org.tizen.appfw.gadget.setting-bluetooth</GadgetResourceType>
+  </PropertyGroup>
+
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />
+    <Exec Command=":: Copy resource dll&#xD;&#xA;rmdir /S /Q res\allowed\$(GadgetResourceType)&#xD;&#xA;mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;mkdir res\allowed\locale&#xD;&#xA;dir $(OutDir)\&#xD;&#xA;xcopy /S /K /D /H /Y $(OutDir)\ res\allowed\locale&#xD;&#xA;del /Q res\allowed\locale\*.*&#xD;&#xA;xcopy /S /K /D /H /Y res\allowed\locale\* res\allowed\$(GadgetResourceType)&#xD;&#xA;rmdir /S /Q res\allowed\locale&#xD;&#xA;" />
   </Target>
 
 </Project>

diff --git a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk
index fe046992f0610c75657e5a785eba2366ab0af663..ed69e240d07a8dfadfcb59e4b55ce411bde13959 100644 (file)
Binary files a/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk and b/packaging/org.tizen.cssetting-bluetooth-1.9.0.rpk differ