diff options
| author | ruki <[email protected]> | 2025-10-30 17:48:35 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-10-30 17:48:35 +0800 |
| commit | fe201a2122485acc09e5c5bda75cdb14a7d4d50e (patch) | |
| tree | fe8a6eabbec8412f135b00fe3b7c3e1ec12d21ad /xmake/plugins | |
| parent | ca24c32ea55d64c99d8cb911e03a02272b9350c4 (diff) | |
| parent | 1a6b82357bb1ba437984fc46c77aa812873a169c (diff) | |
Merge pull request #6974 from xmake-io/progress
Support for multi-row refresh progress output
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/project/cmake/cmakelists.lua | 5 | ||||
| -rw-r--r-- | xmake/plugins/project/make/makefile.lua | 5 | ||||
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua index a4d8361e1..167d4bb5f 100644 --- a/xmake/plugins/project/cmake/cmakelists.lua +++ b/xmake/plugins/project/cmake/cmakelists.lua @@ -1222,8 +1222,9 @@ function _get_command_string(cmd, outputdir) return string.format("cd %s", _get_relative_unix_path_to_cmake(cmd.dir, outputdir)) elseif kind == "mkdir" then return string.format("${CMAKE_COMMAND} -E make_directory %s", _get_relative_unix_path_to_cmake(cmd.dir, outputdir)) - elseif kind == "show" then - local text = colors.ignore(cmd.showtext) + elseif kind == "show" or kind == "show_progress" then + local text = string.format(cmd.format, table.unpack(cmd.argv)) + text = colors.ignore(text) -- we need to translate paths in text -- https://github.com/xmake-io/xmake/issues/6553 if is_host("windows") then 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 diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 823787ab1..bc31acbbe 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -118,8 +118,9 @@ function _get_command_string(cmd, vcxprojdir) elseif kind == "mkdir" then local dir = _translate_path(cmd.dir, vcxprojdir) return string.format("if not exist \"%s\" mkdir \"%s\"", dir, dir) - elseif kind == "show" then - return string.format("echo %s", colors.ignore(cmd.showtext)) + elseif kind == "show" or kind == "show_progress" then + local text = string.format(cmd.format, table.unpack(cmd.argv)) + return string.format("echo %s", colors.ignore(text)) end end |