mo2/mob
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/mob.git synced 2026-07-27 14:07:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

moved the guts of process_runner and op::run() into process

Browse Source 
separate env class
added pyqt
This commit is contained in:
isanae
2020-05-02 02:41:34 -04:00
parent b8cd71b5af
commit 0f5759c4ba
21 changed files with 1430 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tasks/python.cpp
+12 -5
View File
@@ -75,15 +75,16 @@ void python::do_build_and_install()
{
const auto bat = source_path() / "python.bat";
run_tool(process_runner(arch::dont_care, bat, cmd::stdout_is_verbose)
.name("package python")
run_tool(process_runner(process()
.binary(bat)
.flags(process::stdout_is_verbose)
.arg(fs::path("PC/layout"))
.arg("--source", source_path())
.arg("--build", build_path())
.arg("--temp", (build_path() / "pythoncore_temp"))
.arg("--copy", (build_path() / "pythoncore"))
.arg("--preset-embed")
.cwd(source_path()));
.cwd(source_path())));
op::touch(build_path() / "_mob_packaged");
}
@@ -115,8 +116,9 @@ void python::install_pip()
{
debug("installing pip");
run_tool(process_runner(arch::dont_care, python_exe(), cmd::noflags)
.arg("-m", "ensurepip"));
run_tool(process_runner(process()
.binary(python_exe())
.arg("-m", "ensurepip")));
}
fs::path python::build_path()
@@ -139,6 +141,11 @@ fs::path python::scripts_path()
return source_path() / "Scripts";
}
fs::path python::site_packages_path()
{
return source_path() / "Lib" / "site-packages";
}
fs::path python::solution_file()
{
return source_path() / "PCBuild" / "pcbuild.sln";