summaryrefslogtreecommitdiff
path: root/xmake/modules/private/action/require/impl
diff options
context:
space:
mode:
authorruki <[email protected]>2021-05-12 06:15:20 +0800
committerGitHub <[email protected]>2021-05-12 06:15:20 +0800
commit0c8ee70f2cf09156d728decc44a28c756e1beded (patch)
treea0f9258a2f79b6f9960c6eb07365520bf3e92fa9 /xmake/modules/private/action/require/impl
parent29cf1854c5dd3ceedc4d89aa35ac6b100fd56571 (diff)
parent78778eb35d7b5d9c6fac432d4ed4a67dc4cbd5d3 (diff)
Merge pull request #1404 from xmake-io/jobenvs
improve envs
Diffstat (limited to 'xmake/modules/private/action/require/impl')
-rw-r--r--xmake/modules/private/action/require/impl/install_packages.lua7
-rw-r--r--xmake/modules/private/action/require/impl/package.lua1
2 files changed, 5 insertions, 3 deletions
diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua
index 2b482b0e9..0adea1fc9 100644
--- a/xmake/modules/private/action/require/impl/install_packages.lua
+++ b/xmake/modules/private/action/require/impl/install_packages.lua
@@ -238,7 +238,10 @@ function _install_packages(packages_install, packages_download, installdeps)
packages_installing[index] = nil
packages_downloading[index] = nil
- end, {total = #packages_install, comax = (option.get("verbose") or option.get("diagnosis")) and 1 or 4, on_timer = function (running_jobs_indices)
+ end, {total = #packages_install,
+ comax = (option.get("verbose") or option.get("diagnosis")) and 1 or 4,
+ isolate = true,
+ on_timer = function (running_jobs_indices)
-- do not print progress info if be verbose
if option.get("verbose") or not show_wait then
@@ -385,7 +388,7 @@ function main(requires, opt)
instance:fetch()
os.setenvs(oldenvs)
end
- end, {total = #packages})
+ end, {total = #packages, isolate = true})
-- register all required root packages to local cache
register_packages(packages)
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 8b29a83d7..598acd251 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -22,7 +22,6 @@
import("core.base.semver")
import("core.base.option")
import("core.base.global")
-import("private.async.runjobs")
import("private.utils.progress")
import("core.cache.memcache")
import("core.project.project")