Skip to content

Commit 093582e

Browse files
authored
Merge pull request #1077 from Spartan322/4.3-fix/mac-binaries
[4.3] Fix erroneous macOS build bundle generation
2 parents 700d044 + f6ceeba commit 093582e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

platform/macos/SCsub

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def generate_bundle(target, source, env):
1616

1717
if env.editor_build:
1818
# Editor bundle.
19-
prefix = "godot." + env["platform"] + "." + env["target"]
19+
prefix = "redot." + env["platform"] + "." + env["target"]
2020
if env.dev_build:
2121
prefix += ".dev"
2222
if env["precision"] == "double":
@@ -34,9 +34,9 @@ def generate_bundle(target, source, env):
3434
if not os.path.isdir(app_dir + "/Contents/MacOS"):
3535
os.mkdir(app_dir + "/Contents/MacOS")
3636
if target_bin != "":
37-
shutil.copy(target_bin, app_dir + "/Contents/MacOS/Godot")
37+
shutil.copy(target_bin, app_dir + "/Contents/MacOS/Redot")
3838
if "mono" in env.module_version_string:
39-
shutil.copytree(Dir("#bin/GodotSharp").abspath, app_dir + "/Contents/Resources/GodotSharp")
39+
shutil.copytree(Dir("#bin/RedotSharp").abspath, app_dir + "/Contents/Resources/RedotSharp")
4040
version = get_build_version(False)
4141
short_version = get_build_version(True)
4242
with open(Dir("#misc/dist/macos").abspath + "/editor_info_plist.template", "rt", encoding="utf-8") as fin:
@@ -65,9 +65,9 @@ def generate_bundle(target, source, env):
6565
subprocess.run(sign_command)
6666
else:
6767
# Template bundle.
68-
app_prefix = "godot." + env["platform"]
69-
rel_prefix = "godot." + env["platform"] + "." + "template_release"
70-
dbg_prefix = "godot." + env["platform"] + "." + "template_debug"
68+
app_prefix = "redot." + env["platform"]
69+
rel_prefix = "redot." + env["platform"] + "." + "template_release"
70+
dbg_prefix = "redot." + env["platform"] + "." + "template_debug"
7171
if env.dev_build:
7272
app_prefix += ".dev"
7373
rel_prefix += ".dev"
@@ -90,9 +90,9 @@ def generate_bundle(target, source, env):
9090
if not os.path.isdir(app_dir + "/Contents/MacOS"):
9191
os.mkdir(app_dir + "/Contents/MacOS")
9292
if rel_target_bin != "":
93-
shutil.copy(rel_target_bin, app_dir + "/Contents/MacOS/godot_macos_release.universal")
93+
shutil.copy(rel_target_bin, app_dir + "/Contents/MacOS/redot_macos_release.universal")
9494
if dbg_target_bin != "":
95-
shutil.copy(dbg_target_bin, app_dir + "/Contents/MacOS/godot_macos_debug.universal")
95+
shutil.copy(dbg_target_bin, app_dir + "/Contents/MacOS/redot_macos_debug.universal")
9696

9797
# ZIP .app bundle.
9898
zip_dir = Dir("#bin/" + (app_prefix + env.extra_suffix + env.module_version_string).replace(".", "_")).abspath

0 commit comments

Comments
 (0)