From: WonYoung Choi Date: Wed, 6 Jul 2016 07:50:43 +0000 (+0900) Subject: Change assembly installation path X-Git-Tag: submit/trunk/20170823.075128~100^2~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8821e74aeb6b962a34b00096f42aba50ac6e3d94;p=platform%2Fcore%2Fcsapi%2Ftizenfx.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: Ia3e9562183449fa064b6f45c9613e4d5122eff37 --- 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.Content.MediaContent.sln b/Tizen.Content.MediaContent.sln deleted file mode 100644 index c235aee..0000000 --- a/Tizen.Content.MediaContent.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.Content", "Tizen.Content\Tizen.Content.csproj", "{A106C68E-0E2F-4A1F-9E87-113DC4F78787}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaContentTest", "MediaContentTest\MediaContentTest.csproj", "{38D73AD8-5F12-4FE1-8C08-5FB46F0D6DAE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A106C68E-0E2F-4A1F-9E87-113DC4F78787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A106C68E-0E2F-4A1F-9E87-113DC4F78787}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A106C68E-0E2F-4A1F-9E87-113DC4F78787}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A106C68E-0E2F-4A1F-9E87-113DC4F78787}.Release|Any CPU.Build.0 = Release|Any CPU - {38D73AD8-5F12-4FE1-8C08-5FB46F0D6DAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38D73AD8-5F12-4FE1-8C08-5FB46F0D6DAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38D73AD8-5F12-4FE1-8C08-5FB46F0D6DAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38D73AD8-5F12-4FE1-8C08-5FB46F0D6DAE}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Tizen.Content.MediaContent.v12.suo b/Tizen.Content.MediaContent.v12.suo deleted file mode 100644 index 1a695b6..0000000 Binary files a/Tizen.Content.MediaContent.v12.suo and /dev/null differ diff --git a/packaging/csapi-media-content.pc.in b/packaging/csapi-media-content.pc.in deleted file mode 100644 index e103c74..0000000 --- a/packaging/csapi-media-content.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: csapi-media-content -Description: Tizen Media Content API for C# -Version: @version@ -Libs: -r:@dllpath@/@dllname@ -Requires: diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec index 3daa866..997f9dd 100755 --- a/packaging/csapi-media-content.spec +++ b/packaging/csapi-media-content.spec @@ -1,4 +1,10 @@ +%{!?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-media-content Summary: Tizen Media Content API for C# @@ -9,46 +15,46 @@ License: Apache-2.0 URL: https://www.tizen.org Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest -Source2: %{name}.pc.in +# Mono BuildRequires: mono-compiler BuildRequires: mono-devel + +# P/Invoke Build Requires BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(csapi-tizen) BuildRequires: pkgconfig(capi-content-media-content) -%description -Tizen API for C# - -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +# C# API Requires +BuildRequires: csapi-tizen -%description devel -Development package for %{name} +%description +Tizen Media Content API for C# %prep %setup -q - cp %{SOURCE1} . +%define Assemblies Tizen.Content.MediaContent + %build -xbuild Tizen.Content/Tizen.Content.MediaContent.csproj /p:Configuration=%{BUILDCONF} +for ASM in %{Assemblies}; do +xbuild $ASM/$ASM.csproj \ + /p:Configuration=%{BUILDCONF} \ + /p:ReferencePath=%{dotnet_assembly_path} +done %install -gacutil -i Tizen.Content/bin/%{BUILDCONF}/Tizen.Content.MediaContent.dll -root "%{buildroot}%{_libdir}" -package tizen +# 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 +# License +mkdir -p %{buildroot}%{_datadir}/license +cp LICENSE %{buildroot}%{_datadir}/license/%{name} %files %manifest %{name}.manifest -%{_libdir}/mono/ - -%files devel -%{_libdir}/pkgconfig/%{name}.pc +%attr(644,root,root) %{dotnet_assembly_path}/*.dll +%attr(644,root,root) %{_datadir}/license/%{name} diff --git a/Tizen.Content/Interop/Interop.AudioInformation.cs b/src/Tizen.Content.MediaContent/Interop/Interop.AudioInformation.cs similarity index 100% rename from Tizen.Content/Interop/Interop.AudioInformation.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.AudioInformation.cs diff --git a/Tizen.Content/Interop/Interop.Glib.cs b/src/Tizen.Content.MediaContent/Interop/Interop.Glib.cs similarity index 100% rename from Tizen.Content/Interop/Interop.Glib.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.Glib.cs diff --git a/Tizen.Content/Interop/Interop.ImageInformation.cs b/src/Tizen.Content.MediaContent/Interop/Interop.ImageInformation.cs similarity index 100% rename from Tizen.Content/Interop/Interop.ImageInformation.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.ImageInformation.cs diff --git a/Tizen.Content/Interop/Interop.Libc.cs b/src/Tizen.Content.MediaContent/Interop/Interop.Libc.cs similarity index 100% rename from Tizen.Content/Interop/Interop.Libc.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.Libc.cs diff --git a/Tizen.Content/Interop/Interop.Libraries.cs b/src/Tizen.Content.MediaContent/Interop/Interop.Libraries.cs similarity index 100% rename from Tizen.Content/Interop/Interop.Libraries.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.Libraries.cs diff --git a/Tizen.Content/Interop/Interop.MediaBookmark.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaBookmark.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaBookmark.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaBookmark.cs diff --git a/Tizen.Content/Interop/Interop.MediaContent.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaContent.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaContent.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaContent.cs diff --git a/Tizen.Content/Interop/Interop.MediaFace.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaFace.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaFace.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaFace.cs diff --git a/Tizen.Content/Interop/Interop.MediaFilter.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaFilter.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaFilter.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaFilter.cs diff --git a/Tizen.Content/Interop/Interop.MediaFolder.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaFolder.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaFolder.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaFolder.cs diff --git a/Tizen.Content/Interop/Interop.MediaGroup.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaGroup.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaGroup.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaGroup.cs diff --git a/Tizen.Content/Interop/Interop.MediaInformation.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaInformation.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaInformation.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaInformation.cs diff --git a/Tizen.Content/Interop/Interop.MediaPlaylist.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaPlaylist.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaPlaylist.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaPlaylist.cs diff --git a/Tizen.Content/Interop/Interop.MediaStorage.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaStorage.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaStorage.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaStorage.cs diff --git a/Tizen.Content/Interop/Interop.MediaTag.cs b/src/Tizen.Content.MediaContent/Interop/Interop.MediaTag.cs similarity index 100% rename from Tizen.Content/Interop/Interop.MediaTag.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.MediaTag.cs diff --git a/Tizen.Content/Interop/Interop.VideoInformation.cs b/src/Tizen.Content.MediaContent/Interop/Interop.VideoInformation.cs similarity index 100% rename from Tizen.Content/Interop/Interop.VideoInformation.cs rename to src/Tizen.Content.MediaContent/Interop/Interop.VideoInformation.cs diff --git a/Tizen.Content/Properties/AssemblyInfo.cs b/src/Tizen.Content.MediaContent/Properties/AssemblyInfo.cs similarity index 100% rename from Tizen.Content/Properties/AssemblyInfo.cs rename to src/Tizen.Content.MediaContent/Properties/AssemblyInfo.cs diff --git a/Tizen.Content/Tizen.Content.MediaContent.csproj b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj similarity index 90% rename from Tizen.Content/Tizen.Content.MediaContent.csproj rename to src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj index 95dfb63..d2c52a0 100755 --- a/Tizen.Content/Tizen.Content.MediaContent.csproj +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent.csproj @@ -1,5 +1,5 @@  - + Debug @@ -33,7 +33,7 @@ true - Tizen.Content.snk + Tizen.Content.MediaContent.snk @@ -53,11 +53,9 @@ - csapi-tizen ..\..\tizen\Tizen\bin\Debug\Tizen.dll - csapi-tizen ..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll @@ -74,7 +72,7 @@ -