Print engine version to stdout when starting Godot

Also include website URL and make it configurable via version.py
together with the rest of the engine branding.

Add mention to MIT license in --help output.

(cherry picked from commit b10dd110e5)
This commit is contained in:
Rémi Verschelde 2019-05-28 11:19:21 +02:00
parent 6afcc72465
commit 88cccfb796
3 changed files with 7 additions and 1 deletions

View File

@ -204,7 +204,8 @@ void finalize_physics() {
void Main::print_help(const char *p_binary) { void Main::print_help(const char *p_binary) {
print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - https://godotengine.org"); print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
OS::get_singleton()->print("Free and open source software under the terms of the MIT license.\n");
OS::get_singleton()->print("(c) 2007-2019 Juan Linietsky, Ariel Manzur.\n"); OS::get_singleton()->print("(c) 2007-2019 Juan Linietsky, Ariel Manzur.\n");
OS::get_singleton()->print("(c) 2014-2019 Godot Engine contributors.\n"); OS::get_singleton()->print("(c) 2014-2019 Godot Engine contributors.\n");
OS::get_singleton()->print("\n"); OS::get_singleton()->print("\n");
@ -1087,6 +1088,9 @@ error:
Error Main::setup2(Thread::ID p_main_tid_override) { Error Main::setup2(Thread::ID p_main_tid_override) {
// Print engine name and version
print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
if (p_main_tid_override) { if (p_main_tid_override) {
Thread::_main_thread_id = p_main_tid_override; Thread::_main_thread_id = p_main_tid_override;
} }

View File

@ -61,6 +61,7 @@ def update_version(module_version_string=""):
f.write("#define VERSION_BUILD \"" + str(build_name) + "\"\n") f.write("#define VERSION_BUILD \"" + str(build_name) + "\"\n")
f.write("#define VERSION_MODULE_CONFIG \"" + str(version.module_config) + module_version_string + "\"\n") f.write("#define VERSION_MODULE_CONFIG \"" + str(version.module_config) + module_version_string + "\"\n")
f.write("#define VERSION_YEAR " + str(version.year) + "\n") f.write("#define VERSION_YEAR " + str(version.year) + "\n")
f.write("#define VERSION_WEBSITE \"" + str(version.website) + "\"\n")
f.close() f.close()
# NOTE: It is safe to generate this file here, since this is still executed serially # NOTE: It is safe to generate this file here, since this is still executed serially

View File

@ -6,3 +6,4 @@ patch = 2
status = "devel" status = "devel"
module_config = "" module_config = ""
year = 2019 year = 2019
website = "https://godotengine.org"