improve tbox templates and package install scripts

1 files changed, 27 insertions, 2 deletions

diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua
index 300b3f5e1..6a5772e8f 100644
--- a/xmake/modules/package/tools/xmake.lua
+++ b/xmake/modules/package/tools/xmake.lua
@@ -34,6 +34,7 @@ function install(package, configs)
     for _, name in ipairs(names) do
         local value = get_config(name)
         if value ~= nil then
+            value = tostring(value)
             if value:find(" ", 1, true) then
                 value = '"' .. value .. '"'
             end
@@ -50,7 +51,31 @@ function install(package, configs)
         end
         table.insert(argv, "--" .. name .. "=" .. value)
     end
+    if option.get("verbose") then
+        table.insert(argv, "-v")
+    end
+    if option.get("backtrace") then
+        table.insert(argv, "--backtrace")
+    end
+    os.vrunv("xmake", argv)
+
+    -- do build
+    argv = {}
+    if option.get("verbose") then
+        table.insert(argv, "-v")
+    end
+    if option.get("backtrace") then
+        table.insert(argv, "--backtrace")
+    end
+    os.vrunv("xmake", argv)
+
+    -- do install
+    argv = {"install", "-y", "-o", package:installdir()}
+    if option.get("verbose") then
+        table.insert(argv, "-v")
+    end
+    if option.get("backtrace") then
+        table.insert(argv, "--backtrace")
+    end
     os.vrunv("xmake", argv)
-    os.vrun("xmake" .. (option.get("verbose") and " -v" or ""))
-    os.vrunv("xmake", {"install", "-o", package:installdir()})
 end