improve to show progress

1 files changed, 3 insertions, 11 deletions

diff --git a/xmake/rules/utils/merge_object/xmake.lua b/xmake/rules/utils/merge_object/xmake.lua
index 74cc5ac18..a826ddf36 100644
--- a/xmake/rules/utils/merge_object/xmake.lua
+++ b/xmake/rules/utils/merge_object/xmake.lua
@@ -31,6 +31,7 @@ rule("utils.merge.object")
         import("core.base.option")
         import("core.theme.theme")
         import("core.project.depend")
+        import("private.utils.progress")
 
         -- get object file
         local objectfile = target:objectfile(sourcefile_obj)
@@ -48,19 +49,10 @@ rule("utils.merge.object")
         end
 
         -- trace progress info
-        cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
-        if option.get("verbose") then
-            cprint("${dim color.build.object}inserting.$(mode) %s", sourcefile_obj)
-            print("copying %s to %s", sourcefile_obj, objectfile)
-        else
-            cprint("${color.build.object}inserting.$(mode) %s", sourcefile_obj)
-        end
-
-        -- flush io buffer to update progress info
-        io.flush()
+        progress.show(opt.progress, "${color.build.object}inserting.$(mode) %s", sourcefile_obj)
 
         -- insert this object file
-        os.cp(sourcefile_obj, objectfile)
+        os.vcp(sourcefile_obj, objectfile)
 
         -- update files to the dependent file
         dependinfo.files = {}