Skip to content

Commit d03e90e

Browse files
ShaurenShauren
committed
Core/Misc: Fix revision_data.h and boost/predef preprocessor macro conflict
(cherry picked from commit 1f5f245c02e92b967abfcd74858669be98a49333)
1 parent da4bcad commit d03e90e

File tree

7 files changed

+40
-47
lines changed

7 files changed

+40
-47
lines changed

‎cmake/macros/ConfigureBaseTargets.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ set(CMAKE_CXX_STANDARD 20)
1818
# Set build-directive (used in core to tell which buildtype we used)
1919
target_compile_definitions(trinity-compile-option-interface
2020
INTERFACE
21-
_BUILD_DIRECTIVE="$<CONFIG>")
21+
TRINITY_BUILD_TYPE="$<CONFIG>"
22+
TRINITY_BUILD_HAS_DEBUG_INFO=$<CONFIG:Debug,RelWithDebInfo>)
2223

2324
# An interface library to make the target features available to other targets
2425
add_library(trinity-feature-interface INTERFACE)

‎revision_data.h.in.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
#define DATABASE_FULL_DATABASE "TDB_full_world_335.24111_2024_11_22.sql"
4444

4545
// Windows resource defines
46-
#define VER_COMPANYNAME_STR "TrinityCore Developers"
47-
#define VER_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore"
48-
#define VER_FILEVERSION 0,0,0
49-
#define VER_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)"
50-
#define VER_PRODUCTVERSION VER_FILEVERSION
51-
#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR
46+
#define TRINITY_COMPANYNAME_STR "TrinityCore Developers"
47+
#define TRINITY_LEGALCOPYRIGHT_STR "(c)2008-@rev_year@ TrinityCore"
48+
#define TRINITY_FILEVERSION 0,0,0
49+
#define TRINITY_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)"
50+
#define TRINITY_PRODUCTVERSION TRINITY_FILEVERSION
51+
#define TRINITY_PRODUCTVERSION_STR TRINITY_FILEVERSION_STR
5252

5353
#endif // TRINITYCORE_REVISION_DATA_H

‎src/common/GitRevision.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,26 @@ char const* GitRevision::GetFullDatabase()
8181

8282
char const* GitRevision::GetFullVersion()
8383
{
84-
return "TrinityCore rev. " VER_PRODUCTVERSION_STR
85-
" (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR ", " _BUILD_DIRECTIVE ", " TRINITY_LINKAGE_TYPE_STR ")";
84+
return "TrinityCore rev. " TRINITY_PRODUCTVERSION_STR
85+
" (" TRINITY_BUILD_HOST_SYSTEM ", " TRINITY_BUILD_PROCESSOR ", " TRINITY_BUILD_TYPE ", " TRINITY_LINKAGE_TYPE_STR ")";
8686
}
8787

8888
char const* GitRevision::GetCompanyNameStr()
8989
{
90-
return VER_COMPANYNAME_STR;
90+
return TRINITY_COMPANYNAME_STR;
9191
}
9292

9393
char const* GitRevision::GetLegalCopyrightStr()
9494
{
95-
return VER_LEGALCOPYRIGHT_STR;
95+
return TRINITY_LEGALCOPYRIGHT_STR;
9696
}
9797

9898
char const* GitRevision::GetFileVersionStr()
9999
{
100-
return VER_FILEVERSION_STR;
100+
return TRINITY_FILEVERSION_STR;
101101
}
102102

103103
char const* GitRevision::GetProductVersionStr()
104104
{
105-
return VER_PRODUCTVERSION_STR;
105+
return TRINITY_PRODUCTVERSION_STR;
106106
}

‎src/server/authserver/authserver.rc‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
5151
// Version
5252
//
5353

54-
VS_VERSION_INFO VERSIONINFO
55-
FILEVERSION VER_FILEVERSION
56-
PRODUCTVERSION VER_PRODUCTVERSION
57-
58-
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
59-
60-
#ifndef _DEBUG
61-
FILEFLAGS 0
54+
#if TRINITY_BUILD_HAS_DEBUG_INFO == 1
55+
#define TRINITY_DEBUG VS_FF_DEBUG
6256
#else
63-
#define VER_PRERELEASE VS_FF_PRERELEASE
64-
#define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD
65-
#define VER_DEBUG 0
66-
FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
57+
#define TRINITY_DEBUG 0
6758
#endif
6859

