add find_python2

3 files changed, 89 insertions, 3 deletions

diff --git a/xmake/modules/detect/tools/find_python.lua b/xmake/modules/detect/tools/find_python.lua
index cc2645a6f..d4097e4c9 100644
--- a/xmake/modules/detect/tools/find_python.lua
+++ b/xmake/modules/detect/tools/find_python.lua
@@ -25,6 +25,8 @@
 -- imports
 import("lib.detect.find_program")
 import("lib.detect.find_programver")
+import("detect.tools.find_python2")
+import("detect.tools.find_python3")
 
 -- find python 
 --
@@ -46,10 +48,13 @@ function main(opt)
     
     -- find program
     local program = find_program(opt.program or "python", opt)
+    if not program then
+        program = find_python3() or find_python2()
+    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()
diff --git a/xmake/modules/detect/tools/find_python2.lua b/xmake/modules/detect/tools/find_python2.lua
new file mode 100644
index 000000000..00260999a
--- /dev/null
+++ b/xmake/modules/detect/tools/find_python2.lua
@@ -0,0 +1,71 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you 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 - 2018, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_python2.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find python 
+--
+-- @param opt  the arguments, .e.g {version = true}
+--
+-- @return     program, version
+--
+-- @code 
+--
+-- local python = find_python2()
+-- local python, version = find_python2({version = true})
+-- 
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    
+    -- find program
+    local program = find_program(opt.program or "python2", opt)
+    if not program then
+        program = find_program("python", opt)
+        opt.version = true
+    end
+    
+    -- find program version
+    local version = nil
+    if program and opt.version then
+        opt.command = function () 
+            local outs, errs = os.iorunv(program, {"--version"}) 
+            return ((outs or "") .. (errs or "")):trim()
+        end
+        version = find_programver(program, opt)
+    end
+
+    -- check version
+    if version and not version:startswith("2.") then
+        return 
+    end
+
+    -- ok?
+    return program, version
+end
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