Merge pull request #792 from xmake-io/toolchain

Improve to detect cross-compilation toolchains

5 files changed, 0 insertions, 320 deletions

diff --git a/xmake/modules/private/platform/check_arch.lua b/xmake/modules/private/platform/check_arch.lua
deleted file mode 100644
index 4e67f8ae9..000000000
--- a/xmake/modules/private/platform/check_arch.lua
+++ /dev/null
@@ -1,38 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed 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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        check_arch.lua
---
-
--- imports
-import("core.base.option")
-
--- check the architecture
-function main(config, default)
-
-    -- get the architecture
-    local arch = config.get("arch")
-    if not arch then
-
-        -- init the default architecture
-        config.set("arch", default or os.arch())
-
-        -- trace
-        cprint("checking for the architecture ... ${color.success}%s", config.get("arch"))
-    end
-end
-
diff --git a/xmake/modules/private/platform/check_toolchain.lua b/xmake/modules/private/platform/check_toolchain.lua
deleted file mode 100644
index 839e6600d..000000000
--- a/xmake/modules/private/platform/check_toolchain.lua
+++ /dev/null
@@ -1,83 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed 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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        check_toolchain.lua
---
-
--- imports
-import("core.base.option")
-import("lib.detect.find_tool")
-
--- check the given tool
-function _check_tool(config, toolkind, description, name, cross, pathes, check)
-
-    -- get the program 
-    local program = config.get(toolkind)
-    if not program then
-
-        -- translate program name to attempt to get `$(env XX)`
-        name = vformat(name)
-        if #name == 0 then
-            return 
-        end
-
-        -- attempt to check it 
-        local toolname = nil
-        if not program then
-            local tool = find_tool(name, {program = (cross or "") .. name, pathes = pathes or config.get("bin"), check = check})
-            if tool then
-                program = tool.program
-                toolname = tool.name
-            end
-        end
-
-        -- check ok?
-        if program then 
-            config.set(toolkind, program) 
-            config.set("__toolname_" .. toolkind, toolname)
-            config.save()
-        end
-
-        -- trace
-        if option.get("verbose") then
-            if program then
-                cprint("${dim}checking for %s (%s) ... ${color.success}%s", description, toolkind, path.filename(program))
-            else
-                cprint("${dim}checking for %s (%s: ${bright}%s${clear}) ... ${color.nothing}${text.nothing}", description, toolkind, name)
-            end
-        end
-    end
-
-    -- ok?
-    return program
-end
-
--- check the toolchain 
-function main(config, name, toolchain)
-    for _, toolinfo in ipairs(toolchain.list) do
-        if type(toolinfo) == "string" then
-            if _check_tool(config, name, toolchain.description, toolinfo) then
-                break
-            end
-        else
-            if _check_tool(config, name, toolchain.description, toolinfo.name, toolinfo.cross, toolinfo.pathes, toolinfo.check) then
-                break
-            end
-        end
-    end
-end
-
diff --git a/xmake/modules/private/platform/check_vstudio.lua b/xmake/modules/private/platform/check_vstudio.lua
deleted file mode 100644
index 6657e43ea..000000000
--- a/xmake/modules/private/platform/check_vstudio.lua
+++ /dev/null
@@ -1,103 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed 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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        check_vstudio.lua
---
-
--- imports
-import("core.base.option")
-import("detect.sdks.find_vstudio")
-import("lib.detect.find_tool")
-import("core.platform.environment")
-
--- attempt to check vs environment
-function _check_vsenv(config)
-
-    -- have been checked?
-    local vs = config.get("vs")
-    if vs and config.get("__vcvarsall") then
-        return vs
-    end
-
-    -- find vstudio
-    local vstudio = find_vstudio({vcvars_ver = config.get("vs_toolset"), sdkver = config.get("vs_sdkver")})
-    if vstudio then
-
-        -- make order vsver
-        local vsvers = {}
-        for vsver, _ in pairs(vstudio) do
-            if not vs or vs ~= vsver then
-                table.insert(vsvers, vsver)
-            end
-        end
-        table.sort(vsvers, function (a, b) return tonumber(a) > tonumber(b) end)
-        if vs then
-            table.insert(vsvers, 1, vs)
-        end
-
-        -- get vcvarsall
-        for _, vsver in ipairs(vsvers) do
-            local vcvarsall = (vstudio[vsver] or {}).vcvarsall or {}
-            local vsenv = vcvarsall[config.get("arch") or ""]
-            if vsenv and vsenv.path and vsenv.include and vsenv.lib then
-
-                -- save vsenv
-                config.set("__vcvarsall", vcvarsall)
-
-                -- check compiler
-                environment.enter("toolchains")
-                local program = nil
-                local tool = find_tool("cl.exe", {force = true})
-                if tool then
-                    program = tool.program
-                end
-                environment.leave("toolchains")
-
-                -- ok?
-                if program then
-                    return vsver
-                end
-            end
-        end
-    end
-end
-
--- check the visual studio
-function main(config, opt)
-
-    -- attempt to check the given vs version first
-    local vs = _check_vsenv(config)
-    if vs then
-
-        -- save it
-        config.set("vs", vs, {readonly = true, force = true})
-
-        -- trace
-        cprint("checking for the Microsoft Visual Studio (%s) version ... ${color.success}%s", config.get("arch"), vs)
-    else
-        -- failed
-        cprint("checking for the Microsoft Visual Studio (%s) version ... ${color.nothing}${text.nothing}", config.get("arch"))
-        if not (opt and opt.try) then
-            print("please run:")
-            print("    - xmake config --vs=xxx [--vs_toolset=xxx]")
-            print("or  - xmake global --vs=xxx")
-            raise()
-        end
-    end
-end
-
-
diff --git a/xmake/modules/private/platform/check_xcode.lua b/xmake/modules/private/platform/check_xcode.lua
deleted file mode 100644
index e0188beb4..000000000
--- a/xmake/modules/private/platform/check_xcode.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed 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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        check_xcode.lua
---
-
--- imports
-import("core.base.option")
-import("detect.sdks.find_xcode")
-
--- check the xcode application directory
-function main(config, optional)
-
-    -- find xcode
-    local xcode = find_xcode(config.get("xcode"), {force = not optional, verbose = true, plat = config.get("plat"), arch = config.get("arch")})
-    if xcode then
-
-        -- save it (maybe to global)
-        config.set("xcode", xcode.sdkdir, {force = true, readonly = true})
-
-    elseif not optional then
-
-        -- failed
-        cprint("${bright color.error}please run:")
-        cprint("    - xmake config --xcode=xxx")
-        cprint("or  - xmake global --xcode=xxx")
-        raise()
-    end
-
-    -- save target minver
-    local xcode_sdkver = config.get("xcode_sdkver")
-    local target_minver = config.get("target_minver")
-    if xcode_sdkver and not target_minver then
-        target_minver = xcode_sdkver
-        if is_plat("macosx") then
-            local macos_ver = macos.version()
-            if macos_ver then
-                target_minver = macos_ver:major() .. "." .. macos_ver:minor()
-            end
-        end
-        config.set("target_minver", target_minver)
-    end
-end
-
diff --git a/xmake/modules/private/platform/toolchain.lua b/xmake/modules/private/platform/toolchain.lua
deleted file mode 100644
index 7ddf361d6..000000000
--- a/xmake/modules/private/platform/toolchain.lua
+++ /dev/null
@@ -1,38 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed 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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        toolchain.lua
---
-
--- imports
-import("core.base.object")
-
--- init toolchain
-local toolchain = toolchain or object {_init = {"description", "list"}}
-
--- add tool to toolchain list
-function toolchain:add(...)
-    for _, item in ipairs({...}) do
-        table.insert(self.list, item)
-    end
-end
-
--- create a toolchain object
-function main(description)
-    return toolchain {description, {}}
-end
-