60+
VS_VERSION_INFO VERSIONINFO
61+
FILEVERSION TRINITY_FILEVERSION
62+
PRODUCTVERSION TRINITY_PRODUCTVERSION
63+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
64+
FILEFLAGS (VS_FF_PRERELEASE | TRINITY_DEBUG)
6965
FILEOS VOS_NT_WINDOWS32
7066
FILETYPE VFT_APP
7167

@@ -74,14 +70,14 @@ BEGIN
7470
BEGIN
7571
BLOCK "080004b0"
7672
BEGIN
77-
VALUE "CompanyName", VER_COMPANYNAME_STR
73+
VALUE "CompanyName", TRINITY_COMPANYNAME_STR
7874
VALUE "FileDescription", "TrinityCore Authentication Server Daemon"
79-
VALUE "FileVersion", VER_FILEVERSION_STR
75+
VALUE "FileVersion", TRINITY_FILEVERSION_STR
8076
VALUE "InternalName", "authserver"
81-
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
77+
VALUE "LegalCopyright", TRINITY_LEGALCOPYRIGHT_STR
8278
VALUE "OriginalFilename", "authserver.exe"
8379
VALUE "ProductName", "TrinityCore Authentication Server"
84-
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
80+
VALUE "ProductVersion", TRINITY_PRODUCTVERSION_STR
8581
END
8682
END
8783

‎src/server/game/Scripting/ScriptReloadMgr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ class HotSwapScriptReloadMgr final
11191119
if (itr != _known_modules_build_directives.end())
11201120
return itr->second;
11211121
else // If no build directive of the module was found use the one from the game library
1122-
return _BUILD_DIRECTIVE;
1122+
return TRINITY_BUILD_TYPE;
11231123
}();
11241124

11251125
// Initiate the new build job

‎src/server/scripts/ScriptLoader.cpp.in.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ TC_SCRIPT_API void AddScripts()
5454
/// Exposed in script modules to get the build directive of the module.
5555
TC_SCRIPT_API char const* GetBuildDirective()
5656
{
57-
return _BUILD_DIRECTIVE;
57+
return TRINITY_BUILD_TYPE;
5858
}
5959

6060
#ifdef TRINITY_IS_DYNAMIC_SCRIPTLOADER

‎src/server/worldserver/worldserver.rc‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
5151
// Version
5252
//
5353

54-
VS_VERSION_INFO VERSIONINFO
55-
FILEVERSION VER_FILEVERSION
56-
PRODUCTVERSION VER_PRODUCTVERSION
57-
58-
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
59-
60-
#ifndef _DEBUG
61-
FILEFLAGS 0
54+
#if TRINITY_BUILD_HAS_DEBUG_INFO == 1
55+
#define TRINITY_DEBUG VS_FF_DEBUG
6256
#else
63-
#define VER_PRERELEASE VS_FF_PRERELEASE
64-
#define VER_PRIVATEBUILD VS_FF_PRIVATEBUILD
65-
#define VER_DEBUG 0
66-
FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
57+
#define TRINITY_DEBUG 0
6758
#endif
6859

60+
VS_VERSION_INFO VERSIONINFO
61+
FILEVERSION TRINITY_FILEVERSION
62+
PRODUCTVERSION TRINITY_PRODUCTVERSION
63+
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
64+
FILEFLAGS (VS_FF_PRERELEASE | TRINITY_DEBUG)
6965
FILEOS VOS_NT_WINDOWS32
7066
FILETYPE VFT_APP
7167

@@ -74,14 +70,14 @@ BEGIN
7470
BEGIN
7571
BLOCK "080004b0"
7672
BEGIN
77-
VALUE "CompanyName", VER_COMPANYNAME_STR
73+
VALUE "CompanyName", TRINITY_COMPANYNAME_STR
7874
VALUE "FileDescription", "TrinityCore World Server Daemon"
79-
VALUE "FileVersion", VER_FILEVERSION_STR
75+
VALUE "FileVersion", TRINITY_FILEVERSION_STR
8076
VALUE "InternalName", "worldserver"
81-
VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
77+
VALUE "LegalCopyright", TRINITY_LEGALCOPYRIGHT_STR
8278
VALUE "OriginalFilename", "worldserver.exe"
8379
VALUE "ProductName", "TrinityCore World Server"
84-
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
80+
VALUE "ProductVersion", TRINITY_PRODUCTVERSION_STR
8581
END
8682
END
8783

0 commit comments

Comments
 (0)