diff options
| author | ruki <[email protected]> | 2021-10-09 11:58:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-10-09 11:58:10 +0800 |
| commit | a01e17a5049bdd02ddc2514bd47af74cf2ff802d (patch) | |
| tree | 83cea0cf9fa564bd0bbbddb35a366b64a404635e /xmake/modules/private | |
| parent | 59498b047190411a144f821a5cc40174faeaaa9a (diff) | |
move private.utils.progress to utils.progress
Diffstat (limited to 'xmake/modules/private')
5 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/private/action/build/object.lua b/xmake/modules/private/action/build/object.lua index 50397cda4..7a99de91e 100644 --- a/xmake/modules/private/action/build/object.lua +++ b/xmake/modules/private/action/build/object.lua @@ -25,7 +25,7 @@ import("core.tool.compiler") import("core.project.depend") import("private.tools.ccache") import("private.async.runjobs") -import("private.utils.progress") +import("utils.progress") -- do build file function _do_build_file(target, sourcefile, opt) diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua index c8bdefbb1..714b98461 100644 --- a/xmake/modules/private/action/require/impl/install_packages.lua +++ b/xmake/modules/private/action/require/impl/install_packages.lua @@ -25,7 +25,7 @@ import("core.base.scheduler") import("core.project.project") import("core.base.tty") import("private.async.runjobs") -import("private.utils.progress") +import("utils.progress") import("actions.install", {alias = "action_install"}) import("actions.download", {alias = "action_download"}) import("net.fasturl") diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index b048b7818..f00d796f6 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -23,7 +23,7 @@ import("core.base.semver") import("core.base.option") import("core.base.global") import("core.base.hashset") -import("private.utils.progress") +import("utils.progress") import("core.cache.memcache") import("core.project.project") import("core.project.config") diff --git a/xmake/modules/private/async/runjobs.lua b/xmake/modules/private/async/runjobs.lua index 0361399dc..a4ea2bc10 100644 --- a/xmake/modules/private/async/runjobs.lua +++ b/xmake/modules/private/async/runjobs.lua @@ -20,7 +20,7 @@ -- imports import("core.base.scheduler") -import("private.utils.progress") +import("utils.progress") -- print back characters function _print_backchars(backnum) @@ -37,7 +37,7 @@ end -- e.g. -- runjobs("test", function (index) print("hello") end, {total = 100, comax = 6, timeout = 1000, on_timer = function (running_jobs_indices) end}) -- runjobs("test", function () os.sleep(10000) end, { progress = true }) --- runjobs("test", function () os.sleep(10000) end, { progress = { chars = {'/','\'} } }) -- see module private.utils.progress +-- runjobs("test", function () os.sleep(10000) end, { progress = { chars = {'/','\'} } }) -- see module utils.progress -- -- local jobs = jobpool.new() -- local root = jobs:addjob("job/root", function (idx, total) diff --git a/xmake/modules/private/utils/batchcmds.lua b/xmake/modules/private/utils/batchcmds.lua index 946135a87..34dd5d583 100644 --- a/xmake/modules/private/utils/batchcmds.lua +++ b/xmake/modules/private/utils/batchcmds.lua @@ -28,7 +28,7 @@ import("core.theme.theme") import("core.tool.linker") import("core.tool.compiler") import("core.language.language") -import("private.utils.progress", {alias = "progress_utils"}) +import("utils.progress", {alias = "progress_utils"}) -- define module local batchcmds = batchcmds or object { _init = {"_TARGET", "_CMDS", "_DEPS", "_tip"}} |
