aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorclick <click@gonnamakeyou.com>2011-08-04 22:53:33 +0200
committerclick <click@gonnamakeyou.com>2011-08-04 22:53:33 +0200
commitd7715fa4b8d18d518c1247bcb77c0ef76e9e4b17 (patch)
treef83e80743b055e843cd968018a85c56374dd4708 /src
parent2056af63f01c177376fc6bebb41ce158cc6016b4 (diff)
Buildsystem/Windows: Add support for reading commithash and commitdate directly from the executable binaries.
To view this information, check the "Product Version" field in Properties on the respective daemon. + Fix worldserver/authserver .rc file layouts and content (now adheres to MS standards *sighs*) + Change .serv info output to show corename followed by the commit date and hash + Include showing the versionstring on worldserver startup completion (on Aokromes' request) Thanks to Paradox for bugging me enough about it and the initial pull-request.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/server/authserver/authserver.rc37
-rwxr-xr-xsrc/server/shared/SystemConfig.h8
-rwxr-xr-xsrc/server/worldserver/Master.cpp1
-rwxr-xr-xsrc/server/worldserver/worldserver.rc39
4 files changed, 49 insertions, 36 deletions
diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc
index f4e93642c5c..fde1be5061e 100755
--- a/src/server/authserver/authserver.rc
+++ b/src/server/authserver/authserver.rc
@@ -53,31 +53,36 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILEVER
- PRODUCTVERSION PRODUCTVER
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
+FILEVERSION VER_FILEVERSION
+PRODUCTVERSION VER_PRODUCTVERSION
+
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+
+#ifndef _DEBUG
+ FILEFLAGS 0
#else
- FILEFLAGS 0x0L
+ FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELASE|VER_DEBUG)
#endif
- FILEOS 0x0L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
+
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080004b0"
BEGIN
- VALUE "FileDescription", "authserver"
- VALUE "FileVersion", STRFILEVER
- VALUE "InternalName", "authserver"
- VALUE "LegalCopyright", "Copyright (C) 2008-2010"
- VALUE "OriginalFilename", "authserver.exe"
- VALUE "ProductName", "authserver"
- VALUE "ProductVersion", STRPRODUCTVER
+ VALUE "CompanyName", VER_COMPANYNAME_STR
+ VALUE "FileDescription", "TrinityCore Authentication Server Daemon"
+ VALUE "FileVersion", VER_FILEVERSION_STR
+ VALUE "InternalName", "authserver"
+ VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
+ VALUE "OriginalFilename", "authserver.exe"
+ VALUE "ProductName", "TrinityCore Authentication Server"
+ VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
+
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x800, 1200
diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h
index c15d3de2461..18acc739018 100755
--- a/src/server/shared/SystemConfig.h
+++ b/src/server/shared/SystemConfig.h
@@ -24,7 +24,7 @@
#include "Define.h"
#include "revision.h"
-#define _PACKAGENAME "TrinityCore "
+#define _PACKAGENAME "TrinityCore"
#if TRINITY_ENDIAN == TRINITY_BIGENDIAN
# define _ENDIAN_STRING "big-endian"
@@ -34,11 +34,11 @@
#if PLATFORM == PLATFORM_WINDOWS
# ifdef _WIN64
-# define _FULLVERSION _PACKAGENAME "Hash: " _HASH " (Win64, "_BUILD_DIRECTIVE " (" _ENDIAN_STRING "))"
+# define _FULLVERSION _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, "_BUILD_DIRECTIVE ")"
# else
-# define _FULLVERSION _PACKAGENAME "Hash: " _HASH " (Win32, " _BUILD_DIRECTIVE " (" _ENDIAN_STRING "))"
+# define _FULLVERSION _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win32, " _BUILD_DIRECTIVE ")"
# endif
#else
-# define _FULLVERSION _PACKAGENAME "Hash: " _HASH " (Unix, " _BUILD_DIRECTIVE " (" _ENDIAN_STRING "))"
+# define _FULLVERSION _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Unix, " _BUILD_DIRECTIVE ")"
#endif
#endif
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index cfb8a5a1aaa..c44ac1c9266 100755
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -275,6 +275,7 @@ int Master::Run()
// set server online (allow connecting now)
LoginDatabase.DirectPExecute("UPDATE realmlist SET color = color & ~%u, population = 0 WHERE id = '%u'", REALM_FLAG_INVALID, realmID);
+ sLog->outString("%s (worldserver-daemon) ready...", _FULLVERSION);
sWorldSocketMgr->Wait();
if (soap_thread)
diff --git a/src/server/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc
index afb16c9422c..8f260b60922 100755
--- a/src/server/worldserver/worldserver.rc
+++ b/src/server/worldserver/worldserver.rc
@@ -53,31 +53,38 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILEVER
- PRODUCTVERSION PRODUCTVER
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
+FILEVERSION VER_FILEVERSION
+PRODUCTVERSION VER_PRODUCTVERSION
+
+
+
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+
+#ifndef _DEBUG
+ FILEFLAGS 0
#else
- FILEFLAGS 0x0L
+ FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELASE|VER_DEBUG)
#endif
- FILEOS 0x0L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
+
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_APP
+
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "080004b0"
BEGIN
- VALUE "FileDescription", "worldserver"
- VALUE "FileVersion", STRFILEVER
- VALUE "InternalName", "worldserver"
- VALUE "LegalCopyright", "Copyright (C) 2008-2010"
- VALUE "OriginalFilename", "worldserver.exe"
- VALUE "ProductName", "worldserver"
- VALUE "ProductVersion", STRPRODUCTVER
+ VALUE "CompanyName", VER_COMPANYNAME_STR
+ VALUE "FileDescription", "TrinityCore World Server Daemon"
+ VALUE "FileVersion", VER_FILEVERSION_STR
+ VALUE "InternalName", "worldserver"
+ VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR
+ VALUE "OriginalFilename", "worldserver.exe"
+ VALUE "ProductName", "TrinityCore World Server"
+ VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
+
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x800, 1200