From: j-h.choi <j-h.choi@samsung.com>
Date: Wed, 14 Dec 2022 07:45:18 +0000 (+0900)
Subject: Add crossgen2.tar.gz file and remove circular dependency issue
X-Git-Tag: accepted/tizen/unified/20221216.024044^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a439345195dcdcf20dd74d1eb8bcae3ec4907b4;p=platform%2Fcore%2Fdotnet%2Fbuild-tools.git

Add crossgen2.tar.gz file and remove circular dependency issue

Change-Id: Ieb8a61298e5bb7c60821e7ca4dbd166bca8a6030
---

diff --git a/packaging/crossgen2.tar.gz b/packaging/crossgen2.tar.gz
new file mode 100644
index 00000000..cd15df28
Binary files /dev/null and b/packaging/crossgen2.tar.gz differ
diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec
index 91f9105b..253fd230 100644
--- a/packaging/dotnet-build-tools.spec
+++ b/packaging/dotnet-build-tools.spec
@@ -12,15 +12,16 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    macros.dotnet-build-tools
 Source21:   dotnet-sdk-%{version}-linux-x64.tar.gz
 Source22:   deps.tar.gz
+Source23:   crossgen2.tar.gz
 
 AutoReqProv: no
 
 BuildRequires: patchelf
-BuildRequires: mscorlib
-BuildRequires: corefx-managed
-BuildRequires: csapi-tizenfx-full
-BuildRequires: crossgen2-mic
+#BuildRequires: crossgen2-mic
 
+Requires: mscorlib
+Requires: corefx-managed
+Requires: csapi-tizenfx-full
 Requires: corefx-managed-ref
 Requires: libicu
 Requires: openssl1.1
@@ -40,10 +41,8 @@ mkdir -p dotnet/deps
 mkdir -p dotnet/crossgen2/ref
 tar xvfz %{SOURCE21} -C dotnet
 tar xvfz %{SOURCE22} -C dotnet/deps
-
-cp -rf /opt/usr/dotnet/mic/* dotnet/crossgen2
-cp -rf /usr/share/dotnet.tizen/netcoreapp/*.dll dotnet/crossgen2/ref
-cp -rf /usr/share/dotnet.tizen/framework/*.dll dotnet/crossgen2/ref
+tar xvfz %{SOURCE23} -C dotnet/crossgen2
+#cp -rf /opt/usr/dotnet/mic/* dotnet/crossgen2
 
 %build
 # Prepare dotnet-sdk
diff --git a/targets/Tizen.Pre.Compiled.targets b/targets/Tizen.Pre.Compiled.targets
index cfb82401..c36e0e88 100644
--- a/targets/Tizen.Pre.Compiled.targets
+++ b/targets/Tizen.Pre.Compiled.targets
@@ -28,8 +28,8 @@
     <Exec Command="mkdir $(BinNativeImagePath)" Condition="@(DllListOfBin->Count()) != 0 OR @(PdbListOfBin->Count()) != 0" />
     <Exec Command="mkdir $(LibNativeImagePath)" Condition="@(DllListOfLib->Count()) != 0 OR @(PdbListOfLib->Count()) != 0" />
 
-    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_$(TizenGBSBuildArch)_x64.so --targetarch $(TizenGBSBuildArch) -o $(BinNativeImagePath)%(DllListOfBin.Filename).ni%(DllListOfBin.Extension) --resilient --Ot -r:/usr/share/dotnet-build-tools/sdk/crossgen2/ref/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfBin.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' != '' and '%(DllListOfBin.Identity)' != ''" />
-    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_$(TizenGBSBuildArch)_x64.so --targetarch $(TizenGBSBuildArch) -o $(LibNativeImagePath)%(DllListOfLib.Filename).ni%(DllListOfLib.Extension) --resilient --Ot -r:/usr/share/dotnet-build-tools/sdk/crossgen2/ref/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfLib.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' != '' and '%(DllListOfLib.Identity)' != ''" />
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_$(TizenGBSBuildArch)_x64.so --targetarch $(TizenGBSBuildArch) -o $(BinNativeImagePath)%(DllListOfBin.Filename).ni%(DllListOfBin.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfBin.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' != '' and '%(DllListOfBin.Identity)' != ''" />
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_$(TizenGBSBuildArch)_x64.so --targetarch $(TizenGBSBuildArch) -o $(LibNativeImagePath)%(DllListOfLib.Filename).ni%(DllListOfLib.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfLib.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' != '' and '%(DllListOfLib.Identity)' != ''" />
 
     <Exec Command="cp %(PdbListOfBin.Identity) $(BinNativeImagePath)" Condition="'%(PdbListOfBin.Identity)' != ''" />
     <Exec Command="cp %(PdbListOfLib.Identity) $(LibNativeImagePath)" Condition="'%(PdbListOfLib.Identity)' != ''" />