From 09551c3d2b40272b3b8a82f20e81a8bd66307e3e Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Wed, 24 Aug 2022 13:05:23 -0500 Subject: [PATCH] Remove mentions of the Server platform from the Mono module --- modules/mono/build_scripts/mono_configure.py | 5 ++--- modules/mono/config.py | 4 ++-- .../editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props | 1 - .../editor/GodotTools/GodotTools/Export/AotBuilder.cs | 1 - .../GodotTools/GodotTools/Export/ExportPlugin.cs | 2 +- modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs | 10 +--------- 6 files changed, 6 insertions(+), 17 deletions(-) diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index c7f9b39b48b1..556c8e1563aa 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -3,11 +3,11 @@ import os.path def is_desktop(platform): - return platform in ["windows", "macos", "linuxbsd", "server", "uwp", "haiku"] + return platform in ["windows", "macos", "linuxbsd", "uwp", "haiku"] def is_unix_like(platform): - return platform in ["macos", "linuxbsd", "server", "android", "haiku", "ios"] + return platform in ["macos", "linuxbsd", "android", "haiku", "ios"] def module_supports_tools_on(platform): @@ -132,7 +132,6 @@ def determine_runtime_identifier(env): "windows": "win", "macos": "osx", "linuxbsd": "linux", - "server": "linux", # FIXME: Is server linux only, or also macos? } # .NET RID architectures: x86, x64, arm, or arm64 diff --git a/modules/mono/config.py b/modules/mono/config.py index d156877929fb..b599414a2cb8 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -1,6 +1,6 @@ -# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "server", "android", "haiku", "javascript", "ios"] +# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "android", "haiku", "javascript", "ios"] # Eventually support for each them should be added back (except Haiku if not supported by .NET Core) -supported_platforms = ["windows", "macos", "linuxbsd", "server"] +supported_platforms = ["windows", "macos", "linuxbsd"] def can_build(env, platform): diff --git a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props index 652b9e8e434a..ad41ab04d542 100644 --- a/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props +++ b/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props @@ -77,7 +77,6 @@ GODOT_WINDOWS;GODOT_PC GODOT_LINUXBSD;GODOT_PC GODOT_OSX;GODOT_MACOS;GODOT_PC - GODOT_SERVER;GODOT_PC GODOT_UWP;GODOT_PC GODOT_HAIKU;GODOT_PC GODOT_ANDROID;GODOT_MOBILE diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs index 87549f61fea7..8aec1bd656e4 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs @@ -588,7 +588,6 @@ MONO_AOT_MODE_LAST = 1000, return $"{platform}-{arch}"; } case OS.Platforms.LinuxBSD: - case OS.Platforms.Server: { string arch = bits == "64" ? "x86_64" : "i686"; return $"linux-{arch}"; diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs index ecf363c106b5..e1b5530b93ae 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs @@ -100,7 +100,7 @@ namespace GodotTools.Export if (!DeterminePlatformFromFeatures(features, out string platform)) throw new NotSupportedException("Target platform not supported"); - if (!new[] { OS.Platforms.Windows, OS.Platforms.LinuxBSD, OS.Platforms.MacOS, OS.Platforms.Server } + if (!new[] { OS.Platforms.Windows, OS.Platforms.LinuxBSD, OS.Platforms.MacOS } .Contains(platform)) { throw new NotImplementedException("Target platform not yet implemented"); diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs index 62140d41bc2a..76f0f0b784d7 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs @@ -23,7 +23,6 @@ namespace GodotTools.Utils public const string FreeBSD = "FreeBSD"; public const string NetBSD = "NetBSD"; public const string BSD = "BSD"; - public const string Server = "Server"; public const string UWP = "UWP"; public const string Haiku = "Haiku"; public const string Android = "Android"; @@ -36,7 +35,6 @@ namespace GodotTools.Utils public const string Windows = "windows"; public const string MacOS = "macos"; public const string LinuxBSD = "linuxbsd"; - public const string Server = "server"; public const string UWP = "uwp"; public const string Haiku = "haiku"; public const string Android = "android"; @@ -65,7 +63,6 @@ namespace GodotTools.Utils ["LinuxBSD"] = Platforms.LinuxBSD, // "X11" for compatibility, temporarily, while we are on an outdated branch ["X11"] = Platforms.LinuxBSD, - ["Server"] = Platforms.Server, ["UWP"] = Platforms.UWP, ["Haiku"] = Platforms.Haiku, ["Android"] = Platforms.Android, @@ -81,7 +78,6 @@ namespace GodotTools.Utils [Names.FreeBSD] = Platforms.LinuxBSD, [Names.NetBSD] = Platforms.LinuxBSD, [Names.BSD] = Platforms.LinuxBSD, - [Names.Server] = Platforms.Server, [Names.UWP] = Platforms.UWP, [Names.Haiku] = Platforms.Haiku, [Names.Android] = Platforms.Android, @@ -98,7 +94,6 @@ namespace GodotTools.Utils // instead of `linux` in the runtime identifier. This would be a problem as // Godot has a single export profile for both, named LinuxBSD. [Platforms.LinuxBSD] = DotNetOS.Linux, - [Platforms.Server] = DotNetOS.Linux, [Platforms.UWP] = DotNetOS.Win10, [Platforms.Android] = DotNetOS.Android, [Platforms.iOS] = DotNetOS.iOS, @@ -129,13 +124,12 @@ namespace GodotTools.Utils new[] { Names.Linux, Names.FreeBSD, Names.NetBSD, Names.BSD }; private static readonly IEnumerable UnixLikePlatforms = - new[] { Names.MacOS, Names.Server, Names.Haiku, Names.Android, Names.iOS } + new[] { Names.MacOS, Names.Haiku, Names.Android, Names.iOS } .Concat(LinuxBSDPlatforms).ToArray(); private static readonly Lazy _isWindows = new(() => IsOS(Names.Windows)); private static readonly Lazy _isMacOS = new(() => IsOS(Names.MacOS)); private static readonly Lazy _isLinuxBSD = new(() => IsAnyOS(LinuxBSDPlatforms)); - private static readonly Lazy _isServer = new(() => IsOS(Names.Server)); private static readonly Lazy _isUWP = new(() => IsOS(Names.UWP)); private static readonly Lazy _isHaiku = new(() => IsOS(Names.Haiku)); private static readonly Lazy _isAndroid = new(() => IsOS(Names.Android)); @@ -149,8 +143,6 @@ namespace GodotTools.Utils [SupportedOSPlatformGuard("linux")] public static bool IsLinuxBSD => _isLinuxBSD.Value; - [SupportedOSPlatformGuard("linux")] public static bool IsServer => _isServer.Value; - [SupportedOSPlatformGuard("windows")] public static bool IsUWP => _isUWP.Value; public static bool IsHaiku => _isHaiku.Value;