From 0cc3d883e11daf6e2da1fd938c15a6cd060013bc Mon Sep 17 00:00:00 2001 From: StormBytePP Date: Sun, 16 Aug 2015 23:08:01 +0200 Subject: Core/Build: Renamed Revision.h to GitRevision.h to avoid compile failure when old revision.h file is present --- src/server/shared/GitRevision.cpp | 68 ++++++++++++++++++++++++ src/server/shared/GitRevision.h | 38 +++++++++++++ src/server/shared/PrecompiledHeaders/sharedPCH.h | 2 +- src/server/shared/Revision.cpp | 68 ------------------------ src/server/shared/Revision.h | 38 ------------- 5 files changed, 107 insertions(+), 107 deletions(-) create mode 100644 src/server/shared/GitRevision.cpp create mode 100644 src/server/shared/GitRevision.h delete mode 100644 src/server/shared/Revision.cpp delete mode 100644 src/server/shared/Revision.h (limited to 'src/server/shared') diff --git a/src/server/shared/GitRevision.cpp b/src/server/shared/GitRevision.cpp new file mode 100644 index 00000000000..0986e13b68f --- /dev/null +++ b/src/server/shared/GitRevision.cpp @@ -0,0 +1,68 @@ +#include "GitRevision.h" +#include "CompilerDefs.h" +#include "revision_data.h" + +char const* GitRevision::GetHash() +{ + return _HASH; +} + +char const* GitRevision::GetDate() +{ + return _DATE; +} + +char const* GitRevision::GetBranch() +{ + return _BRANCH; +} + +char const* GitRevision::GetSourceDirectory() +{ + return _SOURCE_DIRECTORY; +} + +char const* GitRevision::GetMySQLExecutable() +{ + return _MYSQL_EXECUTABLE; +} + +char const* GitRevision::GetFullDatabase() +{ + return _FULL_DATABASE; +} + +#define _PACKAGENAME "TrinityCore" + +char const* GitRevision::GetFullVersion() +{ +#if PLATFORM == PLATFORM_WINDOWS +# ifdef _WIN64 + return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, " _BUILD_DIRECTIVE ")"; +# else + return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win32, " _BUILD_DIRECTIVE ")"; +# endif +#else + return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Unix, " _BUILD_DIRECTIVE ")"; +#endif +} + +char const* GitRevision::GetCompanyNameStr() +{ + return VER_COMPANYNAME_STR; +} + +char const* GitRevision::GetLegalCopyrightStr() +{ + return VER_LEGALCOPYRIGHT_STR; +} + +char const* GitRevision::GetFileVersionStr() +{ + return VER_FILEVERSION_STR; +} + +char const* GitRevision::GetProductVersionStr() +{ + return VER_PRODUCTVERSION_STR; +} diff --git a/src/server/shared/GitRevision.h b/src/server/shared/GitRevision.h new file mode 100644 index 00000000000..ce941170083 --- /dev/null +++ b/src/server/shared/GitRevision.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2008-2015 TrinityCore + * + * 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, see . + */ + +#ifndef __GITREVISION_H__ +#define __GITREVISION_H__ + +#include + +namespace GitRevision +{ + char const* GetHash(); + char const* GetDate(); + char const* GetBranch(); + char const* GetSourceDirectory(); + char const* GetMySQLExecutable(); + char const* GetFullDatabase(); + char const* GetFullVersion(); + char const* GetCompanyNameStr(); + char const* GetLegalCopyrightStr(); + char const* GetFileVersionStr(); + char const* GetProductVersionStr(); +} + +#endif diff --git a/src/server/shared/PrecompiledHeaders/sharedPCH.h b/src/server/shared/PrecompiledHeaders/sharedPCH.h index c09b24e6fd9..f864674d5ad 100644 --- a/src/server/shared/PrecompiledHeaders/sharedPCH.h +++ b/src/server/shared/PrecompiledHeaders/sharedPCH.h @@ -1,4 +1,4 @@ //add here most rarely modified headers to speed up debug build compilation #include "TypeList.h" -#include "Revision.h" +#include "GitRevision.h" diff --git a/src/server/shared/Revision.cpp b/src/server/shared/Revision.cpp deleted file mode 100644 index 22afb866165..00000000000 --- a/src/server/shared/Revision.cpp +++ /dev/null @@ -1,68 +0,0 @@ -#include "Revision.h" -#include "CompilerDefs.h" -#include "revision_data.h" - -char const* Revision::GetHash() -{ - return _HASH; -} - -char const* Revision::GetDate() -{ - return _DATE; -} - -char const* Revision::GetBranch() -{ - return _BRANCH; -} - -char const* Revision::GetSourceDirectory() -{ - return _SOURCE_DIRECTORY; -} - -char const* Revision::GetMySQLExecutable() -{ - return _MYSQL_EXECUTABLE; -} - -char const* Revision::GetFullDatabase() -{ - return _FULL_DATABASE; -} - -#define _PACKAGENAME "TrinityCore" - -char const* Revision::GetFullVersion() -{ -#if PLATFORM == PLATFORM_WINDOWS -# ifdef _WIN64 - return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win64, " _BUILD_DIRECTIVE ")"; -# else - return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Win32, " _BUILD_DIRECTIVE ")"; -# endif -#else - return _PACKAGENAME " rev. " VER_PRODUCTVERSION_STR " (Unix, " _BUILD_DIRECTIVE ")"; -#endif -} - -char const* GetCompanyNameStr() -{ - return VER_COMPANYNAME_STR; -} - -char const* GetLegalCopyrightStr() -{ - return VER_LEGALCOPYRIGHT_STR; -} - -char const* GetFileVersionStr() -{ - return VER_FILEVERSION_STR; -} - -char const* GetProductVersionStr() -{ - return VER_PRODUCTVERSION_STR; -} diff --git a/src/server/shared/Revision.h b/src/server/shared/Revision.h deleted file mode 100644 index f3a04540d76..00000000000 --- a/src/server/shared/Revision.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008-2015 TrinityCore - * - * 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, see . - */ - -#ifndef __REVISION_H__ -#define __REVISION_H__ - -#include - -namespace Revision -{ - char const* GetHash(); - char const* GetDate(); - char const* GetBranch(); - char const* GetSourceDirectory(); - char const* GetMySQLExecutable(); - char const* GetFullDatabase(); - char const* GetFullVersion(); - char const* GetCompanyNameStr(); - char const* GetLegalCopyrightStr(); - char const* GetFileVersionStr(); - char const* GetProductVersionStr(); -} - -#endif -- cgit v1.2.3