diff options
| author | Chaz Brown <iamparadox@netscape.net> | 2009-08-30 01:29:40 -0400 |
|---|---|---|
| committer | Chaz Brown <iamparadox@netscape.net> | 2009-08-30 01:29:40 -0400 |
| commit | 2421d01f7025e143df0dd8926ed68630821b4753 (patch) | |
| tree | 7f2df6d266d2bcfafdc38ecfb13a37b31451d4d1 | |
| parent | d802cd3811c77a1b0bef95a65fdfc4872ff557a8 (diff) | |
genrevision now generates revision and hash number #defines that are used in trinityrealm.rc and trinitycore.rc to correctly set the fileversion numbers in windows executables, major/minor numbers will be updated later.
--HG--
branch : trunk
| -rw-r--r-- | src/tools/genrevision/genrevision.cpp | 13 | ||||
| -rw-r--r-- | src/trinitycore/TrinityCore.rc | 11 | ||||
| -rw-r--r-- | src/trinityrealm/TrinityRealm.rc | 11 |
3 files changed, 25 insertions, 10 deletions
diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index be5a38e1be8..7c5a2416ae5 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -302,7 +302,20 @@ std::string generateHeader(char const* rev_str, char const* date_str, char const newData << " #define _HASH \"" << hash_str << "\"" << std::endl; newData << " #define _REVISION_DATE \"" << date_str << "\"" << std::endl; newData << " #define _REVISION_TIME \"" << time_str << "\""<< std::endl; + if (!strcmp(rev_str,"Archive") || !strcmp(rev_str,"*")) + { + newData << " #define FILEVER 0,0,0,0"<< std::endl; + newData << " #define PRODUCTVER 0,0,0,0"<< std::endl; + } + else + { + newData << " #define FILEVER 0,0," << rev_str << ",0"<< std::endl; + newData << " #define PRODUCTVER 0,0," << rev_str << ",0"<< std::endl; + } + newData << " #define STRFILEVER \"0, 0, " << rev_str << " ," << hash_str << "\""<< std::endl; + newData << " #define STRPRODUCTVER \"0, 0, " << rev_str << " ," << hash_str << "\""<< std::endl; newData << "#endif // __REVISION_H__" << std::endl; + return newData.str(); } diff --git a/src/trinitycore/TrinityCore.rc b/src/trinitycore/TrinityCore.rc index 0acad1e4ba2..151185f3cec 100644 --- a/src/trinitycore/TrinityCore.rc +++ b/src/trinitycore/TrinityCore.rc @@ -17,6 +17,7 @@ */ #include "resource.h" +#include "../shared/revision.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -52,8 +53,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,6743,685 - PRODUCTVERSION 0,4,6743,685 + FILEVERSION FILEVER + PRODUCTVERSION PRODUCTVER FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +70,12 @@ BEGIN BLOCK "080004b0" BEGIN VALUE "FileDescription", "TrinityCore" - VALUE "FileVersion", "0, 4, 6743, 685" + VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TrinityCore" - VALUE "LegalCopyright", "Copyright (C) 2008" + VALUE "LegalCopyright", "Copyright (C) 2008-2009" VALUE "OriginalFilename", "TrinityCore.exe" VALUE "ProductName", "TrinityCore" - VALUE "ProductVersion", "0, 4, 6743, 685" + VALUE "ProductVersion", STRPRODUCTVER END END BLOCK "VarFileInfo" diff --git a/src/trinityrealm/TrinityRealm.rc b/src/trinityrealm/TrinityRealm.rc index bcd37f240c5..dfc548305fd 100644 --- a/src/trinityrealm/TrinityRealm.rc +++ b/src/trinityrealm/TrinityRealm.rc @@ -17,6 +17,7 @@ */ #include "resource.h" +#include "../shared/revision.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -52,8 +53,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,6743,685 - PRODUCTVERSION 0,4,6743,685 + FILEVERSION FILEVER + PRODUCTVERSION PRODUCTVER FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +70,12 @@ BEGIN BLOCK "080004b0" BEGIN VALUE "FileDescription", "TrinityRealm" - VALUE "FileVersion", "0, 4, 6743, 685" + VALUE "FileVersion", STRFILEVER VALUE "InternalName", "TrinityRealm" - VALUE "LegalCopyright", "Copyright (C) 2008" + VALUE "LegalCopyright", "Copyright (C) 2008-2009" VALUE "OriginalFilename", "TrinityRealm.exe" VALUE "ProductName", "TrinityRealm" - VALUE "ProductVersion", "0, 4, 6743, 685" + VALUE "ProductVersion", STRPRODUCTVER END END BLOCK "VarFileInfo" |