godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update `year` property in `version.py` to 2024 

Seems like we missed this one when changing the copyright statements
to use `present` instead of the hardcoded `year`.

And backport other minor improvements from #87543.

(cherry picked from commit f61e2491e1)
This commit is contained in:
Rémi Verschelde 2024-01-25 13:34:52 +01:00
parent a658a42119
commit b320fe6c39
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/version.h
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.

14
platform/windows/godot_res.rc
View File

@ -1,16 +1,12 @@
#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
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0 FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0 PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
FILEOS 4 FILEOS 4
FILETYPE 1 FILETYPE 1
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
@ -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

4
thirdparty/miniupnpc/src/miniupnpcstrings.h vendored
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

2
version.py
View File

@ -5,6 +5,6 @@ minor = 5
patch = 4 patch = 4
status = "rc" status = "rc"
module_config = "" module_config = ""
year = 2023 year = 2024
website = "https://godotengine.org" website = "https://godotengine.org"
docs = "3.5" docs = "3.5"