Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #99046 from dustdfg/unify_platform_aliases

Browse Source 
Buildsystem: Unify compatibility aliases
This commit is contained in:
Thaddeus Crews 2024-11-13 08:34:32 -06:00
commit ce0709ecf5
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SConstruct
View File

@ -59,7 +59,7 @@ import glsl_builders
import methods import methods
import scu_builders import scu_builders
from methods import print_error, print_warning from methods import print_error, print_warning
from platform_methods import architecture_aliases, architectures from platform_methods import architecture_aliases, architectures, compatibility_platform_aliases
if ARGUMENTS.get("target", "editor") == "editor": if ARGUMENTS.get("target", "editor") == "editor":
_helper_module("editor.editor_builders", "editor/editor_builders.py") _helper_module("editor.editor_builders", "editor/editor_builders.py")
@ -350,28 +350,17 @@ if env["platform"] == "":
if env["platform"] != "": if env["platform"] != "":
print(f'Automatically detected platform: {env["platform"]}') print(f'Automatically detected platform: {env["platform"]}')
if env["platform"] == "osx": # Deprecated aliases kept for compatibility.
# Deprecated alias kept for compatibility. if env["platform"] in compatibility_platform_aliases:
print_warning('Platform "osx" has been renamed to "macos" in Godot 4. Building for platform "macos".') alias = env["platform"]
env["platform"] = "macos" platform = compatibility_platform_aliases[alias]
print_warning(f'Platform "{alias}" has been renamed to "{platform}" in Godot 4. Building for platform "{platform}".')
env["platform"] = platform
if env["platform"] == "iphone": # Alias for convenience.
# Deprecated alias kept for compatibility. if env["platform"] in ["linux", "bsd"]:
print_warning('Platform "iphone" has been renamed to "ios" in Godot 4. Building for platform "ios".')
env["platform"] = "ios"
if env["platform"] in ["linux", "bsd", "x11"]:
if env["platform"] == "x11":
# Deprecated alias kept for compatibility.
print_warning('Platform "x11" has been renamed to "linuxbsd" in Godot 4. Building for platform "linuxbsd".')
# Alias for convenience.
env["platform"] = "linuxbsd" env["platform"] = "linuxbsd"
if env["platform"] == "javascript":
# Deprecated alias kept for compatibility.
print_warning('Platform "javascript" has been renamed to "web" in Godot 4. Building for platform "web".')
env["platform"] = "web"
if env["platform"] not in platform_list: if env["platform"] not in platform_list:
text = "The following platforms are available:\n\t{}\n".format("\n\t".join(platform_list)) text = "The following platforms are available:\n\t{}\n".format("\n\t".join(platform_list))
text += "Please run SCons again and select a valid platform: platform=<string>." text += "Please run SCons again and select a valid platform: platform=<string>."

7
platform_methods.py
View File

@ -8,6 +8,13 @@ import methods
# NOTE: The multiprocessing module is not compatible with SCons due to conflict on cPickle # NOTE: The multiprocessing module is not compatible with SCons due to conflict on cPickle
compatibility_platform_aliases = {
"osx": "macos",
"iphone": "ios",
"x11": "linuxbsd",
"javascript": "web",
}
# CPU architecture options. # CPU architecture options.
architectures = ["x86_32", "x86_64", "arm32", "arm64", "rv64", "ppc32", "ppc64", "wasm32"] architectures = ["x86_32", "x86_64", "arm32", "arm64", "rv64", "ppc32", "ppc64", "wasm32"]
architecture_aliases = { architecture_aliases = {