summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-10-26 23:12:00 +0800
committerruki <[email protected]>2020-10-26 23:12:00 +0800
commiteeafece87f73eee741d28e9e9483f90d6f11488e (patch)
treebd0b23a8b6cbd828df5072258aecefadbc8987d7
parentfa86786f0680ca5c5c49a8160163fe41fd9fbec5 (diff)
improve fetch/xrepo
-rw-r--r--xmake/modules/private/xrepo/action/fetch.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/xmake/modules/private/xrepo/action/fetch.lua b/xmake/modules/private/xrepo/action/fetch.lua
index d8d524de2..946a43430 100644
--- a/xmake/modules/private/xrepo/action/fetch.lua
+++ b/xmake/modules/private/xrepo/action/fetch.lua
@@ -36,7 +36,6 @@ function menu_options()
{'a', "arch", "kv", nil, "Set the given architecture." },
{'m', "mode", "kv", nil, "Set the given mode.",
values = {"release", "debug"} },
- {nil, "system", "k", nil, "Attempt to fetch system packages." },
{nil, "configs", "kv", nil, "Set the given extra package configs.",
"e.g.",
" - xrepo fetch --configs=\"vs_runtime=MD\" zlib",
@@ -52,7 +51,10 @@ function menu_options()
" - xrepo fetch -p iphoneos -a arm64 \"zlib >=1.2.0\"",
" - xrepo fetch -p android -m debug \"pcre2 10.x\"",
" - xrepo fetch -p mingw -k shared zlib",
- " - xrepo fetch conan::zlib/1.2.11 vcpkg::zlib"}
+ " - xrepo fetch conan::zlib/1.2.11 vcpkg::zlib",
+ " - xrepo fetch brew::zlib",
+ " - xrepo fetch system::zlib (from pkgconfig, brew, /usr/lib ..)",
+ " - xrepo fetch pkgconfig::zlib"}
}
-- show menu options
@@ -136,7 +138,7 @@ function _fetch_packages(packages)
if #fetchmodes > 0 then
table.insert(require_argv, "--fetch_modes=" .. table.concat(fetchmodes, ','))
end
- local extra = {system = option.get("system") and true or false}
+ local extra = {system = false}
if mode == "debug" then
extra.debug = true
end