Merge pull request #6100 from Doekin/aqt

Add `find_aqt` to fix detection of installed `aqt`

1 files changed, 54 insertions, 0 deletions

diff --git a/xmake/modules/detect/tools/find_aqt.lua b/xmake/modules/detect/tools/find_aqt.lua
new file mode 100644
index 000000000..aeb96cd7f
--- /dev/null
+++ b/xmake/modules/detect/tools/find_aqt.lua
@@ -0,0 +1,54 @@
+--!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-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_aqt.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find aqt
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local aqt = find_aqt()
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt       = opt or {}
+    opt.check = opt.check or "version"
+
+    -- find program
+    local program = find_program(opt.program or "aqt", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt and opt.version then
+        opt.command = opt.command or function () local _, info = os.iorunv(program, {"version"}, {envs = opt.envs}); return info end
+        opt.parse   = opt.parse or "aqt%S*%s+v*(%S+)"
+        version = find_programver(program, opt)
+    end
+    return program, version
+end