godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81969 from bruvzg/macsign 

[macOS export] Fix GDExtension framework `+x` flag errors, allow recursive signing on non macOS platform.
This commit is contained in:
Rémi Verschelde 2023-10-03 17:21:15 +02:00
parent b11309ddb6 f316283823
commit 5d300016a3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/macos/export/export_plugin.cpp
View File

@ -1047,6 +1047,8 @@ Error EditorExportPlatformMacOS::_code_sign(const Ref<EditorExportPreset> &p_pre
args.push_back("--p12-password"); args.push_back("--p12-password");
args.push_back(certificate_pass); args.push_back(certificate_pass);
} }
args.push_back("--code-signature-flags");
args.push_back("runtime");
args.push_back("-v"); /* provide some more feedback */ args.push_back("-v"); /* provide some more feedback */
@ -1139,7 +1141,6 @@ Error EditorExportPlatformMacOS::_code_sign(const Ref<EditorExportPreset> &p_pre
Error EditorExportPlatformMacOS::_code_sign_directory(const Ref<EditorExportPreset> &p_preset, const String &p_path, Error EditorExportPlatformMacOS::_code_sign_directory(const Ref<EditorExportPreset> &p_preset, const String &p_path,
const String &p_ent_path, bool p_should_error_on_non_code) { const String &p_ent_path, bool p_should_error_on_non_code) {
#ifdef MACOS_ENABLED
static Vector<String> extensions_to_sign; static Vector<String> extensions_to_sign;
if (extensions_to_sign.is_empty()) { if (extensions_to_sign.is_empty()) {
@ -1186,7 +1187,6 @@ Error EditorExportPlatformMacOS::_code_sign_directory(const Ref<EditorExportPres
current_file = dir_access->get_next(); current_file = dir_access->get_next();
} }
#endif
return OK; return OK;
} }
@ -1225,7 +1225,7 @@ Error EditorExportPlatformMacOS::_copy_and_sign_files(Ref<DirAccess> &dir_access
if (extensions_to_sign.find(p_in_app_path.get_extension()) > -1) { if (extensions_to_sign.find(p_in_app_path.get_extension()) > -1) {
err = _code_sign(p_preset, p_in_app_path, p_ent_path, false); err = _code_sign(p_preset, p_in_app_path, p_ent_path, false);
} }
if (is_executable(p_in_app_path)) { if (dir_access->file_exists(p_in_app_path) && is_executable(p_in_app_path)) {
// chmod with 0755 if the file is executable. // chmod with 0755 if the file is executable.
FileAccess::set_unix_permissions(p_in_app_path, 0755); FileAccess::set_unix_permissions(p_in_app_path, 0755);
} }