celeron55
/
buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

boot/autodetect: Don't autodetect paths that are explicitly set in configuration

master
Perttu Ahola 2014-10-31 11:45:39 +02:00
parent 53f0508383
commit 42f400172a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/boot/autodetect.cpp
View File

@ -135,7 +135,7 @@ static void set_default_subpaths(core::Config &config, const PathDefinition *def
// If not found, returns empty string and logs issues
static ss_ find_root(const sv_<ss_> &roots, const PathDefinition *defs,
const char *description)
const char *description, const core::Config &base_config)
{
log_d(MODULE, "Searching root: %s", description);
// Try to find root
@ -144,6 +144,7 @@ static ss_ find_root(const sv_<ss_> &roots, const PathDefinition *defs,
log_d(MODULE, "Checking root [%s]", cs(root));
core::Config config;
set_default_subpaths(config, defs, root);
config.values = base_config.values;
if(check_paths(config, defs, false)){
log_d(MODULE, "-> Root [%s] matches (%s)", cs(root), description);
return root;
@ -156,6 +157,7 @@ static ss_ find_root(const sv_<ss_> &roots, const PathDefinition *defs,
log_e(MODULE, "Checked [%s]:", cs(root));
core::Config config;
set_default_subpaths(config, defs, root);
config.values = base_config.values;
check_paths(config, defs, true);
}
return "";
@ -164,7 +166,7 @@ static ss_ find_root(const sv_<ss_> &roots, const PathDefinition *defs,
static bool detect_paths(core::Config &config, const sv_<ss_> &roots,
const PathDefinition *defs, const char *description)
{
ss_ root = find_root(roots, defs, description);
ss_ root = find_root(roots, defs, description, config);
if(root.empty()){
log_w(MODULE, "Could not determine %s path (tried %s)",
description, cs(roots));

2
src/server/config.cpp
View File

@ -15,8 +15,8 @@ Config::Config()
set_default("interface_path", "");
set_default("share_path", "");
set_default("urho3d_path", "");
set_default("compiler_command", "");
set_default("compiler_command", "c++");
set_default("skip_compiling_modules", json::object());
}