godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exit code of --help and --version, and test them in CI

Browse Source 
Corrects prior regression which caused ERROR output and exit code of 1.

(cherry picked from commit d38d76d039)
This commit is contained in:
Jan Haller 2022-07-02 01:05:20 +02:00 committed by Rémi Verschelde
parent da78e92321
commit 861e155543
6 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@ -497,12 +497,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
show_help = true; show_help = true;
exit_code = OK; exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code.
goto error; goto error;
} else if (I->get() == "--version") { } else if (I->get() == "--version") {
print_line(get_full_version_string()); print_line(get_full_version_string());
exit_code = OK; exit_code = ERR_HELP; // Hack to force an early exit in `main()` with a success code.
goto error; goto error;
} else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output } else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output

1
platform/android/java_godot_lib_jni.cpp
View File

@ -199,6 +199,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jc
memfree(cmdline); memfree(cmdline);
} }
// Note: --help and --version return ERR_HELP, but this should be translated to 0 if exit codes are propagated.
if (err != OK) { if (err != OK) {
return; // should exit instead and print the error return; // should exit instead and print the error
} }

5
platform/iphone/godot_iphone.mm
View File

@ -103,7 +103,10 @@ int iphone_main(int argc, char **argv, String data_dir, String cache_dir) {
printf("os created\n"); printf("os created\n");
Error err = Main::setup(fargv[0], argc - 1, &fargv[1], false); Error err = Main::setup(fargv[0], argc - 1, &fargv[1], false);
printf("setup %i\n", err); printf("setup %i\n", err);
if (err != OK) {
if (err == ERR_HELP) { // Returned by --help and --version, so success.
return 0;
} else if (err != OK) {
return 255; return 255;
} }

5
platform/osx/godot_main_osx.mm
View File

@ -64,8 +64,11 @@ int main(int argc, char **argv) {
err = Main::setup(argv[0], argc - first_arg, &argv[first_arg]); err = Main::setup(argv[0], argc - first_arg, &argv[first_arg]);
} }
if (err != OK) if (err == ERR_HELP) { // Returned by --help and --version, so success.
return 0;
} else if (err != OK) {
return 255; return 255;
}
if (Main::start()) if (Main::start())
os.run(); // it is actually the OS that decides how to run os.run(); // it is actually the OS that decides how to run

4
platform/windows/godot_windows.cpp
View File

@ -164,6 +164,10 @@ __declspec(dllexport) int widechar_main(int argc, wchar_t **argv) {
delete[] argv_utf8[i]; delete[] argv_utf8[i];
} }
delete[] argv_utf8; delete[] argv_utf8;
if (err == ERR_HELP) { // Returned by --help and --version, so success.
return 0;
}
return 255; return 255;
} }

4
platform/x11/godot_x11.cpp
View File

@ -48,6 +48,10 @@ int main(int argc, char *argv[]) {
Error err = Main::setup(argv[0], argc - 1, &argv[1]); Error err = Main::setup(argv[0], argc - 1, &argv[1]);
if (err != OK) { if (err != OK) {
free(cwd); free(cwd);
if (err == ERR_HELP) { // Returned by --help and --version, so success.
return 0;
}
return 255; return 255;
} }