asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OSX: Remove tmp .app folder instead of moving to trash

Browse source 
Fixes #42232.

And fixes memory leak with use of DirAccess, and harmonize the use of
the sanitized pkg name.

(cherry picked from commits 707a62783b
and 02d228554b)
This commit is contained in:
Rémi Verschelde 2020-12-03 08:55:09 +01:00
parent 0f279794c5
commit b33fd415da
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
platform/osx/export/export.cpp
View file

@ -42,7 +42,7 @@
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "platform/osx/logo.gen.h" #include "platform/osx/logo.gen.h"
#include "string.h"
#include <sys/stat.h> #include <sys/stat.h>
class EditorExportPlatformOSX : public EditorExportPlatform { class EditorExportPlatformOSX : public EditorExportPlatform {
@ -504,36 +504,36 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
else else
pkg_name = "Unnamed"; pkg_name = "Unnamed";
String pkg_name_safe = OS::get_singleton()->get_safe_dir_name(pkg_name); pkg_name = OS::get_singleton()->get_safe_dir_name(pkg_name);
Error err = OK;
String tmp_app_path_name = "";
DirAccess *tmp_app_path = NULL;
String export_format = use_dmg() && p_path.ends_with("dmg") ? "dmg" : "zip"; String export_format = use_dmg() && p_path.ends_with("dmg") ? "dmg" : "zip";
// Create our application bundle. // Create our application bundle.
tmp_app_path_name = EditorSettings::get_singleton()->get_cache_dir().plus_file(pkg_name + ".app"); String tmp_app_dir_name = pkg_name + ".app";
String tmp_app_path_name = EditorSettings::get_singleton()->get_cache_dir().plus_file(tmp_app_dir_name);
print_line("Exporting to " + tmp_app_path_name); print_line("Exporting to " + tmp_app_path_name);
tmp_app_path = DirAccess::create_for_path(tmp_app_path_name);
if (!tmp_app_path) { Error err = OK;
DirAccessRef tmp_app_dir = DirAccess::create_for_path(tmp_app_path_name);
if (!tmp_app_dir) {
err = ERR_CANT_CREATE; err = ERR_CANT_CREATE;
} }
// Create our folder structure. // Create our folder structure.
if (err == OK) { if (err == OK) {
print_line("Creating " + tmp_app_path_name + "/Contents/MacOS"); print_line("Creating " + tmp_app_path_name + "/Contents/MacOS");
err = tmp_app_path->make_dir_recursive(tmp_app_path_name + "/Contents/MacOS"); err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/MacOS");
} }
if (err == OK) { if (err == OK) {
print_line("Creating " + tmp_app_path_name + "/Contents/Frameworks"); print_line("Creating " + tmp_app_path_name + "/Contents/Frameworks");
err = tmp_app_path->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks"); err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks");
} }
if (err == OK) { if (err == OK) {
print_line("Creating " + tmp_app_path_name + "/Contents/Resources"); print_line("Creating " + tmp_app_path_name + "/Contents/Resources");
err = tmp_app_path->make_dir_recursive(tmp_app_path_name + "/Contents/Resources"); err = tmp_app_dir->make_dir_recursive(tmp_app_path_name + "/Contents/Resources");
} }
// Now process our template. // Now process our template.
@ -610,14 +610,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_safe + "/"); file = file.replace("/data.mono.osx.64.release_debug/", "/data_" + pkg_name + "/");
} }
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_safe + "/"); file = file.replace("/data.mono.osx.64.release/", "/data_" + pkg_name + "/");
} }
print_line("ADDING: " + file + " size: " + itos(data.size())); print_line("ADDING: " + file + " size: " + itos(data.size()));
@ -626,7 +626,7 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
// Write it into our application bundle. // Write it into our application bundle.
file = tmp_app_path_name.plus_file(file); file = tmp_app_path_name.plus_file(file);
if (err == OK) { if (err == OK) {
err = tmp_app_path->make_dir_recursive(file.get_base_dir()); err = tmp_app_dir->make_dir_recursive(file.get_base_dir());
} }
if (err == OK) { if (err == OK) {
FileAccess *f = FileAccess::open(file, FileAccess::WRITE); FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
@ -721,7 +721,10 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
} }
// Clean up temporary .app dir. // Clean up temporary .app dir.
OS::get_singleton()->move_to_trash(tmp_app_path_name); tmp_app_dir->change_dir(tmp_app_path_name);
tmp_app_dir->erase_contents_recursive();
tmp_app_dir->change_dir("..");
tmp_app_dir->remove(tmp_app_dir_name);
} }
return err; return err;