GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'unix-dotnet-location' of https://github.com/Crawcik/FlaxEngine into Crawcik-unix-dotnet-location

Browse Source 
# Conflicts:
#	Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
This commit is contained in:
Wojtek Figat
2023-09-19 22:00:36 +02:00
parent 49a6b5734a 1dd7a27568
commit d9333018c2
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
View File

@@ -191,19 +191,12 @@ namespace Flax.Build
}
case TargetPlatform.Linux:
{
// TODO: Support /etc/dotnet/install_location
// Detect custom RID in some distros
rid = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim();
ridFallback = $"linux-{arch}";
if (rid == ridFallback)
ridFallback = "";
rid = $"linux-{arch}";
ridFallback = "";
if (string.IsNullOrEmpty(dotnetPath))
{
dotnetPath = "/usr/lib/dotnet/";
if (!Directory.Exists(dotnetPath))
dotnetPath = "/usr/share/dotnet/";
}
dotnetPath ??= SearchForDotnetLocationLinux();
if (dotnetPath == null)
ridFallback = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim();
break;
}
case TargetPlatform.Mac:
@@ -211,7 +204,16 @@ namespace Flax.Build
rid = $"osx-{arch}";
ridFallback = "";
if (string.IsNullOrEmpty(dotnetPath))
{
dotnetPath = "/usr/local/share/dotnet/";
if (!Directory.Exists(dotnetPath)) // Officially recommended dotnet location
{
if (Environment.GetEnvironmentVariable("PATH") is string globalBinPath)
dotnetPath = globalBinPath.Split(':').FirstOrDefault(x => File.Exists(Path.Combine(x, "dotnet")));
else
dotnetPath = string.Empty;
}
}
// Use x64 when cross-compiling from ARM64
if (architecture == TargetArchitecture.ARM64 && (Configuration.BuildArchitectures != null && Configuration.BuildArchitectures[0] == TargetArchitecture.x64))
@@ -436,7 +438,8 @@ namespace Flax.Build
version = version.Substring(0, version.IndexOf("-"));
rev = 0;
}
Version ver = new Version(version);
if (!Version.TryParse(version, out var ver))
return null;
return new Version(ver.Major, ver.Minor, ver.Build, rev);
}
@@ -450,5 +453,18 @@ namespace Flax.Build
// TODO: reject 'future' versions like .Net 8?
return versions.OrderByDescending(ParseVersion).FirstOrDefault();
}
private static string SearchForDotnetLocationLinux()
{
if (File.Exists("/etc/dotnet/install_location")) // Officially recommended dotnet location file
return File.ReadAllText("/etc/dotnet/install_location").Trim();
if (File.Exists("/usr/share/dotnet/dotnet")) // Officially recommended dotnet location
return "/usr/share/dotnet";
if (File.Exists("/usr/lib/dotnet/dotnet")) // Deprecated recommended dotnet location
return "/usr/lib/dotnet";
if (Environment.GetEnvironmentVariable("PATH") is string globalBinPath) // Searching for dotnet binary
return globalBinPath.Split(':').FirstOrDefault(x => File.Exists(Path.Combine(x, "dotnet")));
return null;
}
}
}