From 7e0a17e68a9c203f93a5943baa3d683c351eeda1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=EC=A2=85=ED=97=8C/Common=20Platform=20Lab=28SR=29?= =?utf8?q?/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 29 Apr 2020 11:37:58 +0900 Subject: [PATCH] Sort preload files by name due to dependencies of each module (#225) Change-Id: I4addc2fc049eeb9433f32fb85723d7b6194bed9f --- Managed/Tizen.Runtime/Tizen.Runtime.cs | 13 +++++++------ .../{Dotnet.Launcher.preload => 10.Dotnet.Launcher.preload} | 0 packaging/dotnet-launcher.spec | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename packaging/{Dotnet.Launcher.preload => 10.Dotnet.Launcher.preload} (100%) 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 -- 2.7.4