added --no-warn-script-location when installing pip

added basic_games
handle multiple vs installs
for `release official`, don't override the enabled state of all tasks, just enable translations and installer; this allows for disabling tasks that are not in the current branch
This commit is contained in:
isanae
2020-08-12 05:00:20 -04:00
parent 10c16b81a5
commit db5b55af04
5 changed files with 37 additions and 6 deletions
+15 -5
View File
@@ -862,6 +862,21 @@ clipp::group release_command::do_group()
);
}
void release_command::convert_cl_to_conf()
{
command::convert_cl_to_conf();
if (mode_ == modes::official)
{
common.options.push_back("translations:task/enabled=true");
common.options.push_back("installer:task/enabled=true");
common.options.push_back("transifex/force=true");
common.options.push_back("transifex/configure=true");
common.options.push_back("transifex/pull=true");
}
}
int release_command::do_run()
{
switch (mode_)
@@ -927,11 +942,6 @@ int release_command::do_official()
}
}
conf::set_for_task("_override", "task", "enabled", "true");
conf::set_global("transifex", "force", "true");
conf::set_global("transifex", "configure", "true");
conf::set_global("transifex", "pull", "true");
run_all_tasks();
build_command::terminate_msbuild();
+1
View File
@@ -181,6 +181,7 @@ protected:
clipp::group do_group() override;
int do_run() override;
std::string do_doc() override;
void convert_cl_to_conf() override;
private:
enum class modes
+18 -1
View File
@@ -636,7 +636,24 @@ fs::path find_vs()
if (p.exit_code() != 0)
gcx().bail_out(context::conf, "vswhere failed");
fs::path path = trim_copy(p.stdout_string());
const fs::path path = trim_copy(p.stdout_string());
const auto lines = split(path_to_utf8(path), "\r\n");
if (lines.empty())
{
gcx().bail_out(context::conf, "vswhere didn't output anything");
}
else if (lines.size() > 1)
{
gcx().error(context::conf, "vswhere returned multiple installations:");
for (auto&& line : lines)
gcx().error(context::conf, " - {}", line);
gcx().bail_out(context::conf,
"specify the `vs` path in the `[paths]` section of the INI, or pass "
"-s paths/vs=PATH` to pick an installation");
}
if (!fs::exists(path))
{
+1
View File
@@ -172,6 +172,7 @@ void add_tasks()
add_task<parallel_tasks>(true)
.add_task<mo>({"modorganizer-tool_configurator", "pycfg"})
.add_task<mo>("modorganizer-fnistool")
.add_task<mo>("modorganizer-basic_games")
.add_task<mo>({
"modorganizer-script_extender_plugin_checker",
"diagnose-script_extender_plugin_checker",
+2
View File
@@ -243,6 +243,7 @@ void python::install_pip()
.binary(python_exe())
.arg("-m pip")
.arg("install")
.arg("--no-warn-script-location")
.arg("--upgrade pip")));
// ssl errors while downloading through python without certifi
@@ -250,6 +251,7 @@ void python::install_pip()
.binary(python_exe())
.arg("-m pip")
.arg("install")
.arg("--no-warn-script-location")
.arg("certifi")));
}