improve batchcmds:lua

3 files changed, 49 insertions, 13 deletions

diff --git a/xmake/modules/private/utils/batchcmds.lua b/xmake/modules/private/utils/batchcmds.lua
index 544c94c2e..268f34154 100644
--- a/xmake/modules/private/utils/batchcmds.lua
+++ b/xmake/modules/private/utils/batchcmds.lua
@@ -103,9 +103,7 @@ end
 -- run command: os.execv
 function _runcmd_execv(cmd, opt)
     if cmd.program then
-        if opt.dryrun then
-            print(os.args(table.join(cmd.program, cmd.argv)))
-        else
+        if not opt.dryrun then
             os.execv(cmd.program, cmd.argv, cmd.opt)
         end
     end
@@ -115,7 +113,7 @@ end
 function _runcmd_vexecv(cmd, opt)
     if cmd.program then
         if opt.dryrun then
-            print(os.args(table.join(cmd.program, cmd.argv)))
+            vprint(os.args(table.join(cmd.program, cmd.argv)))
         else
             os.vexecv(cmd.program, cmd.argv, cmd.opt)
         end
@@ -125,12 +123,30 @@ end
 -- run command: lua
 function _runcmd_lua(cmd, opt)
     if cmd.script then
-        if opt.dryrun then
-            print(os.args(table.join("xmake", "lua", cmd.script, cmd.argv)))
-        else
-            vprint(os.args(table.join("xmake", "lua", cmd.script, cmd.argv)))
+        if not opt.dryrun then
             local runopt = table.clone(cmd.opt) or {}
             runopt.arguments = cmd.argv
+            runopt.quiet = true
+            -- it will run in a separate native thread, which will not block other coroutine jobs
+            runopt.thread = true
+            run_script(cmd.script, runopt)
+        end
+    end
+end
+
+-- run command: vlua
+function _runcmd_vlua(cmd, opt)
+    if cmd.script then
+        vprint(os.args(table.join("xmake", "lua", cmd.script, cmd.argv)))
+        if not opt.dryrun then
+            local runopt = table.clone(cmd.opt) or {}
+            runopt.arguments = cmd.argv
+            if option.get("diagnosis") then
+                runopt.verbose = true
+                runopt.diagnosis = true
+            else
+                runopt.quiet = not option.get("verbose")
+            end
             -- it will run in a separate native thread, which will not block other coroutine jobs
             runopt.thread = true
             run_script(cmd.script, runopt)
@@ -232,6 +248,7 @@ function _runcmd(cmd, opt)
             execv        = _runcmd_execv,
             vexecv       = _runcmd_vexecv,
             lua          = _runcmd_lua,
+            vlua         = _runcmd_vlua,
             mkdir        = _runcmd_mkdir,
             rmdir        = _runcmd_rmdir,
             cd           = _runcmd_cd,
@@ -294,6 +311,11 @@ function batchcmds:lua(script, argv, opt)
     table.insert(self:cmds(), {kind = "lua", script = script, argv = argv, opt = opt})
 end
 
+-- add command: run lua script file, command or module
+function batchcmds:vlua(script, argv, opt)
+    table.insert(self:cmds(), {kind = "vlua", script = script, argv = argv, opt = opt})
+end
+
 -- add command: compiler.compile
 function batchcmds:compile(sourcefiles, objectfile, opt)
 
diff --git a/xmake/modules/utils/run_script.lua b/xmake/modules/utils/run_script.lua
index 0394ccb6e..de625119f 100644
--- a/xmake/modules/utils/run_script.lua
+++ b/xmake/modules/utils/run_script.lua
@@ -19,8 +19,9 @@
 --
 
 -- imports
-import("core.sandbox.module")
+import("core.base.option")
 import("core.base.thread")
+import("core.sandbox.module")
 
 -- print verbose log
 function _print_vlog(script_type, script_name, args, opt)
@@ -142,11 +143,25 @@ function _get_args(opt)
 end
 
 function _run(script, opt)
+    opt = opt or {}
+
+    if opt.quiet then
+        option.save()
+        option.set("quiet", true, {force = true})
+    end
+
+    local curdir = opt.curdir or os.workingdir()
+    local oldir = os.cd(curdir)
     if opt.command then
         _run_commanad(script, _get_args(opt), opt)
     else
         _run_script(script, _get_args(opt), opt)
     end
+    os.cd(oldir)
+
+    if opt.quiet then
+        option.restore()
+    end
 end
 
 function _run_in_thread(script, opt)
@@ -163,12 +178,11 @@ end
 --                     - deserialize deserialize arguments starts with given prefix
 --                     - arguments   the script arguments
 --                     - thread      run script in a new native thread
+--                     - quiet       enable quiet output
 --                     - verbose     enable verbose output
 --                     - diagnosis   enable diagnosis output
 function main(script, opt)
     opt = opt or {}
-    local curdir = opt.curdir or os.workingdir()
-    local oldir = os.cd(curdir)
     if opt.thread then
         local argv
         for _, arg in ipairs(opt.arguments) do
@@ -183,6 +197,7 @@ function main(script, opt)
             command = opt.command,
             deserialize = opt.deserialize,
             arguments = argv,
+            quiet = opt.quiet,
             verbose = opt.verbose,
             diagnosis = opt.diagnosis
         }
@@ -191,5 +206,4 @@ function main(script, opt)
     else
         _run(script, opt)
     end
-    os.cd(oldir)
 end
diff --git a/xmake/rules/utils/bin2c/xmake.lua b/xmake/rules/utils/bin2c/xmake.lua
index 5373d2093..082e8fb5b 100644
--- a/xmake/rules/utils/bin2c/xmake.lua
+++ b/xmake/rules/utils/bin2c/xmake.lua
@@ -48,7 +48,7 @@ rule("utils.bin2c")
         if nozeroend then
             table.insert(argv, "--nozeroend")
         end
-        batchcmds:lua("private.utils.bin2c", argv)
+        batchcmds:vlua("private.utils.bin2c", argv)
 
         -- add deps
         batchcmds:add_depfiles(sourcefile_bin)