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

iOS Export: use relative path for res:// files 

(cherry picked from commit 7b64f2df50)
This commit is contained in:
Sergey Minakov 2020-07-05 23:42:58 +03:00 committed by Rémi Verschelde
parent 9c68989cf2
commit a4028b99ec
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
platform/iphone/export/export.cpp
View File

@ -762,6 +762,8 @@ void EditorExportPlatformIOS::_add_assets_to_project(const Ref<EditorExportPrese
Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, Vector<IOSExportAsset> &r_exported_assets) { Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, Vector<IOSExportAsset> &r_exported_assets) {
DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
String binary_name = p_out_dir.get_file().get_basename();
ERR_FAIL_COND_V_MSG(!filesystem_da, ERR_CANT_CREATE, "Cannot create DirAccess for path '" + p_out_dir + "'."); ERR_FAIL_COND_V_MSG(!filesystem_da, ERR_CANT_CREATE, "Cannot create DirAccess for path '" + p_out_dir + "'.");
for (int f_idx = 0; f_idx < p_assets.size(); ++f_idx) { for (int f_idx = 0; f_idx < p_assets.size(); ++f_idx) {
String asset = p_assets[f_idx]; String asset = p_assets[f_idx];
@ -787,32 +789,35 @@ Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir
String destination_dir; String destination_dir;
String destination; String destination;
String asset_path; String asset_path;
bool create_framework = false; bool create_framework = false;
if (p_is_framework && asset.ends_with(".dylib")) { if (p_is_framework && asset.ends_with(".dylib")) {
// For iOS we need to turn .dylib into .framework // For iOS we need to turn .dylib into .framework
// to be able to send application to AppStore // to be able to send application to AppStore
destination_dir = p_out_dir.plus_file("dylibs").plus_file(base_dir); asset_path = String("dylibs").plus_file(base_dir);
String file_name = asset.get_basename().get_file(); String file_name = asset.get_basename().get_file();
String framework_name = file_name + ".framework"; String framework_name = file_name + ".framework";
destination_dir = destination_dir.plus_file(framework_name); asset_path = asset_path.plus_file(framework_name);
destination_dir = p_out_dir.plus_file(asset_path);
destination = destination_dir.plus_file(file_name); destination = destination_dir.plus_file(file_name);
asset_path = destination_dir;
create_framework = true; create_framework = true;
} else if (p_is_framework && (asset.ends_with(".framework") || asset.ends_with(".xcframework"))) { } else if (p_is_framework && (asset.ends_with(".framework") || asset.ends_with(".xcframework"))) {
destination_dir = p_out_dir.plus_file("dylibs").plus_file(base_dir); asset_path = String("dylibs").plus_file(base_dir);
String file_name = asset.get_file(); String file_name = asset.get_file();
destination = destination_dir.plus_file(file_name); asset_path = asset_path.plus_file(file_name);
asset_path = destination; destination_dir = p_out_dir.plus_file(asset_path);
destination = destination_dir;
} else { } else {
destination_dir = p_out_dir.plus_file(base_dir); asset_path = base_dir;
String file_name = asset.get_file(); String file_name = asset.get_file();
destination = destination_dir.plus_file(file_name); destination_dir = p_out_dir.plus_file(asset_path);
asset_path = destination; asset_path = asset_path.plus_file(file_name);
destination = p_out_dir.plus_file(asset_path);
} }
if (!filesystem_da->dir_exists(destination_dir)) { if (!filesystem_da->dir_exists(destination_dir)) {
@ -830,7 +835,7 @@ Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir
memdelete(filesystem_da); memdelete(filesystem_da);
return err; return err;
} }
IOSExportAsset exported_asset = { asset_path, p_is_framework }; IOSExportAsset exported_asset = { binary_name.plus_file(asset_path), p_is_framework };
r_exported_assets.push_back(exported_asset); r_exported_assets.push_back(exported_asset);
if (create_framework) { if (create_framework) {
@ -876,7 +881,7 @@ Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir
String info_plist = info_plist_format.replace("$name", file_name); String info_plist = info_plist_format.replace("$name", file_name);
FileAccess *f = FileAccess::open(asset_path.plus_file("Info.plist"), FileAccess::WRITE); FileAccess *f = FileAccess::open(destination_dir.plus_file("Info.plist"), FileAccess::WRITE);
if (f) { if (f) {
f->store_string(info_plist); f->store_string(info_plist);
f->close(); f->close();