mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: store revision information in C++ style strings

pull/14156/head
Rubidium 2025-04-28 22:54:51 +02:00 committed by rubidium42
parent 8b1c1cc33d
commit b20b56d5fc
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rev.cpp.in
View File

@ -35,7 +35,7 @@ bool IsReleasedVersion()
* *
* <modified> shows a "M", if the binary is made from modified source code. * <modified> shows a "M", if the binary is made from modified source code.
*/ */
const char _openttd_revision[] = "${REV_VERSION}"; const std::string _openttd_revision = "${REV_VERSION}";
/** /**
* The text version of OpenTTD's build date. * The text version of OpenTTD's build date.
@ -43,17 +43,17 @@ const char _openttd_revision[] = "${REV_VERSION}";
* updated for each revision in contrary to most other files that only see * updated for each revision in contrary to most other files that only see
* updates when they are actually changed themselves. * updates when they are actually changed themselves.
*/ */
const char _openttd_build_date[] = __DATE__ " " __TIME__; const std::string_view _openttd_build_date = __DATE__ " " __TIME__;
/** /**
* The git revision hash of this version. * The git revision hash of this version.
*/ */
const char _openttd_revision_hash[] = "${REV_HASH}"; const std::string_view _openttd_revision_hash = "${REV_HASH}";
/** /**
* The year of this version. * The year of this version.
*/ */
const char _openttd_revision_year[] = "${REV_YEAR}"; const std::string_view _openttd_revision_year = "${REV_YEAR}";
/** /**
* Let us know if current build was modified. This detection * Let us know if current build was modified. This detection
@ -77,7 +77,7 @@ const uint8_t _openttd_revision_tagged = ${REV_ISTAG};
* It should never contain things like "beta", but only the release version * It should never contain things like "beta", but only the release version
* we are compatible with. * we are compatible with.
*/ */
const char _openttd_content_version[] = "${REV_MAJOR}.${REV_MINOR}"; const std::string_view _openttd_content_version = "${REV_MAJOR}.${REV_MINOR}";
/** /**
* The NewGRF revision of OTTD: * The NewGRF revision of OTTD:

10
src/rev.h
View File

@ -10,13 +10,13 @@
#ifndef REV_H #ifndef REV_H
#define REV_H #define REV_H
extern const char _openttd_revision[]; extern const std::string _openttd_revision;
extern const char _openttd_build_date[]; extern const std::string_view _openttd_build_date;
extern const char _openttd_revision_hash[]; extern const std::string_view _openttd_revision_hash;
extern const char _openttd_revision_year[]; extern const std::string_view _openttd_revision_year;
extern const uint8_t _openttd_revision_modified; extern const uint8_t _openttd_revision_modified;
extern const uint8_t _openttd_revision_tagged; extern const uint8_t _openttd_revision_tagged;
extern const char _openttd_content_version[]; extern const std::string_view _openttd_content_version;
extern const uint32_t _openttd_newgrf_version; extern const uint32_t _openttd_newgrf_version;
bool IsReleasedVersion(); bool IsReleasedVersion();

4
src/screenshot_png.cpp
View File

@ -77,8 +77,8 @@ public:
png_text_struct text[2]; png_text_struct text[2];
memset(text, 0, sizeof(text)); memset(text, 0, sizeof(text));
text[0].key = const_cast<char *>("Software"); text[0].key = const_cast<char *>("Software");
text[0].text = const_cast<char *>(_openttd_revision); text[0].text = const_cast<char *>(_openttd_revision.c_str());
text[0].text_length = strlen(_openttd_revision); text[0].text_length = _openttd_revision.size();
text[0].compression = PNG_TEXT_COMPRESSION_NONE; text[0].compression = PNG_TEXT_COMPRESSION_NONE;
std::string message; std::string message;

2
src/social_integration.cpp
View File

@ -28,7 +28,7 @@ class InternalSocialIntegrationPlugin {
public: public:
InternalSocialIntegrationPlugin(const std::string &filename, const std::string &basepath) : library(nullptr), external(basepath) InternalSocialIntegrationPlugin(const std::string &filename, const std::string &basepath) : library(nullptr), external(basepath)
{ {
openttd_info.openttd_version = _openttd_revision; openttd_info.openttd_version = _openttd_revision.c_str();
if (!ValidateSignatureFile(fmt::format("{}.sig", filename))) { if (!ValidateSignatureFile(fmt::format("{}.sig", filename))) {
external.state = SocialIntegrationPlugin::INVALID_SIGNATURE; external.state = SocialIntegrationPlugin::INVALID_SIGNATURE;