diff options
| author | ruki <[email protected]> | 2025-01-07 00:01:19 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-01-06 18:12:53 +0800 |
| commit | 1ce4271e8b44e6bc3cd7db44be6b52ac538e5176 (patch) | |
| tree | f8c89c67a6225ea82aba22e98add4d61d5f26e28 | |
| parent | 1aa63e9481937d7c66d33741699bec4bfb7b6fba (diff) | |
improve progress info
| -rw-r--r-- | xmake/actions/build/kinds/binary.lua | 8 | ||||
| -rw-r--r-- | xmake/actions/build/kinds/shared.lua | 8 | ||||
| -rw-r--r-- | xmake/actions/build/kinds/static.lua | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua index 3acc3bcd9..3f67232f7 100644 --- a/xmake/actions/build/kinds/binary.lua +++ b/xmake/actions/build/kinds/binary.lua @@ -39,9 +39,13 @@ function _do_link_target(target, opt) local dryrun = option.get("dry-run") local depvalues = {linkinst:program(), linkflags} depend.on_changed(function () - local targetfile = target:targetfile() - progress.show(opt.progress, "${color.build.target}linking.$(mode) %s", path.filename(targetfile)) + local filename = target:filename() + if target:namespace() then + filename = target:namespace() .. "::" .. filename + end + progress.show(opt.progress, "${color.build.target}linking.$(mode) %s", filename) + local targetfile = target:targetfile() local objectfiles = target:objectfiles() local verbose = option.get("verbose") if verbose then diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua index 1b7065766..cc7aa010c 100644 --- a/xmake/actions/build/kinds/shared.lua +++ b/xmake/actions/build/kinds/shared.lua @@ -39,9 +39,13 @@ function _do_link_target(target, opt) local dryrun = option.get("dry-run") local depvalues = {linkinst:program(), linkflags} depend.on_changed(function () - local targetfile = target:targetfile() - progress.show(opt.progress, "${color.build.target}linking.$(mode) %s", path.filename(targetfile)) + local filename = target:filename() + if target:namespace() then + filename = target:namespace() .. "::" .. filename + end + progress.show(opt.progress, "${color.build.target}linking.$(mode) %s", filename) + local targetfile = target:targetfile() local objectfiles = target:objectfiles() local verbose = option.get("verbose") if verbose then diff --git a/xmake/actions/build/kinds/static.lua b/xmake/actions/build/kinds/static.lua index 7a1161849..abb6c5f72 100644 --- a/xmake/actions/build/kinds/static.lua +++ b/xmake/actions/build/kinds/static.lua @@ -39,9 +39,13 @@ function _do_link_target(target, opt) local dryrun = option.get("dry-run") local depvalues = {linkinst:program(), linkflags} depend.on_changed(function () - local targetfile = target:targetfile() - progress.show(opt.progress, "${color.build.target}archiving.$(mode) %s", path.filename(targetfile)) + local filename = target:filename() + if target:namespace() then + filename = target:namespace() .. "::" .. filename + end + progress.show(opt.progress, "${color.build.target}archiving.$(mode) %s", filename) + local targetfile = target:targetfile() local objectfiles = target:objectfiles() local verbose = option.get("verbose") if verbose then |