projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bd6b259)
Updating project to use xbuild
authorAbhijit RD <abhijit.rd@samsung.com>
Tue, 5 Jul 2016 04:56:57 +0000 (10:26 +0530)
committerAbhijit RD <abhijit.rd@samsung.com>
Tue, 5 Jul 2016 05:00:20 +0000 (10:30 +0530)
Change-Id: Ib5a54b9f8aa97bbe3a79bd7bd9a964352175e41f
Signed-off-by: Abhijit RD <abhijit.rd@samsung.com>
packaging/csapi-location.spec patch | blob | history
src/Tizen.Location/Tizen.Location.csproj patch | blob | history

diff --git a/packaging/csapi-location.spec b/packaging/csapi-location.spec
index a94a0c4..baae27a 100755 (executable)
--- a/packaging/csapi-location.spec
+++ b/packaging/csapi-location.spec
@@ -1,5 +1,4 @@
-%define dllpath %{_libdir}/mono/tizen
-%define dllname Tizen.Location.dll
+%define BUILDCONF Debug
 
 Name:       csapi-location
 Summary:    Tizen Location API's for C#
@@ -12,24 +11,13 @@ 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(csapi-tizen)
 
-# P/Invoke Runtime Dependencies
-# TODO: It should be removed after fix tizen-rpm-config
 Requires: glib-2.0
 BuildRequires: pkgconfig(capi-location-manager)
-# DLL Dependencies
-#BuildRequires: ...
 
 %description
 Tizen API for C#
@@ -49,22 +37,10 @@ cp %{SOURCE1} .
 
 %build
 # build dll
-mcs -target:library -out:%{dllname} -keyfile:Tizen.Location/Tizen.Location.snk -pkg:'csapi-tizen'\
-  Tizen.Location/Properties/AssemblyInfo.cs \
-  Tizen.Location/Interop/*.cs \
-  Tizen.Location/Tizen.Location/*.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.Location/Tizen.Location.csproj /p:Configuration=%{BUILDCONF}
 
 %install
-# copy dll
-mkdir -p %{buildroot}%{dllpath}
-install -p -m 644 %{dllname} %{buildroot}%{dllpath}
+gacutil -i Tizen.Location/bin/%{BUILDCONF}/Tizen.Location.dll -root "%{buildroot}%{_libdir}" -package tizen
 
 # generate pkgconfig
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
@@ -77,7 +53,8 @@ sed -e "s#@version@#%{version}#g" \
 gacutil -i %{dllpath}/%{dllname}
 
 %files
-%{dllpath}/%{dllname}
+%manifest %{name}.manifest
+%{_libdir}/mono/
 
 %files devel
 %{_libdir}/pkgconfig/%{name}.pc
diff --git a/src/Tizen.Location/Tizen.Location.csproj b/src/Tizen.Location/Tizen.Location.csproj
index db5f93f..d75d390 100644 (file)
--- a/src/Tizen.Location/Tizen.Location.csproj
+++ b/src/Tizen.Location/Tizen.Location.csproj
@@ -1,85 +1,101 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProjectGuid>{EADC6F38-9C99-4294-8F65-63D0E73012E8}</ProjectGuid>\r
-    <OutputType>Library</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Tizen.Location</RootNamespace>\r
-    <AssemblyName>Tizen.Location</AssemblyName>\r
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-    <TargetFrameworkProfile />\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <Prefer32Bit>false</Prefer32Bit>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-    <Prefer32Bit>false</Prefer32Bit>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <SignAssembly>true</SignAssembly>\r
-  </PropertyGroup>\r
-  <PropertyGroup>\r
-    <AssemblyOriginatorKeyFile>Tizen.Location.snk</AssemblyOriginatorKeyFile>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
-    <Reference Include="System.Xml.Linq" />\r
-    <Reference Include="System.Data.DataSetExtensions" />\r
-    <Reference Include="Microsoft.CSharp" />\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Xml" />\r
-    <Reference Include="Tizen">\r
-      <HintPath>..\..\..\..\uifw\tizen\Tizen\bin\Debug\Tizen.dll</HintPath>\r
-    </Reference>\r
-    <Reference Include="Tizen.Internals">\r
-      <HintPath>..\..\..\..\uifw\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll</HintPath>\r
-    </Reference>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Tizen.Location\GpsSatellite.cs" />\r
-    <Compile Include="Interop\Interop.Libraries.cs" />\r
-    <Compile Include="Interop\Interop.Location.cs" />\r
-    <Compile Include="Tizen.Location\Location.cs" />\r
-    <Compile Include="Tizen.Location\LocationBoundary.cs" />\r
-    <Compile Include="Tizen.Location\LocationChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Location\LocationError.cs" />\r
-    <Compile Include="Tizen.Location\Locator.cs" />\r
-    <Compile Include="Tizen.Location\LocatorEnumerations.cs" />\r
-    <Compile Include="Tizen.Location\LocatorHelper.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-    <Compile Include="Tizen.Location\SatelliteStatusChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Location\ServiceStateChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Location\SettingChangedEventArgs.cs" />\r
-    <Compile Include="Tizen.Location\ZoneChangedEventArgs.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="Tizen.Location.snk" />\r
-  </ItemGroup>\r
-  <ItemGroup />\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{EADC6F38-9C99-4294-8F65-63D0E73012E8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Tizen.Location</RootNamespace>
+    <AssemblyName>Tizen.Location</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>Tizen.Location.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Tizen.Location\GpsSatellite.cs" />
+    <Compile Include="Interop\Interop.Libraries.cs" />
+    <Compile Include="Interop\Interop.Location.cs" />
+    <Compile Include="Tizen.Location\Location.cs" />
+    <Compile Include="Tizen.Location\LocationBoundary.cs" />
+    <Compile Include="Tizen.Location\LocationChangedEventArgs.cs" />
+    <Compile Include="Tizen.Location\LocationError.cs" />
+    <Compile Include="Tizen.Location\Locator.cs" />
+    <Compile Include="Tizen.Location\LocatorEnumerations.cs" />
+    <Compile Include="Tizen.Location\LocatorHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Tizen.Location\SatelliteStatusChangedEventArgs.cs" />
+    <Compile Include="Tizen.Location\ServiceStateChangedEventArgs.cs" />
+    <Compile Include="Tizen.Location\SettingChangedEventArgs.cs" />
+    <Compile Include="Tizen.Location\ZoneChangedEventArgs.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Tizen.Location.snk" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+   <Reference Include="Tizen">
+    <PkgConfig>csapi-tizen</PkgConfig>
+    <HintPath>..\..\tizen\Tizen\obj\Debug\Tizen.dll</HintPath>
+   </Reference>
+   <Reference Include="Tizen.Internals">
+    <PkgConfig>csapi-tizen</PkgConfig>
+    <HintPath>..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll</HintPath>
+   </Reference>
+  </ItemGroup>
+  <ItemGroup>
+   <ProjectReference Include="..\..\tizen\Tizen.Internals\Tizen.Internals.csproj">
+    <Project>{B9AA1CB2-F72D-4A30-A33B-A20C850A38A0}</Project>
+    <Name>Tizen.Internals</Name>
+    <Private>True</Private>
+   </ProjectReference>
+   <ProjectReference Include="..\..\tizen\Tizen\Tizen.csproj">
+    <Project>{7659CA59-410D-41A1-9841-586E88BC78C9}</Project>
+    <Name>Tizen</Name>
+    <Private>True</Private>
+   </ProjectReference>
+  </ItemGroup>  
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->\r
+  -->
 </Project>
\ No newline at end of file
Domain: Dotnet / Frameworks;