From 6935be8876c358d89b5c5c2d5c0a56f4ea9d1590 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 22 Sep 2018 08:44:35 +0800 Subject: add find_python2 --- xmake/modules/detect/tools/find_python3.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'xmake/modules/detect/tools/find_python3.lua') diff --git a/xmake/modules/detect/tools/find_python3.lua b/xmake/modules/detect/tools/find_python3.lua index a6c75611e..dcbf2e3af 100644 --- a/xmake/modules/detect/tools/find_python3.lua +++ b/xmake/modules/detect/tools/find_python3.lua @@ -53,10 +53,14 @@ function main(opt) -- find program local program = find_program(opt.program or "python3", opt) - + if not program then + program = find_program("python", opt) + opt.version = true + end + -- find program version local version = nil - if program and opt and opt.version then + if program and opt.version then opt.command = function () local outs, errs = os.iorunv(program, {"--version"}) return ((outs or "") .. (errs or "")):trim() @@ -64,6 +68,12 @@ function main(opt) version = find_programver(program, opt) end + -- check version + if version and not version:startswith("3.") then + return + end + -- ok? return program, version + end -- cgit v1.3.1