Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #56517 from bruvzg/fix_export_utf8

Browse source
This commit is contained in:
Rémi Verschelde 2022-01-05 15:08:27 +01:00 • committed by GitHub
commit 75c06289c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/android/export/export_plugin.cpp
View file

@ -2794,7 +2794,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
bool skip = false;
String file = fname;
String file = String::utf8(fname);
Vector<uint8_t> data;
data.resize(info.uncompressed_size);
@ -2976,7 +2976,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
char extra[16384];
ret = unzGetCurrentFileInfo(tmp_unaligned, &info, fname, 16384, extra, 16384 - ZIP_ALIGNMENT, nullptr, 0);
String file = fname;
String file = String::utf8(fname);
Vector<uint8_t> data;
data.resize(info.compressed_size);

2
platform/iphone/export/export_plugin.cpp
View file

@ -1484,7 +1484,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
char fname[16384];
ret = unzGetCurrentFileInfo(src_pkg_zip, &info, fname, 16384, nullptr, 0, nullptr, 0);
String file = fname;
String file = String::utf8(fname);
print_line("READ: " + file);
Vector<uint8_t> data;

2
platform/javascript/export/export_plugin.cpp
View file

@ -52,7 +52,7 @@ Error EditorExportPlatformJavaScript::_extract_template(const String &p_template
char fname[16384];
unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
String file = fname;
String file = String::utf8(fname);
// Skip service worker and offline page if not exporting pwa.
if (!pwa && (file == "godot.service.worker.js" || file == "godot.offline.html")) {

2
platform/osx/export/export_plugin.cpp
View file

@ -666,7 +666,7 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
char fname[16384];
ret = unzGetCurrentFileInfo(src_pkg_zip, &info, fname, 16384, nullptr, 0, nullptr, 0);
String file = fname;
String file = String::utf8(fname);
Vector<uint8_t> data;
data.resize(info.uncompressed_size);

2
platform/uwp/export/export_plugin.cpp
View file

@ -325,7 +325,7 @@ Error EditorExportPlatformUWP::export_project(const Ref<EditorExportPreset> &p_p
char fname[16834];
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16834, nullptr, 0, nullptr, 0);
String path = fname;
String path = String::utf8(fname);
if (path.ends_with("/")) {
// Ignore directories