From: WonYoung Choi Date: Wed, 6 Jul 2016 07:29:59 +0000 (+0900) Subject: Change assembly installation path X-Git-Tag: accepted/tizen/mobile/20161215.072334~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=53a1eeb11481f469b330bb71b99d4bc3adeadb1b;p=platform%2Fcore%2Fcsapi%2Fsystem-settings.git Change assembly installation path The assembly installation path is changed to /usr/share/assembly/ as default. This path can be overrided by the macro %dotnet_assembly_path also. Change-Id: Ia3f067473ff69d42e86945b2d8fc9906bc3985b3 --- diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Tizen.System.SystemSettings.sln b/Tizen.System.SystemSettings.sln deleted file mode 100644 index 6287465..0000000 --- a/Tizen.System.SystemSettings.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.System.SystemSettings", "Tizen.System.SystemSettings\Tizen.System.SystemSettings.csproj", "{09D03C33-2FCE-4C18-BEC8-F585A865A4B4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tct-system-settings-tizen-tests", "tct-system-settings-tizen-tests\tct-system-settings-tizen-tests.csproj", "{8C1E183D-1AC2-4301-BDD6-A026BE81D095}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {09D03C33-2FCE-4C18-BEC8-F585A865A4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09D03C33-2FCE-4C18-BEC8-F585A865A4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09D03C33-2FCE-4C18-BEC8-F585A865A4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09D03C33-2FCE-4C18-BEC8-F585A865A4B4}.Release|Any CPU.Build.0 = Release|Any CPU - {8C1E183D-1AC2-4301-BDD6-A026BE81D095}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C1E183D-1AC2-4301-BDD6-A026BE81D095}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C1E183D-1AC2-4301-BDD6-A026BE81D095}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C1E183D-1AC2-4301-BDD6-A026BE81D095}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj index 3b3540a..ddd7182 100644 --- a/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj +++ b/Tizen.System.SystemSettings/Tizen.System.SystemSettings.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Tizen.System.SystemSettings Tizen.System.SystemSettings - v4.0 + v4.5 512 @@ -43,21 +43,24 @@ + + + - ..\..\..\Desktop\Tizen_dlls\Tizen.dll + ..\..\tizen\Tizen\bin\Debug\Tizen.dll - ..\..\..\Desktop\Tizen_dlls\Tizen.Internals.dll + ..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll - - - - - + + + + + diff --git a/Tizen.System.SystemSettings/SystemSettings.cs b/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettings.cs similarity index 100% rename from Tizen.System.SystemSettings/SystemSettings.cs rename to Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettings.cs diff --git a/Tizen.System.SystemSettings/SystemSettingsEnums.cs b/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEnums.cs similarity index 100% rename from Tizen.System.SystemSettings/SystemSettingsEnums.cs rename to Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEnums.cs diff --git a/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs b/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs similarity index 100% rename from Tizen.System.SystemSettings/SystemSettingsEventArgs.cs rename to Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsEventArgs.cs diff --git a/Tizen.System.SystemSettings/SystemSettingsExceptionFactory.cs b/Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsExceptionFactory.cs similarity index 100% rename from Tizen.System.SystemSettings/SystemSettingsExceptionFactory.cs rename to Tizen.System.SystemSettings/Tizen.System.SystemSettings/SystemSettingsExceptionFactory.cs diff --git a/packaging/csapi-systemsettings.pc.in b/packaging/csapi-systemsettings.pc.in deleted file mode 100644 index c396812..0000000 --- a/packaging/csapi-systemsettings.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: csapi-systemsettings -Description: Tizen System Settings API for C# -Version: @version@ -Libs: -r:@dllpath@/@dllname@ -Requires: \ No newline at end of file diff --git a/packaging/csapi-systemsettings.spec b/packaging/csapi-systemsettings.spec index 9f47acb..a664d27 100644 --- a/packaging/csapi-systemsettings.spec +++ b/packaging/csapi-systemsettings.spec @@ -1,5 +1,10 @@ -%define dllpath %{_libdir}/mono/tizen -%define dllname Tizen.System.SystemSettings.dll +%{!?dotnet_assembly_path: %define dotnet_assembly_path %{_datadir}/assembly} + +%if 0%{?tizen_build_devel_mode} +%define BUILDCONF Debug +%else +%define BUILDCONF Release +%endif Name: csapi-systemsettings Summary: Tizen System API for C# @@ -10,75 +15,45 @@ License: Apache-2.0 URL: https://www.tizen.org Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest -Source2: %{name}.pc.in -# TODO: replace mono-compiler, mono-devel to mcs, mono-shlib-cop +# Mono BuildRequires: mono-compiler BuildRequires: mono-devel -# TODO: replace mono-core to gacutil. -# mono-core should provide the symbol 'gacutil' -Requires(post): mono-core -Requires(postun): mono-core -# P/Invoke Dependencies +# P/Invoke Build Requires BuildRequires: pkgconfig(capi-system-system-settings) -# P/Invoke Runtime Dependencies -# TODO: It should be removed after fix tizen-rpm-config -Requires: pkgconfig(capi-system-system-settings) -# DLL Dependencies -BuildRequires : pkgconfig(csapi-tizen) +# C# API Requires +BuildRequires: csapi-tizen %description Tizen System Device API for C# -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description devel -Development package for %{name} - %prep %setup -q - cp %{SOURCE1} . -%build -# build dll -mcs -target:library -out:%{dllname} -keyfile:Tizen.System.SystemSettings/Tizen.System.SystemSettings.snk -pkg:csapi-tizen \ - Tizen.System.SystemSettings/Properties/AssemblyInfo.cs \ - Tizen.System.SystemSettings/SystemSettings.cs \ - Tizen.System.SystemSettings/SystemSettingsEnums.cs \ - Tizen.System.SystemSettings/SystemSettingsEventArgs.cs \ - Tizen.System.SystemSettings/SystemSettingsExceptionFactory.cs \ - Tizen.System.SystemSettings/Interop/Interop.Settings.cs +%define Assemblies Tizen.System.SystemSettings -# check p/invoke -if [ -x %{dllname} ]; then - RET=`mono-shlib-cop %{dllname}`; \ - CNT=`echo $RET | grep -E "^error:" | wc -l`; \ - if [ $CNT -gt 0 ]; then exit 1; fi -fi +%build +for ASM in %{Assemblies}; do +xbuild $ASM/$ASM.csproj \ + /p:Configuration=%{BUILDCONF} \ + /p:ReferencePath=%{dotnet_assembly_path} +done %install -# copy dll -mkdir -p %{buildroot}%{dllpath} -install -p -m 644 %{dllname} %{buildroot}%{dllpath} +# Assemblies +mkdir -p %{buildroot}%{dotnet_assembly_path} +for ASM in %{Assemblies}; do +install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path} +done -# generate pkgconfig -mkdir -p %{buildroot}%{_libdir}/pkgconfig -sed -e "s#@version@#%{version}#g" \ - -e "s#@dllpath@#%{dllpath}#g" \ - -e "s#@dllname@#%{dllname}#g" \ - %{SOURCE2} > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc - -%post -gacutil -i %{dllpath}/%{dllname} +# License +mkdir -p %{buildroot}%{_datadir}/license +cp LICENSE %{buildroot}%{_datadir}/license/%{name} %files -%{dllpath}/%{dllname} - -%files devel -%{_libdir}/pkgconfig/%{name}.pc +%manifest %{name}.manifest +%attr(644,root,root) %{dotnet_assembly_path}/*.dll +%attr(644,root,root) %{_datadir}/license/%{name}