From 8cffaa773fe48eaf4afe957ff09f8d80f88f68ca Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 22 Jun 2018 22:51:28 +0800 Subject: improve find cross toolchain --- xmake/modules/detect/sdks/find_cross_toolchain.lua | 75 ++++++++++++++++++++++ .../modules/detect/sdks/find_cross_toolchains.lua | 62 ------------------ xmake/modules/detect/sdks/find_ndk.lua | 8 +-- 3 files changed, 79 insertions(+), 66 deletions(-) create mode 100644 xmake/modules/detect/sdks/find_cross_toolchain.lua delete mode 100644 xmake/modules/detect/sdks/find_cross_toolchains.lua (limited to 'xmake/modules') diff --git a/xmake/modules/detect/sdks/find_cross_toolchain.lua b/xmake/modules/detect/sdks/find_cross_toolchain.lua new file mode 100644 index 000000000..107d7c916 --- /dev/null +++ b/xmake/modules/detect/sdks/find_cross_toolchain.lua @@ -0,0 +1,75 @@ +--!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_cross_toolchain.lua +-- + +-- imports +import("core.project.config") +import("lib.detect.find_file") + +-- find cross toolchain +-- +-- @param rootdir the root directory of cross toolchain +-- @param opt the argument options +-- .e.g {bin = .., cross = ..} +-- +-- @return the toolchain .e.g {bin = .., cross = ..} +-- +-- @code +-- +-- local toolchain = find_cross_toolchain("/xxx/android-cross-r10e") +-- local toolchain = find_cross_toolchain("/xxx/android-cross-r10e", {cross = "arm-linux-androideabi-"}) +-- local toolchain = find_cross_toolchain("/xxx/android-cross-r10e", {cross = "arm-linux-androideabi-", bin = ..}) +-- +-- @endcode +-- +function main(rootdir, opt) + + -- init arguments + opt = opt or {} + + -- get root directory + if not rootdir or not os.isdir(rootdir) then + return + end + + -- init pathes + local pathes = {} + if opt.bin then + table.insert(pathes, opt.bin) + end + table.insert(pathes, path.join(rootdir, "bin")) + table.insert(pathes, path.join(rootdir, "**", "bin")) + + -- attempt to find *-ld + local ldname = os.host() == "windows" and "ld.exe" or "ld" + local ldpath = find_file((opt.cross or '*-') .. ldname, pathes) + if ldpath then + return {bin = path.directory(ldpath), cross = path.basename(ldpath):sub(1, -3)} + end + + -- find ld + ldpath = find_file(ldname, pathes) + if ldpath then + return {bin = path.directory(ldpath), cross = ""} + end +end diff --git a/xmake/modules/detect/sdks/find_cross_toolchains.lua b/xmake/modules/detect/sdks/find_cross_toolchains.lua deleted file mode 100644 index 1e92d04c8..000000000 --- a/xmake/modules/detect/sdks/find_cross_toolchains.lua +++ /dev/null @@ -1,62 +0,0 @@ ---!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_cross_toolchains.lua --- - --- imports -import("core.project.config") - --- find cross toolchains --- --- @param rootdir the root directory of cross toolchains --- @param opt the argument options --- .e.g {bin = .., cross = ..} --- --- @return the toolchains array. .e.g {{bin = .., cross = ..}, .. } --- --- @code --- --- local cross_toolchains = find_cross_toolchains("/xxx/android-cross-r10e") --- local cross_toolchains = find_cross_toolchains("/xxx/android-cross-r10e", {cross = "arm-linux-androideabi-"}) --- local cross_toolchains = find_cross_toolchains("/xxx/android-cross-r10e", {cross = "arm-linux-androideabi-", bin = ..}) --- --- @endcode --- -function main(rootdir, opt) - - -- init arguments - opt = opt or {} - - -- get root directory - if not rootdir or not os.isdir(rootdir) then - return {} - end - - -- find bin directory and cross - local cross_toolchains = {} - for _, ldpath in ipairs(os.files(path.join(opt.bin or rootdir, "**" .. (opt.cross or '-') .. "ld"))) do - table.insert(cross_toolchains, {bin = path.directory(ldpath), cross = path.basename(ldpath):sub(1, -3)}) - end - - -- ok? - return cross_toolchains -end diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua index dfbc7454a..73f643f4f 100644 --- a/xmake/modules/detect/sdks/find_ndk.lua +++ b/xmake/modules/detect/sdks/find_ndk.lua @@ -19,7 +19,7 @@ -- Copyright (C) 2015 - 2018, TBOOX Open Source Group. -- -- @author ruki --- @file find_toolchains.lua +-- @file find_ndk.lua -- -- imports @@ -31,12 +31,12 @@ import("core.project.config") -- @param opt the argument options -- .e.g {arch = "[armv5te|armv6|armv7-a|armv8-a|arm64-v8a]"} -- --- @return the toolchains array. .e.g {{bin = .., cross = ..}, .. } +-- @return the ndk toolchains array. .e.g {{bin = .., cross = ..}, .. } -- -- @code -- --- local toolchains = find_toolchains("/xxx/android-ndk-r10e") --- local toolchains = find_toolchains("/xxx/android-ndk-r10e", {arch = "arm64-v8a"}) +-- local toolchains = find_ndk("/xxx/android-ndk-r10e") +-- local toolchains = find_ndk("/xxx/android-ndk-r10e", {arch = "arm64-v8a"}) -- -- @endcode -- -- cgit v1.3.1