Remove now unused `year` member from `version.py`

We changed copyright to use "present" for the current year, so we no
longer need to hardcode this and (like now) forget to bump it yearly.
This commit is contained in:
Rémi Verschelde 2024-01-24 21:08:15 +01:00
parent 4b6ad34988
commit e0dc23367c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
8 changed files with 17 additions and 26 deletions

View File

@ -110,7 +110,6 @@ Dictionary Engine::get_version_info() const {
dict["hex"] = VERSION_HEX; dict["hex"] = VERSION_HEX;
dict["status"] = VERSION_STATUS; dict["status"] = VERSION_STATUS;
dict["build"] = VERSION_BUILD; dict["build"] = VERSION_BUILD;
dict["year"] = VERSION_YEAR;
String hash = String(VERSION_HASH); String hash = String(VERSION_HASH);
dict["hash"] = hash.is_empty() ? String("unknown") : hash; dict["hash"] = hash.is_empty() ? String("unknown") : hash;

View File

@ -33,6 +33,12 @@
#include "core/version_generated.gen.h" #include "core/version_generated.gen.h"
// Copied from typedefs.h to stay lean.
#ifndef _STR
#define _STR(m_x) #m_x
#define _MKSTR(m_x) _STR(m_x)
#endif
// Godot versions are of the form <major>.<minor> for the initial release, // Godot versions are of the form <major>.<minor> for the initial release,
// and then <major>.<minor>.<patch> for subsequent bugfix releases where <patch> != 0 // and then <major>.<minor>.<patch> for subsequent bugfix releases where <patch> != 0
// That's arbitrary, but we find it pretty and it's the current policy. // That's arbitrary, but we find it pretty and it's the current policy.

View File

@ -179,7 +179,6 @@
[code]status[/code] - Holds the status (e.g. "beta", "rc1", "rc2", ... "stable") as a String [code]status[/code] - Holds the status (e.g. "beta", "rc1", "rc2", ... "stable") as a String
[code]build[/code] - Holds the build name (e.g. "custom_build") as a String [code]build[/code] - Holds the build name (e.g. "custom_build") as a String
[code]hash[/code] - Holds the full Git commit hash as a String [code]hash[/code] - Holds the full Git commit hash as a String
[code]year[/code] - Holds the year the version was released in as an int
[code]string[/code] - [code]major[/code] + [code]minor[/code] + [code]patch[/code] + [code]status[/code] + [code]build[/code] in a single String [code]string[/code] - [code]major[/code] + [code]minor[/code] + [code]patch[/code] + [code]status[/code] + [code]build[/code] in a single String
The [code]hex[/code] value is encoded as follows, from left to right: one byte for the major, one byte for the minor, one byte for the patch version. For example, "3.1.12" would be [code]0x03010C[/code]. [b]Note:[/b] It's still an int internally, and printing it will give you its decimal representation, which is not particularly meaningful. Use hexadecimal literals for easy version comparisons from code: The [code]hex[/code] value is encoded as follows, from left to right: one byte for the major, one byte for the minor, one byte for the patch version. For example, "3.1.12" would be [code]0x03010C[/code]. [b]Note:[/b] It's still an int internally, and printing it will give you its decimal representation, which is not particularly meaningful. Use hexadecimal literals for easy version comparisons from code:
[codeblocks] [codeblocks]

View File

@ -163,7 +163,6 @@ def get_version_info(module_version_string="", silent=False):
"status": str(version.status), "status": str(version.status),
"build": str(build_name), "build": str(build_name),
"module_config": str(version.module_config) + module_version_string, "module_config": str(version.module_config) + module_version_string,
"year": int(version.year),
"website": str(version.website), "website": str(version.website),
"docs_branch": str(version.docs), "docs_branch": str(version.docs),
} }
@ -232,7 +231,6 @@ def generate_version_header(module_version_string=""):
#define VERSION_STATUS "{status}" #define VERSION_STATUS "{status}"
#define VERSION_BUILD "{build}" #define VERSION_BUILD "{build}"
#define VERSION_MODULE_CONFIG "{module_config}" #define VERSION_MODULE_CONFIG "{module_config}"
#define VERSION_YEAR {year}
#define VERSION_WEBSITE "{website}" #define VERSION_WEBSITE "{website}"
#define VERSION_DOCS_BRANCH "{docs_branch}" #define VERSION_DOCS_BRANCH "{docs_branch}"
#define VERSION_DOCS_URL "https://docs.godotengine.org/en/" VERSION_DOCS_BRANCH #define VERSION_DOCS_URL "https://docs.godotengine.org/en/" VERSION_DOCS_BRANCH

View File

@ -1,8 +1,4 @@
#include "core/version.h" #include "core/version.h"
#ifndef _STR
#define _STR(m_x) #m_x
#define _MKSTR(m_x) _STR(m_x)
#endif
GODOT_ICON ICON platform/windows/godot.ico GODOT_ICON ICON platform/windows/godot.ico
@ -21,7 +17,7 @@ BEGIN
VALUE "FileVersion", VERSION_NUMBER VALUE "FileVersion", VERSION_NUMBER
VALUE "ProductName", VERSION_NAME VALUE "ProductName", VERSION_NAME
VALUE "Licence", "MIT" VALUE "Licence", "MIT"
VALUE "LegalCopyright", "Copyright (c) 2007-" _MKSTR(VERSION_YEAR) " Juan Linietsky, Ariel Manzur and contributors" VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors"
VALUE "Info", "https://godotengine.org" VALUE "Info", "https://godotengine.org"
VALUE "ProductVersion", VERSION_FULL_BUILD VALUE "ProductVersion", VERSION_FULL_BUILD
END END

View File

@ -1,8 +1,4 @@
#include "core/version.h" #include "core/version.h"
#ifndef _STR
#define _STR(m_x) #m_x
#define _MKSTR(m_x) _STR(m_x)
#endif
GODOT_ICON ICON platform/windows/godot_console.ico GODOT_ICON ICON platform/windows/godot_console.ico
@ -21,7 +17,7 @@ BEGIN
VALUE "FileVersion", VERSION_NUMBER VALUE "FileVersion", VERSION_NUMBER
VALUE "ProductName", VERSION_NAME " (Console)" VALUE "ProductName", VERSION_NAME " (Console)"
VALUE "Licence", "MIT" VALUE "Licence", "MIT"
VALUE "LegalCopyright", "Copyright (c) 2007-" _MKSTR(VERSION_YEAR) " Juan Linietsky, Ariel Manzur and contributors" VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors"
VALUE "Info", "https://godotengine.org" VALUE "Info", "https://godotengine.org"
VALUE "ProductVersion", VERSION_FULL_BUILD VALUE "ProductVersion", VERSION_FULL_BUILD
END END

View File

@ -1,9 +1,7 @@
#ifndef MINIUPNPCSTRINGS_H_INCLUDED #ifndef MINIUPNPCSTRINGS_H_INCLUDED
#define MINIUPNPCSTRINGS_H_INCLUDED #define MINIUPNPCSTRINGS_H_INCLUDED
#include "core/version.h" #define OS_STRING "Godot Engine/1.0"
#define OS_STRING VERSION_NAME "/1.0"
#define MINIUPNPC_VERSION_STRING "2.2.5" #define MINIUPNPC_VERSION_STRING "2.2.5"
#if 0 #if 0

View File

@ -5,6 +5,5 @@ minor = 3
patch = 0 patch = 0
status = "dev" status = "dev"
module_config = "" module_config = ""
year = 2023
website = "https://godotengine.org" website = "https://godotengine.org"
docs = "latest" docs = "latest"