Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #110248 from KoBeWi/unexpected_include_hell

Browse source 
Misc cleanup in EditorExportPlatform
This commit is contained in:
Thaddeus Crews 2025-11-04 16:32:39 -06:00
commit 90cab74af9
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
21 changed files with 63 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -801,11 +801,7 @@ Error EditorExportPlatformAndroid::save_apk_so(void *p_userdata, const SharedObj
Error EditorExportPlatformAndroid::save_apk_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed) {
APKExportData *ed = static_cast<APKExportData *>(p_userdata);
String simplified_path = p_path.simplify_path();
if (simplified_path.begins_with("uid://")) {
simplified_path = ResourceUID::uid_to_path(simplified_path).simplify_path();
print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, simplified_path));
}
const String simplified_path = simplify_path(p_path);
Vector<uint8_t> enc_data;
EditorExportPlatform::SavedData sd;

2
platform/android/export/export_plugin.h
View file

@ -41,6 +41,8 @@
#include "core/os/os.h"
#include "editor/export/editor_export_platform.h"
class ImageTexture;
// Optional environment variables for defining confidential information. If any
// of these is set, they will override the values set in the credentials file.
const String ENV_ANDROID_KEYSTORE_DEBUG_PATH = "GODOT_ANDROID_KEYSTORE_DEBUG_PATH";

6
platform/android/export/gradle_export_util.cpp
View file

@ -172,11 +172,7 @@ Error store_string_at_path(const String &p_path, const String &p_data) {
Error rename_and_store_file_in_gradle_project(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed) {
CustomExportData *export_data = static_cast<CustomExportData *>(p_userdata);
String simplified_path = p_path.simplify_path();
if (simplified_path.begins_with("uid://")) {
simplified_path = ResourceUID::uid_to_path(simplified_path).simplify_path();
print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, simplified_path));
}
const String simplified_path = EditorExportPlatform::simplify_path(p_path);
Vector<uint8_t> enc_data;
EditorExportPlatform::SavedData sd;

1
platform/android/export/gradle_export_util.h
View file

@ -37,6 +37,7 @@
#include "core/os/os.h"
#include "editor/export/editor_export.h"
#include "editor/export/editor_export_platform.h"
#include "servers/display/display_server.h"
const String GODOT_PROJECT_NAME_XML_STRING = R"(<?xml version="1.0" encoding="utf-8"?>
<!--WARNING: THIS FILE WILL BE OVERWRITTEN AT BUILD TIME-->

1
platform/linuxbsd/export/export_plugin.cpp
View file

@ -34,6 +34,7 @@
#include "run_icon_svg.gen.h"
#include "core/config/project_settings.h"
#include "core/io/dir_access.h"
#include "editor/editor_node.h"
#include "editor/editor_string_names.h"
#include "editor/export/editor_export.h"

1
platform/macos/export/export_plugin.h
View file

@ -39,6 +39,7 @@
#include "core/os/os.h"
#include "editor/export/editor_export.h"
#include "editor/settings/editor_settings.h"
#include "scene/resources/image_texture.h"
#include <sys/stat.h>

1
platform/web/export/export_plugin.cpp
View file

@ -34,6 +34,7 @@
#include "run_icon_svg.gen.h"
#include "core/config/project_settings.h"
#include "core/io/dir_access.h"
#include "editor/editor_string_names.h"
#include "editor/export/editor_export.h"
#include "editor/import/resource_importer_texture_settings.h"

2
platform/web/export/export_plugin.h
View file

@ -42,6 +42,8 @@
#include "editor/export/editor_export_platform.h"
#include "main/splash.gen.h"
class ImageTexture;
class EditorExportPlatformWeb : public EditorExportPlatform {
GDCLASS(EditorExportPlatformWeb, EditorExportPlatform);

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

@ -35,12 +35,14 @@
#include "template_modifier.h"
#include "core/config/project_settings.h"
#include "core/io/dir_access.h"
#include "core/io/image_loader.h"
#include "editor/editor_node.h"
#include "editor/editor_string_names.h"
#include "editor/export/editor_export.h"
#include "editor/file_system/editor_paths.h"
#include "editor/themes/editor_scale.h"
#include "scene/resources/image_texture.h"
#include "modules/svg/image_loader_svg.h"

2
platform/windows/export/template_modifier.cpp
View file

@ -31,6 +31,8 @@
#include "template_modifier.h"
#include "core/config/project_settings.h"
#include "core/io/dir_access.h"
#include "core/io/image.h"
void TemplateModifier::ByteStream::save(uint8_t p_value, Vector<uint8_t> &r_bytes) const {
save(p_value, r_bytes, 1);