add find python and python3

5 files changed, 162 insertions, 12 deletions

diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
index 7136d05ed..dbeb4a47e 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
@@ -28,6 +28,7 @@ local sandbox_lib_detect_find_program = sandbox_lib_detect_find_program or {}
 -- load modules
 local os        = require("base/os")
 local path      = require("base/path")
+local option    = require("base/winos")
 local table     = require("base/table")
 local utils     = require("base/utils")
 local option    = require("base/option")
@@ -118,8 +119,24 @@ function sandbox_lib_detect_find_program._find(name, pathes, opt)
         end
     end
 
-    -- attempt to check it use `which program` command
-    if os.host() ~= "windows" then
+    -- attempt to check it from regists
+    if os.host() == "windows" then
+        local program_name = name:lower()
+        if not program_name:endswith(".exe") then
+            program_name = program_name .. ".exe"
+        end
+        local program_path = winos.registry_query("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\" .. program_name)
+        if program_path then
+            -- check it
+            program_path = program_path:trim()
+            if os.isexec(program_path) then
+                if sandbox_lib_detect_find_program._check(program_path, opt) then
+                    return program_path
+                end
+            end
+        end
+    else
+        -- attempt to check it use `which program` command
         local ok, program_path = os.iorunv("which", {name})
         if ok and program_path then
             -- check it
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua b/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
index 6c59d631a..276cd7a1d 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
@@ -95,6 +95,9 @@ function sandbox_lib_detect_find_programver.main(program, opt)
             end
         elseif parse == nil or type(parse) == "string" then
             result = outdata:match(parse or "(%d+%.?%d*%.?%d*.-)%s")
+            if not result then
+                result = outdata:match(parse or "(%d+%.?%d*%.?%d*.-)")
+            end
         end
     end
 
diff --git a/xmake/modules/detect/tools/find_python.lua b/xmake/modules/detect/tools/find_python.lua
new file mode 100644
index 000000000..cc2645a6f
--- /dev/null
+++ b/xmake/modules/detect/tools/find_python.lua
@@ -0,0 +1,62 @@
+--!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_python.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_python()
+-- local python, version = find_python({version = true})
+-- 
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    
+    -- find program
+    local program = find_program(opt.program or "python", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt 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
+
+    -- ok?
+    return program, version
+end
diff --git a/xmake/modules/detect/tools/find_python3.lua b/xmake/modules/detect/tools/find_python3.lua
new file mode 100644
index 000000000..a6c75611e
--- /dev/null
+++ b/xmake/modules/detect/tools/find_python3.lua
@@ -0,0 +1,69 @@
+--!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_python3.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_python3()
+-- local python, version = find_python3({version = true})
+-- 
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    if is_host("windows") then
+        opt.pathes = opt.pathes or {}
+        table.insert(opt.pathes, "$(reg HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\3.7\\InstallPath;ExecutablePath)")
+        table.insert(opt.pathes, "$(reg HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\3.7-32\\InstallPath;ExecutablePath)")
+        table.insert(opt.pathes, "$(reg HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\3.6\\InstallPath;ExecutablePath)")
+        table.insert(opt.pathes, "$(reg HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\3.6-32\\InstallPath;ExecutablePath)")
+    end
+    
+    -- find program
+    local program = find_program(opt.program or "python3", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt 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
+
+    -- ok?
+    return program, version
+end
diff --git a/xmake/modules/lib/detect/find_tool.lua b/xmake/modules/lib/detect/find_tool.lua
index 0e76cb3a2..e99a9c2d0 100644
--- a/xmake/modules/lib/detect/find_tool.lua
+++ b/xmake/modules/lib/detect/find_tool.lua
@@ -69,21 +69,20 @@ function main(name, opt)
 
     -- find tool name
     local toolname = find_toolname(name or opt.program)
-    if not toolname then
-        return 
+    if toolname then
+
+        -- attempt to find tool from modules first
+        local tool = _find_from_modules(toolname, opt)
+        if tool then
+            return tool
+        end
     end
 
     -- init program
     opt.program = opt.program or name
 
-    -- attempt to find tool from modules first
-    local tool = _find_from_modules(toolname, opt)
-    if tool then
-        return tool
-    end
- 
-    -- find tool
-    local program = find_program(opt.program, opt.pathes, opt.check, opt)
+    -- find program
+    local program = find_program(opt.program, opt)
     if not program then
         return 
     end