summaryrefslogtreecommitdiff
path: root/xmake/plugins/project/make/makefile.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2025-10-30 17:48:35 +0800
committerGitHub <[email protected]>2025-10-30 17:48:35 +0800
commitfe201a2122485acc09e5c5bda75cdb14a7d4d50e (patch)
treefe8a6eabbec8412f135b00fe3b7c3e1ec12d21ad /xmake/plugins/project/make/makefile.lua
parentca24c32ea55d64c99d8cb911e03a02272b9350c4 (diff)
parent1a6b82357bb1ba437984fc46c77aa812873a169c (diff)
Merge pull request #6974 from xmake-io/progress
Support for multi-row refresh progress output
Diffstat (limited to 'xmake/plugins/project/make/makefile.lua')
-rw-r--r--xmake/plugins/project/make/makefile.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/plugins/project/make/makefile.lua b/xmake/plugins/project/make/makefile.lua
index 7e818164c..3128a1c96 100644
--- a/xmake/plugins/project/make/makefile.lua
+++ b/xmake/plugins/project/make/makefile.lua
@@ -267,8 +267,9 @@ function _get_command_string(cmd, outputdir)
return _get_cmd_cd(_get_relative_unix_path(cmd.dir, outputdir))
elseif kind == "mkdir" then
return _get_cmd_mkdir(_get_relative_unix_path(cmd.dir, outputdir))
- elseif kind == "show" then
- return _get_cmd_echo(cmd.showtext)
+ elseif kind == "show" or kind == "show_progress" then
+ local text = string.format(cmd.format, table.unpack(cmd.argv))
+ return _get_cmd_echo(text)
end
end