BuildMacOSUniversalBinary: Switch to mac-codesign tool and codesign embedded updater

This commit is contained in:
OatmealDome 2024-08-01 14:55:34 -04:00
parent 058000851b
commit 352bf09ef7
1 changed files with 13 additions and 20 deletions

View File

@ -59,8 +59,6 @@ DEFAULT_CONFIG = {
# running corrupted binaries and allows for access to the extended # running corrupted binaries and allows for access to the extended
# permisions needed for ARM builds # permisions needed for ARM builds
"codesign_identity": "-", "codesign_identity": "-",
# Entitlements file to use for code signing
"entitlements": "../Source/Core/DolphinQt/DolphinEmu.entitlements",
# Minimum macOS version for each architecture slice # Minimum macOS version for each architecture slice
"arm64_mac_os_deployment_target": "11.0.0", "arm64_mac_os_deployment_target": "11.0.0",
@ -119,11 +117,6 @@ def parse_args(conf=DEFAULT_CONFIG):
help="Directory where universal binary will be stored", help="Directory where universal binary will be stored",
default=conf["dst_app"]) default=conf["dst_app"])
parser.add_argument(
"--entitlements",
help="Path to .entitlements file for code signing",
default=conf["entitlements"])
parser.add_argument("--run_unit_tests", action="store_true", parser.add_argument("--run_unit_tests", action="store_true",
default=conf["run_unit_tests"]) default=conf["run_unit_tests"])
@ -352,21 +345,21 @@ def build(config):
src_app1 = ARCHITECTURES[1]+"/Binaries/" src_app1 = ARCHITECTURES[1]+"/Binaries/"
recursive_merge_binaries(src_app0, src_app1, dst_app) recursive_merge_binaries(src_app0, src_app1, dst_app)
for path in glob.glob(dst_app+"/*"):
if os.path.isdir(path) and os.path.splitext(path)[1] != ".app": if config["autoupdate"]:
continue subprocess.check_call([
"../Tools/mac-codesign.sh",
"-t",
"-e", "preserve",
config["codesign_identity"],
dst_app+"/Dolphin.app/Contents/Helpers/Dolphin Updater.app"])
subprocess.check_call([ subprocess.check_call([
"codesign", "../Tools/mac-codesign.sh",
"-d", "-t",
"--force", "-e", "preserve",
"-s",
config["codesign_identity"], config["codesign_identity"],
"--options=runtime", dst_app+"/Dolphin.app"])
"--entitlements", config["entitlements"],
"--deep",
"--verbose=2",
path])
print("Built Universal Binary successfully!") print("Built Universal Binary successfully!")