godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Preserve the output from the gradle build command

Browse Source 
Updates `EditorNode#execute_and_show_output(...)` to return the output of the executed command.
This commit is contained in:
Fredia Huya-Kouadio
2023-11-11 17:20:04 -08:00
committed by Rémi Verschelde
parent e38686f85b
commit 136b7f9c52
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_node.cpp
View File

@@ -6733,7 +6733,7 @@ static void _execute_thread(void *p_ud) {
eta->done.set();
}
int EditorNode::execute_and_show_output(const String &p_title, const String &p_path, const List<String> &p_arguments, bool p_close_on_ok, bool p_close_on_errors) {
int EditorNode::execute_and_show_output(const String &p_title, const String &p_path, const List<String> &p_arguments, bool p_close_on_ok, bool p_close_on_errors, String *r_output) {
if (execute_output_dialog) {
execute_output_dialog->set_title(p_title);
execute_output_dialog->get_ok_button()->set_disabled(true);
@@ -6779,6 +6779,9 @@ int EditorNode::execute_and_show_output(const String &p_title, const String &p_p
execute_output_dialog->get_ok_button()->set_disabled(false);
}
if (r_output) {
*r_output = eta.output;
}
return eta.exitcode;
}