Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Core/Common: Add a generic config helper to access built-in overwrite…
…able paths. * Adds CMAKE_COMMAND and CMAKE_BINARY_DIR to revision_data.h * Move the source and mysql exe path handling out of the DBUpdater. * Make some Config methods const for correctness. * Remove C & CXX flags from revision_data.h (was unused and didn't capture all cxx vars) * Reorder the link order to prevent `ld` from ignoring the file * Ref #15671 (cherry picked from commit 719159e)
- Loading branch information
Showing
13 changed files
with
190 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright (C) 2008-2016 TrinityCore <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, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#include "BuiltInConfig.h" | ||
#include "Config.h" | ||
#include "GitRevision.h" | ||
|
||
template<typename Fn> | ||
static std::string GetStringWithDefaultValueFromFunction( | ||
std::string const& key, Fn getter) | ||
{ | ||
std::string const value = sConfigMgr->GetStringDefault(key, ""); | ||
return value.empty() ? getter() : value; | ||
} | ||
|
||
std::string BuiltInConfig::GetCMakeCommand() | ||
{ | ||
return GetStringWithDefaultValueFromFunction( | ||
"CMakeCommand", GitRevision::GetCMakeCommand); | ||
} | ||
|
||
std::string BuiltInConfig::GetBuildDirectory() | ||
{ | ||
return GetStringWithDefaultValueFromFunction( | ||
"BuildDirectory", GitRevision::GetBuildDirectory); | ||
} | ||
|
||
std::string BuiltInConfig::GetSourceDirectory() | ||
{ | ||
return GetStringWithDefaultValueFromFunction( | ||
"SourceDirectory", GitRevision::GetSourceDirectory); | ||
} | ||
|
||
std::string BuiltInConfig::GetMySQLExecutable() | ||
{ | ||
return GetStringWithDefaultValueFromFunction( | ||
"MySQLExecutable", GitRevision::GetMySQLExecutable); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* Copyright (C) 2008-2016 TrinityCore <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, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
#ifndef BUILT_IN_CONFIG_H | ||
#define BUILT_IN_CONFIG_H | ||
|
||
#include <string> | ||
|
||
/// Provides helper functions to access built-in values | ||
/// which can be overwritten in config | ||
namespace BuiltInConfig | ||
{ | ||
/// Returns the CMake command when any is specified in the config, | ||
/// returns the built-in path otherwise | ||
std::string GetCMakeCommand(); | ||
/// Returns the build directory path when any is specified in the config, | ||
/// returns the built-in one otherwise | ||
std::string GetBuildDirectory(); | ||
/// Returns the source directory path when any is specified in the config, | ||
/// returns the built-in one otherwise | ||
std::string GetSourceDirectory(); | ||
/// Returns the path to the mysql executable (`mysql`) when any is specified | ||
/// in the config, returns the built-in one otherwise | ||
std::string GetMySQLExecutable(); | ||
|
||
} // namespace BuiltInConfig | ||
|
||
#endif // BUILT_IN_CONFIG_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.