From 127060d95358131d7a4fc9e45dcac7c39600cb4c Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Wed, 4 May 2022 12:56:00 +0300 Subject: [PATCH] Fix export plugins after embedded PCK loading changes. --- editor/editor_export.cpp | 3 +++ editor/editor_export.h | 5 +++-- platform/windows/export/export.cpp | 19 ++++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index e0c3df0fe..ebc69679b 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1635,6 +1635,9 @@ Error EditorExportPlatformPC::export_project(const Ref &p_pr ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags); Error err = prepare_template(p_preset, p_debug, p_path, p_flags); + if (err == OK) { + err = modify_template(p_preset, p_debug, p_path, p_flags); + } if (err == OK) { err = export_project_data(p_preset, p_debug, p_path, p_flags); } diff --git a/editor/editor_export.h b/editor/editor_export.h index 517a40830..a34214bc8 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -449,8 +449,9 @@ public: virtual Error export_project(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags = 0); virtual Error sign_shared_object(const Ref &p_preset, bool p_debug, const String &p_path); - Error prepare_template(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags); - Error export_project_data(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags); + virtual Error prepare_template(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags); + virtual Error modify_template(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags) { return OK; } + virtual Error export_project_data(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags); void set_extension(const String &p_extension, const String &p_feature_key = "default"); void set_name(const String &p_name); diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 2227c204d..8144bb264 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -48,6 +48,7 @@ class EditorExportPlatformWindows : public EditorExportPlatformPC { public: virtual Error export_project(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags = 0); virtual Error sign_shared_object(const Ref &p_preset, bool p_debug, const String &p_path); + virtual Error modify_template(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags); virtual void get_export_options(List *r_options); virtual bool get_option_visibility(const String &p_option, const Map &p_options) const; virtual bool can_export(const Ref &p_preset, String &r_error, bool &r_missing_templates) const; @@ -61,21 +62,21 @@ Error EditorExportPlatformWindows::sign_shared_object(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags) { + if (p_preset->get("application/modify_resources")) { + return _rcedit_add_data(p_preset, p_path); + } else { + return OK; + } +} + Error EditorExportPlatformWindows::export_project(const Ref &p_preset, bool p_debug, const String &p_path, int p_flags) { String pck_path = p_path; if (p_preset->get("binary_format/embed_pck")) { pck_path = p_path.get_basename() + ".tmp"; } - Error err = EditorExportPlatformPC::prepare_template(p_preset, p_debug, pck_path, p_flags); - if (p_preset->get("application/modify_resources") && err == OK) { - err = _rcedit_add_data(p_preset, pck_path); - } - - if (err == OK) { - err = EditorExportPlatformPC::export_project_data(p_preset, p_debug, pck_path, p_flags); - } - + Error err = EditorExportPlatformPC::export_project(p_preset, p_debug, pck_path, p_flags); if (p_preset->get("codesign/enable") && err == OK) { err = _code_sign(p_preset, pck_path); }