Browse Source

Mono/macOS: Separate data dir into frameworks and resources for codesigning

Co-authored-by: Ignacio Etcheverry <[email protected]>
(cherry picked from commit 42eb09ddcc7aad56946d95f02f4afb7c1eaf6db8)
Shane Liesegang 4 years ago
parent
commit
4d06a5c2b0
2 changed files with 7 additions and 7 deletions
  1. 5 5
      modules/mono/godotsharp_dirs.cpp
  2. 2 2
      platform/osx/export/export.cpp

+ 5 - 5
modules/mono/godotsharp_dirs.cpp

@@ -180,16 +180,16 @@ private:
 
 
 #ifdef OSX_ENABLED
 #ifdef OSX_ENABLED
 		if (!DirAccess::exists(data_editor_tools_dir)) {
 		if (!DirAccess::exists(data_editor_tools_dir)) {
-			data_editor_tools_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Tools");
+			data_editor_tools_dir = exe_dir.plus_file("../Resources/GodotSharp/Tools");
 		}
 		}
 
 
 		if (!DirAccess::exists(data_editor_prebuilt_api_dir)) {
 		if (!DirAccess::exists(data_editor_prebuilt_api_dir)) {
-			data_editor_prebuilt_api_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Api");
+			data_editor_prebuilt_api_dir = exe_dir.plus_file("../Resources/GodotSharp/Api");
 		}
 		}
 
 
 		if (!DirAccess::exists(data_mono_root_dir)) {
 		if (!DirAccess::exists(data_mono_root_dir)) {
 			data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc");
 			data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc");
-			data_mono_lib_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Mono/lib");
+			data_mono_lib_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/lib");
 		}
 		}
 #endif
 #endif
 
 
@@ -219,11 +219,11 @@ private:
 #ifdef OSX_ENABLED
 #ifdef OSX_ENABLED
 		if (!DirAccess::exists(data_mono_root_dir)) {
 		if (!DirAccess::exists(data_mono_root_dir)) {
 			data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc");
 			data_mono_etc_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/etc");
-			data_mono_lib_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Mono/lib");
+			data_mono_lib_dir = exe_dir.plus_file("../Resources/GodotSharp/Mono/lib");
 		}
 		}
 
 
 		if (!DirAccess::exists(data_game_assemblies_dir)) {
 		if (!DirAccess::exists(data_game_assemblies_dir)) {
-			data_game_assemblies_dir = exe_dir.plus_file("../Frameworks/GodotSharp/Assemblies");
+			data_game_assemblies_dir = exe_dir.plus_file("../Resources/GodotSharp/Assemblies");
 		}
 		}
 #endif
 #endif
 
 

+ 2 - 2
platform/osx/export/export.cpp

@@ -634,14 +634,14 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
 					ret = unzGoToNextFile(src_pkg_zip);
 					ret = unzGoToNextFile(src_pkg_zip);
 					continue; // skip
 					continue; // skip
 				}
 				}
-				file = file.replace("/data.mono.osx.64.release_debug/", "/data_" + pkg_name + "/");
+				file = file.replace("/data.mono.osx.64.release_debug/", "/GodotSharp/");
 			}
 			}
 			if (file.find("/data.mono.osx.64.release/") != -1) {
 			if (file.find("/data.mono.osx.64.release/") != -1) {
 				if (p_debug) {
 				if (p_debug) {
 					ret = unzGoToNextFile(src_pkg_zip);
 					ret = unzGoToNextFile(src_pkg_zip);
 					continue; // skip
 					continue; // skip
 				}
 				}
-				file = file.replace("/data.mono.osx.64.release/", "/data_" + pkg_name + "/");
+				file = file.replace("/data.mono.osx.64.release/", "/GodotSharp/");
 			}
 			}
 
 
 			if (file.ends_with(".dylib")) {
 			if (file.ends_with(".dylib")) {