Merge pull request #34680 from Calinou/editor-export-nonzero-exit-code-error

Exit the editor export process with a non-zero exit code on error
This commit is contained in:
Rémi Verschelde 2019-12-30 18:07:36 +01:00 committed by GitHub
commit 86a732b136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -171,6 +171,7 @@
#include "editor/settings_config_dialog.h"
#include <stdio.h>
#include <stdlib.h>
EditorNode *EditorNode::singleton = NULL;
@ -573,11 +574,13 @@ void EditorNode::_fs_changed() {
if (preset.is_null()) {
String errstr = "Unknown export preset: " + export_defer.preset;
ERR_PRINTS(errstr);
OS::get_singleton()->set_exit_code(EXIT_FAILURE);
} else {
Ref<EditorExportPlatform> platform = preset->get_platform();
if (platform.is_null()) {
String errstr = "Preset \"" + export_defer.preset + "\" doesn't have a platform.";
ERR_PRINTS(errstr);
OS::get_singleton()->set_exit_code(EXIT_FAILURE);
} else {
// ensures export_project does not loop infinitely, because notifications may
// come during the export
@ -594,6 +597,7 @@ void EditorNode::_fs_changed() {
}
if (err != OK) {
ERR_PRINTS(vformat(TTR("Project export failed with error code %d."), (int)err));
OS::get_singleton()->set_exit_code(EXIT_FAILURE);
}
}
}