Changes to resolve build error with latest SDK tools.

Changes:
	1. tizen_workspace.yaml is begin replaced by tizen_dotnet_project.yaml
	2. Command to build TizenPackage is begin updated in the Directory.Build.targets
	3. PostBuildEvent is causing insufficient memory error with older command.

Change-Id: I5e786af42157491f167ee72dea093139de288d5b

diff --git a/SettingAccessibility/SettingAccessibility/Directory.Build.targets b/SettingAccessibility/SettingAccessibility/Directory.Build.targets
index 35ec3160a00782f51ab2383be12d30a8bf358412..9cdc4c8a66094f16aa53034756ce634b71595531 100644 (file)
--- a/SettingAccessibility/SettingAccessibility/Directory.Build.targets
+++ b/SettingAccessibility/SettingAccessibility/Directory.Build.targets
@@ -16,6 +16,6 @@ WARNING:  DO NOT MODIFY this file. Incorrect changes to this file will make it
         </PropertyGroup>
         <Message Text="Workspace: '$(WorkspaceFolder)'"  Importance="high" />
 
-               <Exec Command="C:\tizen-sdk\tools\tizen-core\tz.exe pack  -S $(ProjectDir) $(WorkspaceFolder)"> </Exec>
+               <Exec Command="C:\tizen-sdk\tools\tizen-core\tz.exe pack-chain -w $(ProjectDir) -S $(ProjectDir)"> </Exec>
     </Target>
 </Project>

diff --git a/SettingAccessibility/SettingAccessibility/SettingAccessibility.csproj b/SettingAccessibility/SettingAccessibility/SettingAccessibility.csproj
index 40a51f04066313a6cd0daae3fec1679b753d773d..312c082a41cb9c3dcf8bbb285a812ed75c1c703d 100644 (file)
--- a/SettingAccessibility/SettingAccessibility/SettingAccessibility.csproj
+++ b/SettingAccessibility/SettingAccessibility/SettingAccessibility.csproj
@@ -38,9 +38,11 @@
        </PropertyGroup>
 
        <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-               <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;" />
+               <Exec Command=":: Copy resource dll&#xD;&#xA;
+               dir $(OutDir)\&#xD;&#xA;
+               mkdir res\allowed\$(GadgetResourceType)&#xD;&#xA;
+               xcopy /S /K /D /H /Y $(OutDir)\en-US res\allowed\$(GadgetResourceType)\en-US\&#xD;&#xA;
+               xcopy /S /K /D /H /Y $(OutDir)\ko-KR res\allowed\$(GadgetResourceType)\ko-KR\&#xD;&#xA;" />
        </Target>
 
-
 </Project>
-

diff --git a/SettingAccessibility/SettingAccessibility/tizen_dotnet_project.yaml b/SettingAccessibility/SettingAccessibility/tizen_dotnet_project.yaml
index b5afe22b41c0f94b04ae7bad762ceccd59a22e00..63caaa28ef435db89e9b162885d0b70b38bdaa37 100644 (file)
--- a/SettingAccessibility/SettingAccessibility/tizen_dotnet_project.yaml
+++ b/SettingAccessibility/SettingAccessibility/tizen_dotnet_project.yaml
@@ -1,14 +1,57 @@
 # csproj file path
 csproj_file: SettingAccessibility.csproj
 
+# Default profile, Tizen API version
+profile: tizen
+api_version: "9.0"
+
+# Build type [Debug/ Release/ Test]
+build_type: Debug
+
+# Output path for build
+output_path:
+
+# Signing profile to be used for Tizen package signing
+# If value is empty: "", active signing profile will be used
+# Else If value is ".", default signing profile will be used
+signing_profile:
+pack_as_rpk: true
+
 # files monitored for dirty/modified status
 files:
-  - SettingAccessibility.csproj
+  - .gn
+  - Build/.exportmap
+  - Build/BUILD.gn
+  - Build/BUILDCONFIG.gn
+  - Build/SettingAccessibility/BUILD.gn
+  - Directory.Build.targets
+  - Interop/Interop.TTS.cs
+  - Interop/Interop.Vconf.cs
+  - LanguageMenu.cs
+  - MenuProvider.cs
   - SettingAccessibility.cs
+  - SettingAccessibility.csproj
+  - SettingAccessibility.csproj.user
+  - StatusBarMenu.cs
+  - TextResources/Resources.Designer.cs
+  - TextResources/Resources.en-US.resx
+  - TextResources/Resources.ko-KR.resx
+  - TextResources/Resources.resx
+  - res/allowed/SettingAccessibility/accessibility-icon.svg
+  - res/allowed/org.tizen.appfw.gadget.setting-accessibility/en-US/SettingAccessibility.resources.dll
+  - res/allowed/org.tizen.appfw.gadget.setting-accessibility/ko-KR/SettingAccessibility.resources.dll
+  - res/allowed/org.tizen.appfw.gadget.setting-accessibility/obj/Build/pack.stamp
+  - res/allowed/org.tizen.appfw.gadget.setting-accessibility/obj/SettingAccessibility/hash.stamp
   - tizen-manifest.xml
 
