improve progress info

xmake-io · Jan 6, 2025 · 1ce4271 · 1ce4271
1 parent 1aa63e9
commit 1ce4271
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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