From: 최종헌/Common Platform Lab(SR)/Engineer/삼성전자 <j-h.choi@samsung.com>
Date: Wed, 29 Apr 2020 02:37:58 +0000 (+0900)
Subject: Sort preload files by name due to dependencies of each module (#225)
X-Git-Tag: submit/tizen_5.5/20200429.120457
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen_5.5%2F20200429.120457;p=platform%2Fcore%2Fdotnet%2Flauncher.git

Sort preload files by name due to dependencies of each module (#225)

Change-Id: I4addc2fc049eeb9433f32fb85723d7b6194bed9f
---

diff --git a/Managed/Tizen.Runtime/Tizen.Runtime.cs b/Managed/Tizen.Runtime/Tizen.Runtime.cs
index e88aadb..6a87da2 100644
--- a/Managed/Tizen.Runtime/Tizen.Runtime.cs
+++ b/Managed/Tizen.Runtime/Tizen.Runtime.cs
@@ -25,16 +25,17 @@ namespace Tizen.Runtime
         const string preloadPath = "/usr/share/dotnet.tizen/preload/";
         public static void Preload()
         {
-            DirectoryInfo directory = new DirectoryInfo(preloadPath);
-            foreach (FileInfo file in directory.GetFiles())
+            string[] paths = Directory.GetFiles(preloadPath);
+            Array.Sort(paths);
+            foreach (string path in paths)
             {
-                if (file.Extension.CompareTo(".preload") != 0)
+                if (Path.GetExtension(path) != ".preload")
                     continue;
 
                 try
                 {
                     BindingFlags bindingFlag = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic;
-                    foreach (string line in File.ReadLines(file.FullName))
+                    foreach (string line in File.ReadLines(path))
                     {
                         if (line.StartsWith('#') || !line.Contains(".dll") || !line.Contains(' '))
                             continue;
@@ -84,11 +85,11 @@ namespace Tizen.Runtime
                 catch (IOException e)
                 {
                     Console.WriteLine(e.ToString());
-                    Console.WriteLine("[ERROR] Failed to " + file.FullName + " file open");
+                    Console.WriteLine("[ERROR] Failed to " + path + " file open");
                 }
                 finally
                 {
-                    Console.WriteLine("Success to preload : " + file.Name);
+                    Console.WriteLine("Success to preload : " + path);
                 }
             }
 
diff --git a/packaging/Dotnet.Launcher.preload b/packaging/10.Dotnet.Launcher.preload
similarity index 100%
rename from packaging/Dotnet.Launcher.preload
rename to packaging/10.Dotnet.Launcher.preload
diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index fff6c23..f33c6f2 100644
--- a/packaging/dotnet-launcher.spec
+++ b/packaging/dotnet-launcher.spec
@@ -144,7 +144,7 @@ install -m 0644 %{name}.conf %{buildroot}/etc/tmpfiles.d/%{name}.conf
 mkdir -p %{buildroot}%{_ibc_data_dir}
 unzip packaging/ibcdata.zip -d %{buildroot}%{_ibc_data_dir}
 mkdir -p %{buildroot}%{_tizen_preload_dir}
-mv packaging/Dotnet.Launcher.preload %{buildroot}%{_tizen_preload_dir}
+mv packaging/10.Dotnet.Launcher.preload %{buildroot}%{_tizen_preload_dir}
 
 %post
 mkdir -p /opt/etc/skel/.dotnet