Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent version.h #228

Merged
merged 1 commit into from
Jan 12, 2025
Merged

Consistent version.h #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
// Similar to EXTERNAL_VERSION_FULL_CONFIG, but also includes the VERSION_FULL_BUILD
// description.
// Example: "0.1.0.stable.mono (3.1.4.stable.mono.official)"
#define EXTERNAL_VERSION_FULL_BUILD EXTERNAL_VERSION_NUMBER "(" VERSION_FULL_BUILD ")"
#define EXTERNAL_VERSION_FULL_BUILD EXTERNAL_VERSION_FULL_CONFIG " (" VERSION_FULL_BUILD ")"

// Same as above, but prepended with Godot's name and a cosmetic "v" for "version".
// Example: "Blazium v0.1.0.nightly.mono (base v3.1.4.stable.mono.official)"
#define VERSION_FULL_NAME VERSION_NAME " v" EXTERNAL_VERSION_NUMBER " (base v" VERSION_FULL_BUILD ")"
// Example: "Blazium Engine v0.1.0.nightly.mono (3.1.4.stable.mono.official)"
#define VERSION_FULL_NAME VERSION_NAME " v" EXTERNAL_VERSION_FULL_BUILD

// Git commit hash, generated at build time in `core/version_hash.gen.cpp`.
extern const char *const VERSION_HASH;
Expand Down
2 changes: 1 addition & 1 deletion editor/editor_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5015,7 +5015,7 @@ String EditorNode::_get_system_info() const {
}
const String distribution_version = OS::get_singleton()->get_version();

String godot_version = "Blazium v" + String(VERSION_FULL_CONFIG);
String godot_version = String(VERSION_FULL_NAME);
if (String(VERSION_BUILD) != "official") {
String hash = String(VERSION_HASH);
hash = hash.is_empty() ? String("unknown") : vformat("(%s)", hash.left(9));
Expand Down
Loading