Modify the PostBuild script and update rpk.

[Problem]
 1. TNINE-4667: Wi-Fi 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: I6a316e60c874f121629a7487e752c18065fa5412
Signed-off-by: Azijur Rahman Sheatu <azijur.r@samsung.com>

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

diff --git a/SettingWiFi/SettingWiFi/SettingWiFi.csproj b/SettingWiFi/SettingWiFi/SettingWiFi.csproj
index ff99b3257f8d11b7c03562196cbbca45d7d5d12c..3b537810dfbff84f54b03bba949ba0b946fb7da4 100755 (executable)
--- a/SettingWiFi/SettingWiFi/SettingWiFi.csproj
+++ b/SettingWiFi/SettingWiFi/SettingWiFi.csproj
@@ -38,8 +38,12 @@
                </EmbeddedResource>\r
        </ItemGroup>\r
 \r
+       <PropertyGroup>\r
+               <GadgetResourceType>org.tizen.appfw.gadget.setting-wifi</GadgetResourceType>\r
+       </PropertyGroup>\r
+\r
        <Target Name="PostBuild" AfterTargets="PostBuildEvent">\r
-               <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;" />\r
+               <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;" />\r
        </Target>\r
 \r
 </Project>\r

diff --git a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk
index 7d1adafb571b8143c0890c54ede6bc737c9b2956..550ca5b03bee205729c6a8da6dbe0bd5ddee626d 100644 (file)
Binary files a/packaging/org.tizen.cssetting-wifi-1.1.6.rpk and b/packaging/org.tizen.cssetting-wifi-1.1.6.rpk differ