-# Enable to pack as rpk
-pack_as_rpk: true
+# project dependencies
+deps: []
+
+# Source files matching these pattern will always be excluded from build
+src_file_patterns: []
+
+# Source files matching these patterns will only be included while building in test mode
+test_file_patterns: []
 
 # List of resource files to be packed in rpk
 resources:

diff --git a/SettingAccessibility/tizen_workspace.yaml b/SettingAccessibility/tizen_workspace.yaml
deleted file mode 100644 (file)
index a6b4c10..0000000
--- a/SettingAccessibility/tizen_workspace.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-#  Enable auto build file generation
-auto_gen_build_files: true
-#  Workspace type, [native/web/dotnet]
-type: hybrid
-#  Package ID for the Tizen package
-package_id: 
-#  version for the Tizen package
-version: 
-#  Default profile
-profile: mobile
-#  Tizen API version
-api_version: 7.0
-#  Path of profiles.xml, containing the signing profiles 
- # If value is empty, the profiles.xml in the data_path specified in tizen-studio/tools/tizen-core/config.yaml will be used
-profiles_xml_path: C:/tizen-sdk-data/profile/profiles.xml
-#  Signing profile to be used for Tizen package signing 
- # If value is empty, active signing profile will be used
-signing_profile: ''
-#  Build type [debug/ release/ test]
-build_type: debug
-#  Rootstrap for compiling native app
-rootstrap: public
-#  Default compiler for native app compilation
-compiler: llvm
-#  Default path for dotnet-cli
-dotnet_cli_path: 
-#  Default path for msbuild
-msbuild_path: 
-#  Default tool for dotnet build [dotnet-cli/ msbuild]
-dotnet_build_tool: dotnet-cli
-#  Default nuget version for Tizen.Net
-tizen_net_version: 
-#  Default nuget version for Xamarin.Forms
-tizen_net_sdk_verison: 1.1.9
-#  Default nuget version for MSBuild.Tasks
-xamarin_forms_version: 5.0.0.2515
-#  Default nuget version for Tizen.Wearable.CircleUI
-msbuild_tasks_version: 
-#  Default nuget version for Tizen.Wearable.CircleUI
-tizen_wearable_circleui_version: 1.5.0
-#  Default nuget version for Tizen.OpenTK
-tizen_opentk_version: 3.0.2
-#  Default nuget version for Tizen.NUI.Xaml
-tizen_nuixaml_version: 1.0.34
-#  Default nuget version for Tizen.HotReload
-tizen_hotreload_version: 1.0.1
-#  Working folder for dotnet & web workspace, paths to csproj or sln or config.xml, if empty all projects will be build
-working_folder:
-#  Default path for Google Chrome
-chrome_path: 
-#  Default options to be passed to Chrome when running web simulator
-chrome_simulator_options:
-- --allow-file-access-from-files
-- --disable-web-security
-- --proxy-auto-detect
-#  Default path for Web Simulator data
-chrome_simulator_data_path: C:\tizen-sdk\tools\websimulator\sdk-profile-data
-#  Default path for Samsung Tizen TV Simulator
-tv_simulator_path: C:\tizen-sdk\tools\sec-tv-simulator\simulator.exe
-#  Default options to be passed to Chrome when running web inspector
-chrome_inspector_options:
-- --no-first-run
-- --activate-on-launch
-- --no-default-browser-check
-- --allow-file-access-from-files
-- --disable-web-security
-- --disable-translate
-- --proxy-auto-detect
-- --proxy-bypass-list=127.0.0.1
-- --enable-blink-features=ShadowDOMV0
-- --enable-blink-features=CustomElementsV0
-#  Default path for Web Inspector data
-chrome_inspector_data_path: C:\tizen-sdk-data\chrome-user-data
-#  default arch for build, [x86/ x86_64/ arm/ aarch64]
-arch: x86
-#  Enable size optimization of wgt for web workspace
-opt: false
-#  Source files matching these pattern will always be excluded from build
-src_file_patterns:
-- _exclude*
-#  Source files matching these patterns will only be included while building in test mode
-test_file_patterns:
-- _test*
-#  List of projects in the workspace and their dependencies
-projects:
-  SettingAccessibility: []
-#  Skip generating files needed for VS
-skip_vs_files: false