From cfd292939c53eb796d9ec1c194e5c74473012cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 7 Sep 2023 15:54:28 +0200 Subject: [PATCH] Haiku: Remove remnants of past WIP platform port The Haiku platform port was never finalized, and moved to a separate repo in Godot 3.2 days: https://github.com/godotengine/godot-platform-haiku Sadly it didn't garner more interest there and is bitrotting. It was never ported to Godot 4 so the bits of Haiku support left in Mono aren't useful. --- drivers/gl_context/SCsub | 2 +- modules/mono/build_scripts/mono_configure.py | 4 ++-- modules/mono/config.py | 4 ++-- .../editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props | 1 - .../editor/GodotTools/GodotTools/Export/AotBuilder.cs | 4 ---- modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs | 9 +-------- modules/mono/godotsharp_dirs.cpp | 1 - 7 files changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index 91240ce3e314..ce3a598573c3 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -2,7 +2,7 @@ Import("env") -if env["platform"] in ["haiku", "macos", "windows", "linuxbsd"]: +if env["platform"] in ["macos", "windows", "linuxbsd"]: # Thirdparty source files thirdparty_dir = "#thirdparty/glad/" thirdparty_sources = [ diff --git a/modules/mono/build_scripts/mono_configure.py b/modules/mono/build_scripts/mono_configure.py index 72ef4964f766..e5469c4980ca 100644 --- a/modules/mono/build_scripts/mono_configure.py +++ b/modules/mono/build_scripts/mono_configure.py @@ -3,11 +3,11 @@ def is_desktop(platform): - return platform in ["windows", "macos", "linuxbsd", "haiku"] + return platform in ["windows", "macos", "linuxbsd"] def is_unix_like(platform): - return platform in ["macos", "linuxbsd", "android", "haiku", "ios"] + return platform in ["macos", "linuxbsd", "android", "ios"] def module_supports_tools_on(platform): diff --git a/modules/mono/config.py b/modules/mono/config.py index 2b2a8d6235ce..9846d60c335c 100644 --- a/modules/mono/config.py +++ b/modules/mono/config.py @@ -1,5 +1,5 @@ -# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "android", "haiku", "web", "ios"] -# Eventually support for each them should be added back (except Haiku if not supported by .NET Core) +# Prior to .NET Core, we supported these: ["windows", "macos", "linuxbsd", "android", "web", "ios"] +# Eventually support for each them should be added back. supported_platforms = ["windows", "macos", "linuxbsd", "android"] 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 0884c9e8886a..6677d77559b1 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 @@ -84,7 +84,6 @@ GODOT_WINDOWS;GODOT_PC GODOT_LINUXBSD;GODOT_PC GODOT_OSX;GODOT_MACOS;GODOT_PC - GODOT_HAIKU;GODOT_PC GODOT_ANDROID;GODOT_MOBILE GODOT_IPHONE;GODOT_IOS;GODOT_MOBILE GODOT_JAVASCRIPT;GODOT_HTML5;GODOT_WASM;GODOT_WEB diff --git a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs index a7d44ab07a92..b16adb6f5544 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Export/AotBuilder.cs @@ -603,10 +603,6 @@ private static string GetMonoCrossDesktopDirName(string platform, string arch) { return $"linux-{arch}"; } - case OS.Platforms.Haiku: - { - return $"{platform}-{arch}"; - } default: throw new NotSupportedException($"Platform not supported: {platform}"); } diff --git a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs index a47dc1c45336..bff0c0df7c9b 100644 --- a/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs +++ b/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs @@ -26,7 +26,6 @@ private static class Names public const string FreeBSD = "FreeBSD"; public const string NetBSD = "NetBSD"; public const string BSD = "BSD"; - public const string Haiku = "Haiku"; public const string Android = "Android"; public const string iOS = "iOS"; public const string Web = "Web"; @@ -40,7 +39,6 @@ public static class Platforms public const string Windows = "windows"; public const string MacOS = "macos"; public const string LinuxBSD = "linuxbsd"; - public const string Haiku = "haiku"; public const string Android = "android"; public const string iOS = "ios"; public const string Web = "web"; @@ -69,7 +67,6 @@ public static class DotNetOS ["Windows"] = Platforms.Windows, ["macOS"] = Platforms.MacOS, ["Linux"] = Platforms.LinuxBSD, - ["Haiku"] = Platforms.Haiku, ["Android"] = Platforms.Android, ["iOS"] = Platforms.iOS, ["Web"] = Platforms.Web @@ -83,7 +80,6 @@ public static class DotNetOS [Names.FreeBSD] = Platforms.LinuxBSD, [Names.NetBSD] = Platforms.LinuxBSD, [Names.BSD] = Platforms.LinuxBSD, - [Names.Haiku] = Platforms.Haiku, [Names.Android] = Platforms.Android, [Names.iOS] = Platforms.iOS, [Names.Web] = Platforms.Web @@ -127,13 +123,12 @@ private static bool IsAnyOS(IEnumerable names) new[] { Names.Linux, Names.FreeBSD, Names.NetBSD, Names.BSD }; private static readonly IEnumerable UnixLikePlatforms = - new[] { Names.MacOS, Names.Haiku, Names.Android, Names.iOS } + new[] { Names.MacOS, 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 _isHaiku = new(() => IsOS(Names.Haiku)); private static readonly Lazy _isAndroid = new(() => IsOS(Names.Android)); private static readonly Lazy _isiOS = new(() => IsOS(Names.iOS)); private static readonly Lazy _isWeb = new(() => IsOS(Names.Web)); @@ -145,8 +140,6 @@ private static bool IsAnyOS(IEnumerable names) [SupportedOSPlatformGuard("linux")] public static bool IsLinuxBSD => _isLinuxBSD.Value; - public static bool IsHaiku => _isHaiku.Value; - [SupportedOSPlatformGuard("android")] public static bool IsAndroid => _isAndroid.Value; [SupportedOSPlatformGuard("ios")] public static bool IsiOS => _isiOS.Value; diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index bf2072006cf2..80e44011be5a 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -100,7 +100,6 @@ static const char *platform_name_map[][2] = { { "FreeBSD", "linuxbsd" }, { "NetBSD", "linuxbsd" }, { "BSD", "linuxbsd" }, - { "Haiku", "haiku" }, { "Android", "android" }, { "iOS", "ios" }, { "Web", "web" },