diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-19 21:26:05 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-20 00:51:14 +0100 |
| commit | 3fd23da5ee2e69e1aca663b52ecf1f3d61188a64 (patch) | |
| tree | a2b37af18c785fc6076e1e0a9f44ac85c91176ca /core | |
| parent | 6947bed015c33706b9a441fd47cd84f0da99097c (diff) | |
Rename the version's "revision" to "build"
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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/engine.cpp | 4 | ||||
| -rw-r--r-- | core/version.h | 4 |
2 files changed, 4 insertions, 4 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 |