aboutsummaryrefslogtreecommitdiff
path: root/src/common/GitRevision.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-09-03 12:06:16 +0200
committerShauren <shauren.trinity@gmail.com>2025-08-30 22:55:25 +0200
commit9350a0f56171da02702754834180fbaac34864a9 (patch)
tree4643ec0f0ffbf53536bbdf34e8535473974bc17b /src/common/GitRevision.cpp
parent3af906f0a6a5c5e550976da1eb2020ee79a99e4f (diff)
Core/Misc: CompilerDefs/GitRevision improvements
* Removed INTEL as a separate platform (it does not belong there) * Removed BORLAND from known compilers list (it was never supported) * Simplified TRINITY_PLATFORM_WINDOWS detection (_WIN32 is always defined) * Rename revision_data.h macros that begin with a underscore * Added processor architecture to --version string * Added Linux distribution name to .server debug * Fixed some revision_data.h macros missing/wrong values when regenerated during compilation * Removed manual adding of _WIN64 macro from cmake (it is predefined internally by compiler) (cherry picked from commit e8740fb2e125b308493aeab49ddd7b0cc6a53c97)
Diffstat (limited to 'src/common/GitRevision.cpp')
-rw-r--r--src/common/GitRevision.cpp41
1 files changed, 16 insertions, 25 deletions
diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp
index b4dcb801962..2c431a603f7 100644
--- a/src/common/GitRevision.cpp
+++ b/src/common/GitRevision.cpp
@@ -20,68 +20,59 @@
char const* GitRevision::GetHash()
{
- return _HASH;
+ return TRINITY_GIT_COMMIT_HASH;
}
char const* GitRevision::GetDate()
{
- return _DATE;
+ return TRINITY_GIT_COMMIT_DATE;
}
char const* GitRevision::GetBranch()
{
- return _BRANCH;
+ return TRINITY_GIT_COMMIT_BRANCH;
}
char const* GitRevision::GetCMakeCommand()
{
- return _CMAKE_COMMAND;
+ return TRINITY_BUILD_CMAKE_COMMAND;
}
char const* GitRevision::GetCMakeVersion()
{
- return _CMAKE_VERSION;
+ return TRINITY_BUILD_CMAKE_VERSION;
}
char const* GitRevision::GetHostOSVersion()
{
- return _CMAKE_HOST_SYSTEM;
+ return
+#ifdef TRINITY_BUILD_HOST_DISTRO_NAME
+ TRINITY_BUILD_HOST_DISTRO_NAME " " TRINITY_BUILD_HOST_DISTRO_VERSION_ID "; "
+#endif
+ TRINITY_BUILD_HOST_SYSTEM " " TRINITY_BUILD_HOST_SYSTEM_VERSION
+ ;
}
char const* GitRevision::GetBuildDirectory()
{
- return _BUILD_DIRECTORY;
+ return TRINITY_BUILD_CMAKE_BUILD_DIRECTORY;
}
char const* GitRevision::GetSourceDirectory()
{
- return _SOURCE_DIRECTORY;
+ return TRINITY_BUILD_CMAKE_SOURCE_DIRECTORY;
}
char const* GitRevision::GetMySQLExecutable()
{
- return _MYSQL_EXECUTABLE;
+ return DATABASE_MYSQL_EXECUTABLE;
}
char const* GitRevision::GetFullDatabase()
{
- return _FULL_DATABASE;
+ return DATABASE_FULL_DATABASE;
}
-#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
-# ifdef _WIN64
-# define TRINITY_PLATFORM_STR "Win64"
-# else
-# define TRINITY_PLATFORM_STR "Win32"
-# endif
-#elif TRINITY_PLATFORM == TRINITY_PLATFORM_APPLE
-# define TRINITY_PLATFORM_STR "MacOSX"
-#elif TRINITY_PLATFORM == TRINITY_PLATFORM_INTEL
-# define TRINITY_PLATFORM_STR "Intel"
-#else // TRINITY_PLATFORM_UNIX
-# define TRINITY_PLATFORM_STR "Unix"
-#endif
-
#ifndef TRINITY_API_USE_DYNAMIC_LINKING
# define TRINITY_LINKAGE_TYPE_STR "Static"
#else
@@ -91,7 +82,7 @@ char const* GitRevision::GetFullDatabase()
char const* GitRevision::GetFullVersion()
{
return "TrinityCore rev. " VER_PRODUCTVERSION_STR
- " (" TRINITY_PLATFORM_STR ", " _BUILD_DIRECTIVE ", " TRINITY_LINKAGE_TYPE_STR ")";
+ " (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR ", " _BUILD_DIRECTIVE ", " TRINITY_LINKAGE_TYPE_STR ")";
}
char const* GitRevision::GetCompanyNameStr()