Skip to content

Commit

Permalink
Rename the version's "revision" to "build"
Browse files Browse the repository at this point in the history
That "revision" was inherited from SVN days but had been since then
used to give information about the build: "custom_build", "official",
"<some distro's build>".

It can now be overridden with the BUILD_NAME environment variable.
  • Loading branch information
akien-mga committed Nov 19, 2017
1 parent 6947bed commit 3fd23da
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions core/engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions doc/classes/Engine.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
10 changes: 5 additions & 5 deletions methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion platform/windows/godot_res.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 3fd23da

Please sign in to comment.