diff options
| author | Opportunity <[email protected]> | 2020-01-20 20:30:31 +0800 |
|---|---|---|
| committer | Opportunity <[email protected]> | 2020-01-20 22:21:47 +0800 |
| commit | 3364333877dc8a579f08b54099fda653948e07ab (patch) | |
| tree | 2c2d5b6dabd5937827f9ae0cbc511b8a2f16f5d4 | |
| parent | 5f96933d1ad672cc5b29df88a78b32ff4cdd3ebc (diff) | |
improve tab complete
| -rw-r--r-- | xmake/actions/config/xmake.lua | 72 | ||||
| -rw-r--r-- | xmake/actions/create/xmake.lua | 44 | ||||
| -rw-r--r-- | xmake/actions/global/xmake.lua | 13 | ||||
| -rw-r--r-- | xmake/actions/update/xmake.lua | 51 | ||||
| -rw-r--r-- | xmake/core/base/task.lua | 83 | ||||
| -rw-r--r-- | xmake/core/sandbox/modules/import/core/theme/theme.lua | 5 | ||||
| -rw-r--r-- | xmake/core/theme/theme.lua | 16 | ||||
| -rw-r--r-- | xmake/modules/private/utils/complete.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/lua/main.lua | 134 | ||||
| -rw-r--r-- | xmake/plugins/lua/xmake.lua | 101 | ||||
| -rw-r--r-- | xmake/plugins/macro/main.lua | 30 | ||||
| -rw-r--r-- | xmake/plugins/macro/xmake.lua | 20 | ||||
| -rwxr-xr-x | xmake/plugins/project/main.lua | 14 | ||||
| -rw-r--r-- | xmake/plugins/project/xmake.lua | 39 |
14 files changed, 415 insertions, 211 deletions
diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua index 6cb5b2247..3dd486c96 100644 --- a/xmake/actions/config/xmake.lua +++ b/xmake/actions/config/xmake.lua @@ -41,21 +41,20 @@ task("config") -- options , options = { - {'c', "clean", "k", nil, "Clean the cached configure and configure all again." } - , {nil, "menu", "k", nil, "Configure project with a menu-driven user interface." } - , {nil, "require", "kv", nil, "Require all dependent packages?", - " - y: force to enable", - " - n: disable" } + {'c', "clean", "k", nil , "Clean the cached configure and configure all again." } + , {nil, "menu", "k", nil , "Configure project with a menu-driven user interface." } + , {nil, "require", "kv", nil , "Require all dependent packages?", + " - y: force to enable", + " - n: disable" } , {category = "."} - , {'p', "plat", "kv", "$(host)", "Compile for the given platform." - , values = function () + , {'p', "plat", "kv", "$(host)" , "Compile for the given platform." + , values = function () return import("core.platform.platform").plats() - end } - , {'a', "arch", "kv", "auto", "Compile for the given architecture." - + end } + , {'a', "arch", "kv", "auto" , "Compile for the given architecture.", -- show the description of all architectures - , function () + function () -- import platform import("core.platform.platform") @@ -74,14 +73,49 @@ task("config") -- get it return description - end } - , {'m', "mode", "kv", "release", "Compile for the given mode." - , " - debug" - , " - release" - , " - ... (custom)" } - , {'k', "kind", "kv", "static", "Compile for the given target kind." - , values = {"static", "shared", "binary"} } - , {nil, "host", "kv", "$(host)", "The Current Host Environment." } + end + , values = function (completing, opt) + if not completing then return end + + -- import + import("core.platform.platform") + import("core.base.hashset") + + -- make description + local arches = hashset.new() + + if opt.plat then + local archs = platform.archs(opt.plat) + if archs then + for _, arch in ipairs(archs) do + arches:insert(arch) + end + end + else + for _, plat in ipairs(platform.plats()) do + local archs = platform.archs(plat) + if archs then + for _, arch in ipairs(archs) do + arches:insert(arch) + end + end + end + end + + -- get it + return arches:to_array() + end } + , {'m', "mode", "kv", "release" , "Compile for the given mode.", + " - debug", + " - release", + " - ... (custom)" + , values = function (completing) + if not completing then return end + return {"debug", "release", "profile", "check", "coverage"} + end } + , {'k', "kind", "kv", "static" , "Compile for the given target kind." + , values = {"static", "shared", "binary"} } + , {nil, "host", "kv", "$(host)" , "The Current Host Environment." } -- show project menu options , function () diff --git a/xmake/actions/create/xmake.lua b/xmake/actions/create/xmake.lua index ed5fd6444..5e650f409 100644 --- a/xmake/actions/create/xmake.lua +++ b/xmake/actions/create/xmake.lua @@ -41,24 +41,32 @@ task("create") {'l', "language", "kv", "c++", "The project language" -- show the description of all languages - , function () + , values = function (complete, opt) -- import template import("core.project.template") - -- make description - local description = {} - for _, language in ipairs(template.languages()) do - table.insert(description, " - " .. language) - end + -- get languages + local languages = template.languages() - -- get it - return description + if not complete or not opt.template then return languages end + + local accepted_lang = {} + for _, l in ipairs(languages) do + for _, t in ipairs(template.templates(l)) do + if t:name() == opt.template then + table.insert(accepted_lang, l) + break + end + end + end + + return accepted_lang end } - , {'t', "template", "kv", "console", "Select the project template id or name of the given language." + , {'t', "template", "kv", "console", "Select the project template id or name of the given language.", -- show the description of all templates - , function () + function () -- import template import("core.project.template") @@ -85,6 +93,22 @@ task("create") table.insert(description, " - " .. t.name .. ": " .. table.concat(t.languages, ", ")) end return description + end + , values = function (complete, opt) + if not complete then return end + + -- import template + import("core.project.template") + + -- get templates + local templates = {} + for _, l in ipairs(opt.language and {opt.language} or template.languages()) do + for _, t in ipairs(template.templates(l)) do + table.insert(templates, t:name()) + end + end + + return templates end } , {} diff --git a/xmake/actions/global/xmake.lua b/xmake/actions/global/xmake.lua index ca062c608..f294d2804 100644 --- a/xmake/actions/global/xmake.lua +++ b/xmake/actions/global/xmake.lua @@ -41,16 +41,19 @@ task("global") -- options , options = { - {'c', "clean", "k", nil, "Clean the cached configure and configure all again." } - , {nil, "menu", "k", nil, "Configure with a menu-driven user interface." } + {'c', "clean", "k" , nil , "Clean the cached configure and configure all again." } + , {nil, "menu", "k" , nil , "Configure with a menu-driven user interface." } , {category = "."} - , {nil, "theme", "kv", "default","The theme name." } - , {nil, "debugger", "kv", "auto", "The Debugger Program Path." } + , {nil, "theme", "kv", "default" , "The theme name." + , values = function () + return import("core.theme.theme.names")() + end } + , {nil, "debugger", "kv", "auto" , "The Debugger Program Path." } -- show platform menu options , {category = "Platform Configuration"} - , function () + , function () -- import platform menu import("core.platform.menu") diff --git a/xmake/actions/update/xmake.lua b/xmake/actions/update/xmake.lua index 8ea268765..0995abf2c 100644 --- a/xmake/actions/update/xmake.lua +++ b/xmake/actions/update/xmake.lua @@ -38,17 +38,46 @@ task("update") -- options , options = { - {nil, "uninstall", "k", nil, "Uninstall the current xmake program." } - , { } - , {'s', "scriptonly", "k", nil, "Update script only" } - , {nil, "xmakever", "v", nil, "The given xmake version, or a git source (and branch). ", - "e.g.", - " from official source: ", - " latest, ~2.2.3, dev, master", - " from custom source:", - " https://github.com/xmake-io/xmake", - " github:xmake-io/xmake#~2.2.3", - " git://github.com/xmake-io/xmake.git#master" } + {nil, "uninstall", "k", nil, "Uninstall the current xmake program." } + , { } + , {'s', "scriptonly", "k", nil, "Update script only" } + , {nil, "xmakever", "v", nil, "The given xmake version, or a git source (and branch). ", + "e.g.", + " from official source: ", + " latest, ~2.2.3, dev, master", + " from custom source:", + " https://github.com/xmake-io/xmake", + " github:xmake-io/xmake#~2.2.3", + " git://github.com/xmake-io/xmake.git#master", + values = function (completing) + if not completing then + return + end + return try{ function () + import("private.action.update.fetch_version") + + local seg = completing:split('#', { plain = true, limit = 2, strict = true }) + if #seg == 1 then + if seg[1]:find(':', 1, true) then + -- incomplete custom source + return + else + seg[1] = "" + end + end + + local versions = fetch_version(seg[1]) + if versions.is_official then + return table.join(versions.branches, table.reverse(versions.tags)) + else + local values = table.join(versions.branches, table.reverse(versions.tags)) + for i, v in ipairs(values) do + values[i] = seg[1] .. "#" .. v + end + return values + end + end } + end} } } diff --git a/xmake/core/base/task.lua b/xmake/core/base/task.lua index a3aadb7b0..39a3711da 100644 --- a/xmake/core/base/task.lua +++ b/xmake/core/base/task.lua @@ -11,7 +11,7 @@ -- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -- See the License for the specific language governing permissions and -- limitations under the License. --- +-- -- Copyright (C) 2015-2020, TBOOX Open Source Group. -- -- @author ruki @@ -24,7 +24,6 @@ local task = task or {} -- load modules local os = require("base/os") local table = require("base/table") -local utils = require("base/utils") local string = require("base/string") local global = require("base/global") local interpreter = require("base/interpreter") @@ -36,27 +35,31 @@ function task.common_options() if not task._COMMON_OPTIONS then task._COMMON_OPTIONS = { - {'q', "quiet", "k", nil, "Quiet operation." } - , {'y', "yes", "k", nil, "Input yes by default if need user confirm." } - , {nil, "confirm", "kv", nil, "Input the given result if need user confirm.", - " - y|yes", - " - n|no", - " - d|def"} - , {'v', "verbose", "k", nil, "Print lots of verbose information for users." } - , {nil, "root", "k", nil, "Allow to run xmake as root." } - , {'D', "diagnosis", "k", nil, "Print lots of diagnosis information (backtrace, check info ..) only for developers." - , "And we can append -v to get more whole information." - , " e.g. $ xmake -vD"} - , {nil, "profile", "k", nil, "Print performance data only for developers." } - , {nil, "version", "k", nil, "Print the version number and exit." } - , {'h', "help", "k", nil, "Print this help message and exit." } + {'q', "quiet", "k", nil, "Quiet operation." } + , {'y', "yes", "k", nil, "Input yes by default if need user confirm." } + , {nil, "confirm", "kv", nil, "Input the given result if need user confirm.", + " - y|yes", + " - n|no", + " - d|def" + , values = function (complete) + if not complete then return end + return {"yes", "no", "def"} + end } + , {'v', "verbose", "k", nil, "Print lots of verbose information for users." } + , {nil, "root", "k", nil, "Allow to run xmake as root." } + , {'D', "diagnosis", "k", nil, "Print lots of diagnosis information (backtrace, check info ..) only for developers." + , "And we can append -v to get more whole information." + , " e.g. $ xmake -vD" } + , {nil, "profile", "k", nil, "Print performance data only for developers." } + , {nil, "version", "k", nil, "Print the version number and exit." } + , {'h', "help", "k", nil, "Print this help message and exit." } , {} - , {'F', "file", "kv", nil, "Read a given xmake.lua file." } - , {'P', "project", "kv", nil, "Change to the given project directory." - , "Search priority:" - , " 1. The Given Command Argument" - , " 2. The Envirnoment Variable: XMAKE_PROJECT_DIR" - , " 3. The Current Directory" } + , {'F', "file", "kv", nil, "Read a given xmake.lua file." } + , {'P', "project", "kv", nil, "Change to the given project directory." + , "Search priority:" + , " 1. The Given Command Argument" + , " 2. The Envirnoment Variable: XMAKE_PROJECT_DIR" + , " 3. The Current Directory" } , {category = "action"} } end @@ -85,14 +88,14 @@ function task._translate_menu(menu) -- translate options local options = menu.options if options then - - -- make full options + + -- make full options local options_full = {} for _, opt in ipairs(options) do -- this option is function? translate it if type(opt) == "function" then - + -- call menu script in the sandbox local ok, results = sandbox.load(opt) if ok then @@ -180,7 +183,7 @@ function task._interpreter() -- init interpreter local interp = interpreter.new() assert(interp) - + -- define apis interp:api_define(task.apis()) @@ -192,10 +195,10 @@ function task._interpreter() -- attempt to get it directly from the configure local result = config.get(variable) - if not result or type(result) ~= "string" then + if not result or type(result) ~= "string" then -- init maps - local maps = + local maps = { host = os.host() , tmpdir = function () return os.tmpdir() end @@ -212,7 +215,7 @@ function task._interpreter() if type(result) == "function" then result = result() end - end + end -- ok? return result @@ -249,7 +252,7 @@ function task._bind(tasks, interp) -- get interpreter interp = interp or task._interpreter() - assert(interp) + assert(interp) -- bind sandbox for menus for _, taskinst in pairs(tasks) do @@ -261,8 +264,8 @@ function task._bind(tasks, interp) -- translate options local options = taskmenu.options if options then - - -- make full options + + -- make full options local errors = nil local options_full = {} for _, opt in ipairs(options) do @@ -283,7 +286,7 @@ function task._bind(tasks, interp) options = options_full taskmenu.options = options_full - -- bind sandbox for scripts in option + -- bind sandbox for scripts in option for _, opt in ipairs(options) do -- bind description and values @@ -352,18 +355,18 @@ function task._load(filepath) -- ok? return tasks end - + -- get task apis function task.apis() - return + return { values = { -- task.set_xxx "task.set_category" -- main, action, plugin, task (default) } - , dictionary = + , dictionary = { -- task.set_xxx "task.set_menu" @@ -386,10 +389,10 @@ end -- get global tasks function task.tasks() - + -- return it directly if exists if task._TASKS then - return task._TASKS + return task._TASKS end -- load tasks @@ -465,7 +468,7 @@ function task.menu(tasks) if m then -- add task - mainmenu.tasks[name] = + mainmenu.tasks[name] = { category = inst:get("category") , shortname = m.shortname @@ -504,7 +507,7 @@ function task:name() return self._NAME end --- run given task +-- run given task function task:run(...) -- check diff --git a/xmake/core/sandbox/modules/import/core/theme/theme.lua b/xmake/core/sandbox/modules/import/core/theme/theme.lua index 68fc423ba..40dd293f3 100644 --- a/xmake/core/sandbox/modules/import/core/theme/theme.lua +++ b/xmake/core/sandbox/modules/import/core/theme/theme.lua @@ -55,5 +55,10 @@ function sandbox_core_theme.get(name) end end +-- find all themes +function sandbox_core_theme.names() + return theme.names() +end + -- return module return sandbox_core_theme diff --git a/xmake/core/theme/theme.lua b/xmake/core/theme/theme.lua index 6244edd5f..adf5024fb 100644 --- a/xmake/core/theme/theme.lua +++ b/xmake/core/theme/theme.lua @@ -96,7 +96,21 @@ function theme.directories() return dirs end --- load the given theme +-- find all themes +function theme.names() + + local paths = {} + for _, dir in ipairs(theme.directories()) do + table.join2(paths, (os.match(path.join(dir, "*", "xmake.lua"), "f"))) + end + for i, v in ipairs(paths) do + local value = path.split(v) + paths[i] = value[#value - 1] + end + return paths +end + +-- load the given theme function theme.load(name) -- find the theme script path diff --git a/xmake/modules/private/utils/complete.lua b/xmake/modules/private/utils/complete.lua index 71c7e9fa3..16594088f 100644 --- a/xmake/modules/private/utils/complete.lua +++ b/xmake/modules/private/utils/complete.lua @@ -98,7 +98,7 @@ function _complete_option_kv(options, current, completing) -- show candidates of values local values = opt.values if type(values) == "function" then - values = values(value) + values = values(value, current) end if values == nil and type(opt[4]) == "boolean" then values = { "y", "n" } @@ -158,7 +158,7 @@ function _complete_option_v(options, current, completing) -- show candidates of values local values = opt.values if type(values) == "function" then - values = values(completing) + values = values(completing, current) end for _, v in ipairs(values) do if tostring(v):startswith(completing) then diff --git a/xmake/plugins/lua/main.lua b/xmake/plugins/lua/main.lua new file mode 100644 index 000000000..7586ab65a --- /dev/null +++ b/xmake/plugins/lua/main.lua @@ -0,0 +1,134 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- Copyright (C) 2015-2020, TBOOX Open Source Group. +-- +-- @author ruki +-- @file main.lua +-- + +-- imports +import("core.base.option") +import("core.sandbox.module") +import("core.sandbox.sandbox") + +-- get all lua scripts +function scripts() + local names = {} + local files = os.match(path.join(os.scriptdir(), "scripts/*.lua")) + for _, file in ipairs(files) do + table.insert(names, path.basename(file)) + end + return names +end + +-- list all lua scripts +function _list() + print("scripts:") + for _, file in ipairs(scripts()) do + print(" " .. file) + end +end + +function _run_commanad(command, args) + local tmpfile = os.tmpfile() .. ".lua" + io.writefile(tmpfile, "function main(...)\n" .. command .. "\nend") + return _run_script(tmpfile, args) +end + +function _run_script(script, args) + + local func + local printresult = false + + -- import and run script + if path.extension(script) == ".lua" and os.isfile(script) then + + -- run the given lua script file (xmake lua /tmp/script.lua) + vprint("running given lua script file: %s", path.relative(script)) + func = import(path.basename(script), {rootdir = path.directory(script), anonymous = true}) + + elseif os.isfile(path.join(os.scriptdir(), "scripts", script .. ".lua")) then + + -- run builtin lua script (xmake lua echo "hello xmake") + vprint("running builtin lua script: %s", script) + func = import("scripts." .. script, {anonymous = true})(table.unpack(args, 1, args.n)) + else + + -- attempt to find the builtin module + local object = nil + for _, name in ipairs(script:split("%.")) do + object = object and object[name] or module.get(name) + if not object then + break + end + end + if object then + -- run builtin modules (xmake lua core.xxx.xxx) + vprint("running builtin module: %s", script) + func = object + else + -- run imported modules (xmake lua core.xxx.xxx) + vprint("running imported module: %s", script) + func = import(script, {anonymous = true}) + end + printresult = true + end + + local result = table.pack(func(table.unpack(args, 1, args.n))) + if printresult and result and result.n ~= 0 then + utils.dump(unpack(result, 1, result.n)) + end +end + +function _get_args() + + local args = option.get("arguments") or {} + args.n = #args + for i, value in ipairs(args) do + if value:startswith('@') then + -- deserialize @ prefixed arg + local v, err = string.deserialize(value:sub(2)) + if err then + -- for strings that failed to deserialize, regaed it as a normal string, just show a warning message + utils.warning(err) + else + args[i] = v + end + end + end + + return args +end + +function main() + + if option.get("list") then + return _list() + end + + -- run command? + local script = option.get("script") + if option.get("command") and script then + return _run_commanad(script, _get_args()) + end + + -- get script + if script then + return _run_script(script, _get_args()) + end + + -- enter interactive mode + sandbox.interactive() +end diff --git a/xmake/plugins/lua/xmake.lua b/xmake/plugins/lua/xmake.lua index e264ba14d..7b7bb8dd3 100644 --- a/xmake/plugins/lua/xmake.lua +++ b/xmake/plugins/lua/xmake.lua @@ -25,87 +25,7 @@ task("lua") set_category("plugin") -- on run - on_run(function () - - -- imports - import("core.base.option") - import("core.sandbox.module") - import("core.sandbox.sandbox") - - -- list all lua scripts? - if option.get("list") then - print("scripts:") - local files = os.match(path.join(os.scriptdir(), "scripts/*.lua")) - for _, file in ipairs(files) do - print(" " .. path.basename(file)) - end - return - end - - -- run command? - local script = option.get("script") - if option.get("command") and script then - local tmpfile = os.tmpfile() .. ".lua" - io.writefile(tmpfile, "function main(...)\n" .. script .. "\nend") - script = tmpfile - end - - -- get script - if script then - - local args = option.get("arguments") or {} - args.n = #args - for i, value in ipairs(args) do - if value:startswith('@') then - local v, err = string.deserialize(value:sub(2)) - if err then - -- for strings that failed to deserialize, regaed it as a normal string, just show a warning message - utils.warning(err) - else - args[i] = v - end - end - end - - -- import and run script - if path.extension(script) == ".lua" and os.isfile(script) then - - -- run the given lua script file (xmake lua /tmp/script.lua) - vprint("running given lua script file: %s", path.relative(script)) - import(path.basename(script), {rootdir = path.directory(script), anonymous = true})(table.unpack(args, 1, args.n)) - - elseif os.isfile(path.join(os.scriptdir(), "scripts", script .. ".lua")) then - - -- run builtin lua script (xmake lua echo "hello xmake") - vprint("running builtin lua script: %s", script) - import("scripts." .. script, {anonymous = true})(table.unpack(args, 1, args.n)) - else - - -- attempt to find the builtin module - local object = nil - for _, name in ipairs(script:split("%.")) do - object = object and object[name] or module.get(name) - if not object then - break - end - end - local result = nil - if object then - -- run builtin modules (xmake lua core.xxx.xxx) - vprint("running builtin module: %s", script) - result = table.pack(object(table.unpack(args, 1, args.n))) - else - -- run imported modules (xmake lua core.xxx.xxx) - vprint("running imported module: %s", script) - result = table.pack(import(script, {anonymous = true})(table.unpack(args, 1, args.n))) - end - if result and result.n ~= 0 then utils.dump(unpack(result, 1, result.n)) end - end - else - -- enter interactive mode - sandbox.interactive() - end - end) + on_run("main") -- set menu set_menu { @@ -119,21 +39,26 @@ task("lua") , shortname = 'l' -- options - , options = + , options = { - {'l', "list", "k", nil, "List all scripts." } - , {'c', "command", "k", nil, "Run script as command" } - , {nil, "script", "v", nil, "Run the given lua script name, file or module and enter interactive mode if no given script.", + {'l', "list" , "k" , nil , "List all scripts." } + , {'c', "command" , "k" , nil , "Run script as command" } + , {nil, "script" , "v" , nil , "Run the given lua script name, file or module and enter interactive mode if no given script.", "e.g.", " - xmake lua (enter interactive mode)", " - xmake lua /tmp/script.lua", " - xmake lua echo 'hello xmake'", " - xmake lua core.xxx.xxx", - " - xmake lua -c 'print(...)' hello xmake!" } - , {nil, "arguments", "vs", nil, "The script arguments, use '@' to enable deserializing.", + " - xmake lua -c 'print(...)' hello xmake!" + , values = function (complete, opt) + if not complete or opt.command or opt.list then return end + + return import("main.scripts")() + end } + , {nil, "arguments" , "vs" , nil , "The script arguments, use '@' to enable deserializing.", "e.g.", - " - xmake lua lib.detect.find_tool tar @{version=true}" } + " - xmake lua lib.detect.find_tool tar @{version=true}" } } } diff --git a/xmake/plugins/macro/main.lua b/xmake/plugins/macro/main.lua index 0bbbaa53b..c55b4f680 100644 --- a/xmake/plugins/macro/main.lua +++ b/xmake/plugins/macro/main.lua @@ -75,12 +75,10 @@ function _wfile(macroname) return path.join(path.join(config.directory(), "macros"), macroname .. ".lua") end --- list macros -function _list() - - -- trace - cprint("${bright}macros:") +-- get all macros +function macros(anonymousname) + local results = {} -- find all macros for _, dir in ipairs(_directories()) do local macrofiles = os.match(path.join(dir, "*.lua")) @@ -88,14 +86,28 @@ function _list() -- get macro name local macroname = path.basename(macrofile) - if macroname == "anonymous" then - macroname = ".<anonymous>" + + if macroname == "anonymous" and anonymousname then + macroname = anonymousname end - -- show it - print(" " .. macroname) + table.insert(results, macroname) end end + return results +end + +-- list macros +function _list() + + -- trace + cprint("${bright}macros:") + + -- find all macros + for _, macroname in ipairs(macros(".<anonymous>")) do + -- show it + print(" " .. macroname) + end end -- show macro diff --git a/xmake/plugins/macro/xmake.lua b/xmake/plugins/macro/xmake.lua index 24157dfe0..e414ba246 100644 --- a/xmake/plugins/macro/xmake.lua +++ b/xmake/plugins/macro/xmake.lua @@ -41,10 +41,10 @@ task("macro") -- options , options = { - {'b', "begin", "k", nil, "Start to record macro." + {'b', "begin", "k", nil, "Start to record macro." , "e.g." , "Record macro with name: test" - , " xmake macro --begin" + , " xmake macro --begin" , " xmake config --plat=macosx" , " xmake clean" , " xmake -r" @@ -68,9 +68,19 @@ task("macro") , {} , {nil, "name", "v", ".", "Set the macro name." , "e.g." - , " Run the given macro: xmake macro test" - , " Run the anonymous macro: xmake macro ." - , " Run the last command: xmake macro .." } + , " Run the given macro: xmake macro test" + , " Run the anonymous macro: xmake macro ." + , " Run the last command: xmake macro .." + , values = function (complete, opt) + -- hide in help menu + if not complete then return end + -- don't need name + if opt.begin or opt.list or opt.clear then return end + -- name should be given by user + if opt["end"] or opt.import then return end + + return import("main.macros")(".") + end } , {nil, "arguments", "vs", nil, "Set the macro arguments." } } } diff --git a/xmake/plugins/project/main.lua b/xmake/plugins/project/main.lua index 147cee3d6..b24a3b47f 100755 --- a/xmake/plugins/project/main.lua +++ b/xmake/plugins/project/main.lua @@ -31,13 +31,11 @@ import("vsxmake.vsxmake") import("clang.compile_flags") import("clang.compile_commands") --- make project -function _make(kind) +function makers() -- the maps - local maps = - { - makefile = makefile.make + return + { makefile = makefile.make , xmakefile = xmakefile.make , cmakelists = cmakelists.make , vs2002 = vs.make(2002) @@ -61,6 +59,12 @@ function _make(kind) , compile_flags = compile_flags.make , compile_commands = compile_commands.make } +end + +-- make project +function _make(kind) + + local maps = makers() assert(maps[kind], "the project kind(%s) is not supported!", kind) -- make it diff --git a/xmake/plugins/project/xmake.lua b/xmake/plugins/project/xmake.lua index 31be1e90b..f5c6c6b30 100644 --- a/xmake/plugins/project/xmake.lua +++ b/xmake/plugins/project/xmake.lua @@ -38,22 +38,29 @@ task("project") -- options , options = { - {'k', "kind", "kv", "makefile", "Set the project kind." - , " - makefile" - , " - xmakefile (makefile with xmake)" - , " - cmakelists" - , " - compile_flags" - , " - compile_commands (clang compilation database with json format)" - , " - vs (auto detect), vs2002, vs2003, vs2005, vs2008" - , " - vs2010, vs2012, vs2013, vs2015, vs2017, vs2019" - , " - vsxmake (auto detect), vsxmake2010 ~ vsxmake2019" } - , {'m', "modes", "kv", nil, "Set the project modes." - , " e.g. " - , " - xmake project -k vsxmake -m \"release" .. path.envsep() .. "debug\"" } - , {'a', "archs", "kv", nil, "Set the project archs." - , " e.g. " - , " - xmake project -k vsxmake -a \"x86" .. path.envsep() .. "x64\"" } - , {nil, "outputdir", "v", ".", "Set the output directory." } + {'k', "kind", "kv" , "makefile", "Set the project kind." + , " - makefile" + , " - xmakefile (makefile with xmake)" + , " - cmakelists" + , " - compile_flags" + , " - compile_commands (clang compilation database with json format)" + , " - vs (auto detect), vs2002, vs2003, vs2005, vs2008" + , " - vs2010, vs2012, vs2013, vs2015, vs2017, vs2019" + , " - vsxmake (auto detect), vsxmake2010 ~ vsxmake2019" + , values = function (complete, opt) + if not complete then return end + + local values = table.keys(import("main.makers")()) + table.sort(values, function (a, b) return a > b end) + return values + end } + , {'m', "modes", "kv" , nil , "Set the project modes." + , " e.g. " + , " - xmake project -k vsxmake -m \"release" .. path.envsep() .. "debug\"" } + , {'a', "archs", "kv" , nil , "Set the project archs." + , " e.g. " + , " - xmake project -k vsxmake -a \"x86" .. path.envsep() .. "x64\"" } + , {nil, "outputdir", "v" , "." , "Set the output directory." } } } |
