Merge "use ibc file for generate NI - Added the '--ibc-dir' option in dotnettool" into tizentizen_6.0.m2_releasesubmit/tizen_6.0_hotfix/20201103.115105submit/tizen_6.0_hotfix/20201102.192905submit/tizen_6.0/20201029.205505submit/tizen/20200903.214119accepted/tizen/unified/20200904.035507accepted/tizen/6.0/unified/hotfix/20201103.045047accepted/tizen/6.0/unified/20201030.102908

1 files changed, 50 insertions, 32 deletions

diff --git a/scripts/mobile-dotnet-generate-ni.post b/scripts/mobile-dotnet-generate-ni.post
index 3ad983e..75c32a0 100755
--- a/scripts/mobile-dotnet-generate-ni.post
+++ b/scripts/mobile-dotnet-generate-ni.post
@@ -1,36 +1,54 @@
 #!/bin/sh
 echo "############### mobile-dotnet-generate-ni.post ################"
 
-# Generate NI for System
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/SOS.NETCore.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Collections.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Collections.Concurrent.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Console.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Diagnostics.Debug.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.IO.FileSystem.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Linq.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Linq.Expressions.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.ObjectModel.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Private.DataContractSerialization.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Private.Uri.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Private.Xml.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Reflection.Extensions.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Reflection.Metadata.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Runtime.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Runtime.Extensions.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Runtime.InteropServices.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Security.Cryptography.Algorithms.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Security.Cryptography.Primitives.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Text.RegularExpressions.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Threading.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Threading.Tasks.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Threading.Thread.dll
-nitool --dll /usr/share/dotnet.tizen/netcoreapp/System.Threading.Timer.dll
-# Generate NI for Xamarin and Device API
-nitool --dll /usr/share/dotnet.tizen/framework/ElmSharp.dll
-nitool --dll /usr/share/dotnet.tizen/framework/Tizen.dll
-nitool --dll /usr/share/dotnet.tizen/framework/Tizen.Applications.Common.dll
-nitool --dll /usr/share/dotnet.tizen/framework/Tizen.Applications.UI.dll
-nitool --dll /usr/share/dotnet.tizen/framework/Tizen.Applications.Service.dll
-nitool --dll /usr/share/dotnet.tizen/framework/Tizen.System.Information.dll
+DLL_LIST="
+        /usr/share/dotnet.tizen/netcoreapp/System.Private.CoreLib.dll
+        /usr/share/dotnet.tizen/netcoreapp/SOS.NETCore.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Collections.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Collections.Concurrent.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Console.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Diagnostics.Debug.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.IO.FileSystem.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Linq.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Linq.Expressions.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.ObjectModel.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Private.DataContractSerialization.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Private.Uri.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Private.Xml.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Reflection.Extensions.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Reflection.Metadata.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Runtime.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Runtime.Extensions.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Runtime.InteropServices.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Security.Cryptography.Algorithms.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Security.Cryptography.Primitives.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Text.RegularExpressions.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Threading.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Threading.Tasks.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Threading.Thread.dll
+        /usr/share/dotnet.tizen/netcoreapp/System.Threading.Timer.dll
+        /usr/share/dotnet.tizen/framework/ElmSharp.dll
+        /usr/share/dotnet.tizen/framework/Tizen.dll
+        /usr/share/dotnet.tizen/framework/Tizen.Applications.Common.dll
+        /usr/share/dotnet.tizen/framework/Tizen.Applications.UI.dll
+        /usr/share/dotnet.tizen/framework/Tizen.Applications.Service.dll
+        /usr/share/dotnet.tizen/framework/Tizen.System.Information.dll
+"
+
+export IBCDATA_DIR=/usr/share/dotnet.tizen/ibcdata
+
+# remove previous native image
+dotnettool --ni-reset-system
+
+# generate native image
+for target in $DLL_LIST;
+do
+        dotnettool --ibc-dir $IBCDATA_DIR --ni-dll $target;
+done;
+
+# remove ibc data files
+if [ -d $IBCDATA_DIR ]
+then
+    rm -rf $IBCDATA_DIR
+fi