summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-09-22 22:40:44 +0800
committerruki <[email protected]>2017-09-22 10:04:24 +0800
commit613bf58d8b66c0f8d8b61389241d7cb0849ebcfe (patch)
treed130b1970b18ec8b947679aca6e9bfa32252c98b
parent672d5ae9a9fef8a0dc5de4ed0643e8594e1cb85c (diff)
improve to install package for xmake.lua
-rw-r--r--xmake/actions/require/action/install.lua11
1 files changed, 3 insertions, 8 deletions
diff --git a/xmake/actions/require/action/install.lua b/xmake/actions/require/action/install.lua
index a1c6dc343..583276ffe 100644
--- a/xmake/actions/require/action/install.lua
+++ b/xmake/actions/require/action/install.lua
@@ -32,10 +32,7 @@ import("test")
function _install_for_xmakefile(package)
-- package to install directory
- os.vrun("xmake p -o %s", package:installdir())
-
- -- ok
- return true
+ os.vrunv("xmake", {"p", "-o", package:installdir()})
end
-- install for generic
@@ -137,9 +134,6 @@ option("%s")
-- exit file
file:close()
end
-
- -- ok
- return true
end
-- on install the given package
@@ -166,7 +160,8 @@ function _on_install_package(package)
-- attempt to install it if file exists
local files = os.files(installscript[1])
if #files > 0 then
- return installscript[2](package)
+ installscript[2](package)
+ return true
end
end,