|
@@ -509,12 +509,13 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
io2.opaque = &dst_f;
|
|
|
zipFile dst_pkg_zip = NULL;
|
|
|
|
|
|
+ DirAccess *tmp_app_path = NULL;
|
|
|
String export_format = use_dmg() && p_path.ends_with("dmg") ? "dmg" : "zip";
|
|
|
if (export_format == "dmg") {
|
|
|
// We're on OSX so we can export to DMG, but first we create our application bundle
|
|
|
tmp_app_path_name = EditorSettings::get_singleton()->get_cache_dir().plus_file(pkg_name + ".app");
|
|
|
print_line("Exporting to " + tmp_app_path_name);
|
|
|
- DirAccess *tmp_app_path = DirAccess::create_for_path(tmp_app_path_name);
|
|
|
+ tmp_app_path = DirAccess::create_for_path(tmp_app_path_name);
|
|
|
if (!tmp_app_path) {
|
|
|
err = ERR_CANT_CREATE;
|
|
|
}
|
|
@@ -617,19 +618,23 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
if (export_format == "dmg") {
|
|
|
// write it into our application bundle
|
|
|
file = tmp_app_path_name.plus_file(file);
|
|
|
-
|
|
|
- // write the file, need to add chmod
|
|
|
- FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
|
|
|
- if (f) {
|
|
|
- f->store_buffer(data.ptr(), data.size());
|
|
|
- f->close();
|
|
|
- if (is_execute) {
|
|
|
- // Chmod with 0755 if the file is executable
|
|
|
- FileAccess::set_unix_permissions(file, 0755);
|
|
|
+ if (err == OK) {
|
|
|
+ err = tmp_app_path->make_dir_recursive(file.get_base_dir());
|
|
|
+ }
|
|
|
+ if (err == OK) {
|
|
|
+ // write the file, need to add chmod
|
|
|
+ FileAccess *f = FileAccess::open(file, FileAccess::WRITE);
|
|
|
+ if (f) {
|
|
|
+ f->store_buffer(data.ptr(), data.size());
|
|
|
+ f->close();
|
|
|
+ if (is_execute) {
|
|
|
+ // Chmod with 0755 if the file is executable
|
|
|
+ FileAccess::set_unix_permissions(file, 0755);
|
|
|
+ }
|
|
|
+ memdelete(f);
|
|
|
+ } else {
|
|
|
+ err = ERR_CANT_CREATE;
|
|
|
}
|
|
|
- memdelete(f);
|
|
|
- } else {
|
|
|
- err = ERR_CANT_CREATE;
|
|
|
}
|
|
|
} else {
|
|
|
// add it to our zip file
|