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)

# Conflicts:
#	revision_data.h.in.cmake

2 files changed, 21 insertions, 39 deletions

diff --git a/src/common/CompilerDefs.h b/src/common/CompilerDefs.h
index 05a7b090560..4003fbe77e9 100644
--- a/src/common/CompilerDefs.h
+++ b/src/common/CompilerDefs.h
@@ -21,30 +21,21 @@
 #define TRINITY_PLATFORM_WINDOWS 0
 #define TRINITY_PLATFORM_UNIX    1
 #define TRINITY_PLATFORM_APPLE   2
-#define TRINITY_PLATFORM_INTEL   3
 
-// must be first (win 64 also define _WIN32)
-#if defined( _WIN64 )
+#if defined( _WIN32 )
 #  define TRINITY_PLATFORM TRINITY_PLATFORM_WINDOWS
-#elif defined( __WIN32__ ) || defined( WIN32 ) || defined( _WIN32 )
-#  define TRINITY_PLATFORM TRINITY_PLATFORM_WINDOWS
-#elif defined( __APPLE_CC__ )
+#elif defined( __APPLE__ )
 #  define TRINITY_PLATFORM TRINITY_PLATFORM_APPLE
-#elif defined( __INTEL_COMPILER )
-#  define TRINITY_PLATFORM TRINITY_PLATFORM_INTEL
 #else
 #  define TRINITY_PLATFORM TRINITY_PLATFORM_UNIX
 #endif
 
 #define TRINITY_COMPILER_MICROSOFT 0
 #define TRINITY_COMPILER_GNU       1
-#define TRINITY_COMPILER_BORLAND   2
-#define TRINITY_COMPILER_INTEL     3
+#define TRINITY_COMPILER_INTEL     2
 
 #ifdef _MSC_VER
 #  define TRINITY_COMPILER TRINITY_COMPILER_MICROSOFT
-#elif defined( __BORLANDC__ )
-#  define TRINITY_COMPILER TRINITY_COMPILER_BORLAND
 #elif defined( __INTEL_COMPILER )
 #  define TRINITY_COMPILER TRINITY_COMPILER_INTEL
 #elif defined( __GNUC__ )
diff --git a/src/common/GitRevision.cpp b/src/common/GitRevision.cpp
index 04ba7fdf443..7fa2520e750 100644
--- a/src/common/GitRevision.cpp
+++ b/src/common/GitRevision.cpp
@@ -20,72 +20,63 @@
 
 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;
 }
 
 char const* GitRevision::GetHotfixesDatabase()
 {
-    return _HOTFIXES_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
+    return DATABASE_HOTFIXES_DATABASE;
+}
 
 #ifndef TRINITY_API_USE_DYNAMIC_LINKING
 #  define TRINITY_LINKAGE_TYPE_STR "Static"
@@ -96,7 +87,7 @@ char const* GitRevision::GetHotfixesDatabase()
 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()