diff options
Diffstat (limited to 'xmake/modules/detect/tools/find_python3.lua')
| -rw-r--r-- | xmake/modules/detect/tools/find_python3.lua | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xmake/modules/detect/tools/find_python3.lua b/xmake/modules/detect/tools/find_python3.lua index 9c5a87296..df3daff49 100644 --- a/xmake/modules/detect/tools/find_python3.lua +++ b/xmake/modules/detect/tools/find_python3.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 @@ -22,17 +22,17 @@ import("lib.detect.find_program") import("lib.detect.find_programver") --- find python +-- find python -- -- @param opt the arguments, e.g. {version = true} -- -- @return program, version -- --- @code +-- @code -- -- local python = find_python3() -- local python, version = find_python3({version = true}) --- +-- -- @endcode -- function main(opt) @@ -46,19 +46,19 @@ function main(opt) 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) 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"}) + opt.command = function () + local outs, errs = os.iorunv(program, {"--version"}) return ((outs or "") .. (errs or "")):trim() end version = find_programver(program, opt) @@ -66,7 +66,7 @@ function main(opt) -- check version if version and not version:startswith("3.") then - return + return end -- ok? |