From: manish.r Date: Mon, 4 Jul 2016 11:11:15 +0000 (+0530) Subject: Updating project to use xbuild X-Git-Tag: submit/trunk/20170823.075128~96^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0adc12d4853c3a6df7b4fc145f2e6db751c894a2;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Updating project to use xbuild Change-Id: I9d3a314a4c7b0d9eeef8a5c7bca49cb128b52f01 Signed-off-by: manish.r --- diff --git a/packaging/csapi-mime-type.spec b/packaging/csapi-mime-type.spec index fb2b218..e84bac9 100755 --- a/packaging/csapi-mime-type.spec +++ b/packaging/csapi-mime-type.spec @@ -1,5 +1,4 @@ -%define dllpath %{_libdir}/mono/tizen -%define dllname Tizen.Content.MimeType.dll +%define BUILDCONF Debug Name: csapi-mime-type Summary: Tizen MimeType API for C# @@ -12,15 +11,8 @@ Source0: %{name}-%{version}.tar.gz Source1: %{name}.manifest Source2: %{name}.pc.in -# TODO: replace mono-compiler, mono-devel to mcs, mono-shlib-cop 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 BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-content-mime-type) BuildRequires: pkgconfig(csapi-tizen) @@ -43,22 +35,10 @@ cp %{SOURCE1} . %build # build dll -mcs -target:library -out:%{dllname} -keyfile:Tizen.Content.MimeType/Tizen.Content.MimeType.snk -pkg:'csapi-tizen'\ - Tizen.Content.MimeType/Properties/AssemblyInfo.cs \ - Tizen.Content.MimeType/Interop/*.cs \ - Tizen.Content.MimeType/Tizen.Content.MimeType/*.cs - -# 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 +xbuild Tizen.Content.MimeType/Tizen.Content.MimeType.csproj /p:Configuration=%{BUILDCONF} %install -# copy dll -mkdir -p %{buildroot}%{dllpath} -install -p -m 644 %{dllname} %{buildroot}%{dllpath} +gacutil -i Tizen.Content.MimeType/bin/%{BUILDCONF}/Tizen.Content.MimeType.dll -root "%{buildroot}%{_libdir}" -package tizen # generate pkgconfig mkdir -p %{buildroot}%{_libdir}/pkgconfig @@ -67,11 +47,9 @@ sed -e "s#@version@#%{version}#g" \ -e "s#@dllname@#%{dllname}#g" \ %{SOURCE2} > %{buildroot}%{_libdir}/pkgconfig/%{name}.pc -%post -gacutil -i %{dllpath}/%{dllname} - %files -%{dllpath}/%{dllname} +%manifest %{name}.manifest +%{_libdir}/mono/ %files devel %{_libdir}/pkgconfig/%{name}.pc diff --git a/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj b/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj index eb7ac76..4188483 100755 --- a/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj +++ b/src/Tizen.Content.MimeType/Tizen.Content.MimeType.csproj @@ -9,7 +9,7 @@ Properties Tizen.Content.MimeType Tizen.Content.MimeType - v4.0 + v4.5 512 @@ -21,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +30,7 @@ TRACE prompt 4 + false true @@ -44,12 +46,6 @@ - - ..\..\..\..\..\..\..\dll\usr\lib\mono\tizen\Tizen.dll - - - ..\..\..\..\..\..\..\dll\usr\lib\mono\tizen\Tizen.Internals.dll - @@ -64,6 +60,28 @@ + + + csapi-tizen + ..\..\tizen\Tizen\obj\Debug\Tizen.dll + + + csapi-tizen + ..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll + + + + + {B9AA1CB2-F72D-4A30-A33B-A20C850A38A0} + Tizen.Internals + True + + + {7659CA59-410D-41A1-9841-586E88BC78C9} + Tizen + True + +