diff options
| -rw-r--r-- | core/engine.cpp | 4 | ||||
| -rw-r--r-- | core/version.h | 4 | ||||
| -rw-r--r-- | doc/classes/Engine.xml | 4 | ||||
| -rw-r--r-- | methods.py | 10 | ||||
| -rw-r--r-- | platform/windows/godot_res.rc | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/core/engine.cpp b/core/engine.cpp index 9a3c6248a8..53c7a73b43 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -85,7 +85,7 @@ Dictionary Engine::get_version_info() const { dict["patch"] = 0; #endif dict["status"] = VERSION_STATUS; - dict["revision"] = VERSION_REVISION; + dict["build"] = VERSION_BUILD; dict["year"] = VERSION_YEAR; String hash = VERSION_HASH; @@ -94,7 +94,7 @@ Dictionary Engine::get_version_info() const { String stringver = String(dict["major"]) + "." + String(dict["minor"]); if ((int)dict["patch"] != 0) stringver += "." + String(dict["patch"]); - stringver += "-" + String(dict["status"]) + " (" + String(dict["revision"]) + ")"; + stringver += "-" + String(dict["status"]) + " (" + String(dict["build"]) + ")"; dict["string"] = stringver; return dict; diff --git a/core/version.h b/core/version.h index 01c251c113..b217d82c5d 100644 --- a/core/version.h +++ b/core/version.h @@ -30,8 +30,8 @@ #include "version_generated.gen.h" #ifdef VERSION_PATCH -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." VERSION_STATUS "." VERSION_REVISION VERSION_MODULE_CONFIG +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." VERSION_STATUS "." VERSION_BUILD VERSION_MODULE_CONFIG #else -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." VERSION_STATUS "." VERSION_REVISION VERSION_MODULE_CONFIG +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." VERSION_STATUS "." VERSION_BUILD VERSION_MODULE_CONFIG #endif // VERSION_PATCH #define VERSION_FULL_NAME "" VERSION_NAME " v" VERSION_MKSTRING diff --git a/doc/classes/Engine.xml b/doc/classes/Engine.xml index f43bbc2e9d..090e0d7910 100644 --- a/doc/classes/Engine.xml +++ b/doc/classes/Engine.xml @@ -71,8 +71,8 @@ "minor" - Holds the minor version number as a String "patch" - Holds the patch version number as a String "status" - Holds the status (e.g. "beta", "rc1", "rc2", ... "stable") as a String - "revision" - Holds the revision (e.g. "custom-build") as a String - "string" - major + minor + patch + status + revision in a single String + "build" - Holds the build name (e.g. "custom-build") as a String + "string" - major + minor + patch + status + build in a single String </description> </method> <method name="has_singleton" qualifiers="const"> diff --git a/methods.py b/methods.py index 511faf7ec1..2be73f02d2 100644 --- a/methods.py +++ b/methods.py @@ -1154,11 +1154,11 @@ def add_module_version_string(self,s): def update_version(module_version_string=""): - rev = "custom_build" + build_name = "custom_build" + if (os.getenv("BUILD_NAME") != None): + build_name = os.getenv("BUILD_NAME") + print("Using custom build name: " + build_name) - if (os.getenv("BUILD_REVISION") != None): - rev = os.getenv("BUILD_REVISION") - print("Using custom revision: " + rev) import version f = open("core/version_generated.gen.h", "w") @@ -1168,8 +1168,8 @@ def update_version(module_version_string=""): f.write("#define VERSION_MINOR " + str(version.minor) + "\n") if (hasattr(version, 'patch')): f.write("#define VERSION_PATCH " + str(version.patch) + "\n") - f.write("#define VERSION_REVISION \"" + str(rev) + "\"\n") f.write("#define VERSION_STATUS \"" + str(version.status) + "\"\n") + f.write("#define VERSION_BUILD \"" + str(build_name) + "\"\n") f.write("#define VERSION_MODULE_CONFIG \"" + str(version.module_config) + module_version_string + "\"\n") import datetime f.write("#define VERSION_YEAR " + str(datetime.datetime.now().year) + "\n") diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index 7b745f0f97..c535a749c0 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -29,7 +29,7 @@ BEGIN VALUE "Licence", "MIT" VALUE "LegalCopyright", "Copyright (c) 2007-" _MKSTR(VERSION_YEAR) " Juan Linietsky, Ariel Manzur" VALUE "Info", "https://godotengine.org" - VALUE "ProductVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) PATCH_STRING "." VERSION_REVISION + VALUE "ProductVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) PATCH_STRING "." VERSION_BUILD END END BLOCK "VarFileInfo" |