diff options
author | click <none@none> | 2010-08-14 21:28:00 +0200 |
---|---|---|
committer | click <none@none> | 2010-08-14 21:28:00 +0200 |
commit | 916c7f09f832aa3e3a9d4bd14abacc94ee13f0b3 (patch) | |
tree | 9da0fd742f4db3fb330586ac3007fda7ce1a0b5b /src | |
parent | 8d0a0584118ec7b6f763a8ebc059a8dfc1d5536e (diff) |
Buildsystem/Linux: Deprecate and remove use of FindTermcap.cmake - it was only used as a solution for older CentOS versions
Core/Genrevision: Move defines from SystemConfig.h file into into revision.h (might need a rename now?) and delete it.
This should remove the infamous "rebuild all of game plzkthx"-symptom when upgrading to newer revisions.
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/genrevision/genrevision.cpp | 55 | ||||
-rw-r--r-- | src/server/authserver/Main.cpp | 3 | ||||
-rw-r--r-- | src/server/game/Chat/Commands/Level0.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Chat/Commands/Level3.cpp | 1 | ||||
-rw-r--r-- | src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp | 3 | ||||
-rw-r--r-- | src/server/game/World/World.cpp | 3 | ||||
-rw-r--r-- | src/server/shared/Debugging/WheatyExceptionReport.cpp | 5 | ||||
-rw-r--r-- | src/server/shared/SystemConfig.h | 49 | ||||
-rw-r--r-- | src/server/worldserver/Master.cpp | 3 |
9 files changed, 54 insertions, 72 deletions
diff --git a/src/genrevision/genrevision.cpp b/src/genrevision/genrevision.cpp index 937810908ff..371262175d2 100644 --- a/src/genrevision/genrevision.cpp +++ b/src/genrevision/genrevision.cpp @@ -299,26 +299,56 @@ bool extractDataFromArchive(std::string filename, std::string path, bool url, Ra std::string generateHeader(char const* rev_str, char const* date_str, char const* time_str, char const* hash_str) { std::ostringstream newData; + newData << "/*" << std::endl; + newData << " * This is an autogenerated header - direct modifications to this file is NOT recommended." << std::endl; + newData << " * Any changes will be overwritten on next revision change or rebuild." << std::endl; + newData << " */" << std::endl; + newData << std::endl; newData << "#ifndef __REVISION_H__" << std::endl; newData << "#define __REVISION_H__" << std::endl; - newData << " #define _BUILD_DIRECTIVE \"" << build_directive << "\"" << std::endl; - newData << " #define _REVISION \"" << rev_str << "\"" << std::endl; - newData << " #define _HASH \"" << hash_str << "\"" << std::endl; - newData << " #define _REVISION_DATE \"" << date_str << "\"" << std::endl; - newData << " #define _REVISION_TIME \"" << time_str << "\""<< std::endl; + newData << std::endl; + newData << "#include \"Define.h\"" << std::endl; + newData << std::endl; + newData << "#define _PACKAGENAME \"TrinityCore\"" << std::endl; + newData << "#define _CODENAME \"LONG_COLD_WINTER\"" << std::endl; + newData << std::endl; + newData << "#if TRINITY_ENDIAN == TRINITY_BIGENDIAN" << std::endl; + newData << " #define _ENDIAN_STRING \"big-endian\"" << std::endl; + newData << "#else" << std::endl; + newData << " #define _ENDIAN_STRING \"little-endian\"" << std::endl; + newData << "#endif" << std::endl; + newData << std::endl; + newData << "#define _BUILD_DIRECTIVE \"" << build_directive << "\"" << std::endl; + newData << std::endl; + newData << "#define _REVISION \"" << rev_str << "\"" << std::endl; + newData << "#define _HASH \"" << hash_str << "\"" << std::endl; + newData << "#define _REVISION_DATE \"" << date_str << "\"" << std::endl; + newData << "#define _REVISION_TIME \"" << time_str << "\""<< std::endl; + newData << std::endl; + newData << "#if PLATFORM == PLATFORM_WINDOWS" << std::endl; + newData << " #ifdef _WIN64" << std::endl; + newData << " #define _FULLVERSION _PACKAGENAME \" Rev. " << rev_str << "/" << hash_str << " (" << build_directive << ") (Win64,\" _ENDIAN_STRING \")\"" << std::endl; + newData << " #else" << std::endl; + newData << " #define _FULLVERSION _PACKAGENAME \" Rev. " << rev_str << "/" << hash_str << " (" << build_directive << ") (Win32,\" _ENDIAN_STRING \")\"" << std::endl; + newData << " #endif" << std::endl; + newData << "#else" << std::endl; + newData << " #define _FULLVERSION _PACKAGENAME \" Rev. " << rev_str << "/" << hash_str << " (" << build_directive << ") (Unix,\" _ENDIAN_STRING \")\"" << std::endl; + newData << "#endif" << std::endl; + newData << 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; + 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 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; + newData << "#define STRFILEVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl; + newData << "#define STRPRODUCTVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl; + newData << std::endl; + newData << "#endif /* __REVISION_H__ */" << std::endl; return newData.str(); } @@ -507,4 +537,3 @@ int main(int argc, char **argv) return 0; } - diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 88a98cd6cdb..db597055d0b 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -22,13 +22,14 @@ /// @{ /// \file +#include "revision.h" + #include "Common.h" #include "Database/DatabaseEnv.h" #include "Database/PreparedStatements.h" #include "Configuration/Config.h" #include "Log.h" -#include "SystemConfig.h" #include "Util.h" #include "SignalHandler.h" #include "RealmList.h" diff --git a/src/server/game/Chat/Commands/Level0.cpp b/src/server/game/Chat/Commands/Level0.cpp index 6e4e969e017..d322af5e943 100644 --- a/src/server/game/Chat/Commands/Level0.cpp +++ b/src/server/game/Chat/Commands/Level0.cpp @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "revision.h" + #include "Common.h" #include "DatabaseEnv.h" #include "World.h" @@ -27,8 +29,6 @@ #include "ObjectAccessor.h" #include "Language.h" #include "AccountMgr.h" -#include "SystemConfig.h" -#include "revision.h" #include "Util.h" bool ChatHandler::HandleHelpCommand(const char* args) diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp index b1eb5aac6fa..ebb1b5d2130 100644 --- a/src/server/game/Chat/Commands/Level3.cpp +++ b/src/server/game/Chat/Commands/Level3.cpp @@ -44,7 +44,6 @@ #include "TargetedMovementGenerator.h" #include "SkillDiscovery.h" #include "SkillExtraItems.h" -#include "SystemConfig.h" #include "Config.h" #include "Util.h" #include "ItemEnchantmentMgr.h" diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index f25dd5824dc..af4e6506f3a 100644 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -18,10 +18,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "revision.h" + #include "Common.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "SystemConfig.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 0e5bd88fbb8..874694b0c8a 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -22,10 +22,11 @@ \ingroup world */ +#include "revision.h" + #include "Common.h" #include "DatabaseEnv.h" #include "Config.h" -#include "SystemConfig.h" #include "Log.h" #include "Opcodes.h" #include "WorldSession.h" diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp index 7a3eae0f408..d230a209d2c 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.cpp +++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp @@ -13,10 +13,9 @@ #include <stdio.h> #include <tchar.h> #define _NO_CVCONST_H +#include "revision.h" #include <dbghelp.h> #include "WheatyExceptionReport.h" -#include "SystemConfig.h" -#include "revision.h" #define CrashFolder _T("Crashes") #pragma comment(linker, "/DEFAULTLIB:dbghelp.lib") @@ -1038,4 +1037,4 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...) return retValue; } -#endif // _WIN32
\ No newline at end of file +#endif // _WIN32 diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h deleted file mode 100644 index e7ad68fe380..00000000000 --- a/src/server/shared/SystemConfig.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> - * - * Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/> - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -// THIS FILE IS DEPRECATED - -#ifndef TRINITY_SYSTEMCONFIG_H -#define TRINITY_SYSTEMCONFIG_H - -#include "Define.h" -#include "revision.h" - -#define _PACKAGENAME "TrinityCore " -#define _CODENAME "LONG_COLD_WINTER" - -#if TRINITY_ENDIAN == TRINITY_BIGENDIAN -# define _ENDIAN_STRING "big-endian" -#else -# define _ENDIAN_STRING "little-endian" -#endif - -#if PLATFORM == PLATFORM_WINDOWS -# ifdef _WIN64 -# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Win64," _ENDIAN_STRING ")" -# else -# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Win32," _ENDIAN_STRING ")" -# endif -#else -# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Unix," _ENDIAN_STRING ")" -#endif -#endif - diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index ce2f442fa8f..42d188895ac 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -24,8 +24,9 @@ #include <ace/Sig_Handler.h> +#include "revision.h" + #include "Common.h" -#include "SystemConfig.h" #include "SignalHandler.h" #include "World.h" #include "WorldRunnable.h" |