Add custom unknown toolchain support

tests/apis/custom_toolchain/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/custom_toolchain/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/custom_toolchain/src/test.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int main(int argc, char** argv) {
+    return add(1, 2);
+}

tests/apis/custom_toolchain/xmake.lua

@@ -0,0 +1,17 @@
+add_rules("mode.debug", "mode.release")
+
+add_moduledirs("xmake/modules")
+add_toolchaindirs("xmake/toolchains")
+
+set_toolchains("my-c6000")
+
+target("test")
+    set_kind("static")
+    add_files("src/foo.cpp")
+
+target("demo")
+    set_kind("binary")
+    add_deps("test")
+    add_files("src/test.cpp")
+
+

xmake/modules/detect/tools/armasm64_msvc/has_flags.lua → tests/apis/custom_toolchain/xmake/modules/core/tools/ar6x.lua

@@ -15,9 +15,13 @@
 -- Copyright (C) 2015-present, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        has_flags.lua
+-- @file        ar6x.lua
 --
 
--- imports
-inherit("detect.tools.armasm_msvc.has_flags")
+inherit("core.tools.ar")
+
+-- init it
+function init(self)
+    self:set("arflags", "-r")
+end
 

tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x.lua

@@ -0,0 +1,207 @@
+--!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-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        cl6x.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.base.global")
+import("core.project.policy")
+import("core.language.language")
+import("utils.progress")
+
+-- init it
+function init(self)
+end
+
+-- make the symbol flag
+function nf_symbol(self, level)
+    -- only for source kind
+    local kind = self:kind()
+    if language.sourcekinds()[kind] then
+        local maps = _g.symbol_maps
+        if not maps then
+            maps =
+            {
+                debug  = "-g"
+            }
+            _g.symbol_maps = maps
+        end
+        return maps[level .. '_' .. kind] or maps[level]
+    end
+end
+
+-- make the optimize flag
+function nf_optimize(self, level)
+    local maps =
+    {
+        none       = "-O0"
+    ,   fast       = "-O1"
+    ,   faster     = "-O2"
+    ,   fastest    = "-O3"
+    ,   smallest   = "-m3"
+    ,   aggressive = "-O3"
+    }
+    return maps[level]
+end
+
+-- make the define flag
+function nf_define(self, macro)
+    return "-D" .. macro
+end
+
+-- make the undefine flag
+function nf_undefine(self, macro)
+    return "-U" .. macro
+end
+
+-- make the includedir flag
+function nf_includedir(self, dir)
+    return {"-I" .. dir}
+end
+
+-- make the sysincludedir flag
+function nf_sysincludedir(self, dir)
+    return nf_includedir(self, dir)
+end
+
+-- make the link flag
+function nf_link(self, lib)
+    if not lib:endswith(".a") and not lib:endswith(".so") then
+         lib = "lib" .. lib .. ".a"
+    end
+    return "-l" .. lib
+end
+
+-- make the syslink flag
+function nf_syslink(self, lib)
+    return nf_link(self, lib)
+end
+
+-- make the linkdir flag
+function nf_linkdir(self, dir)
+    return {"-i" .. path.translate(dir)}
+end
+
+-- make the rpathdir flag
+function nf_rpathdir(self, dir, opt)
+    opt = opt or {}
+    local extra = opt.extra
+    if extra and extra.installonly then
+        return
+    end
+    dir = path.translate(dir)
+    return {"-rpath=" .. dir}
+end
+
+-- make the link arguments list
+function linkargv(self, objectfiles, targetkind, targetfile, flags, opt)
+    local argv = table.join("-z", "--output_file=" .. targetfile, objectfiles, flags)
+    return self:program(), argv
+end
+
+-- link the target file
+--
+-- maybe we need to use os.vrunv() to show link output when enable verbose information
+-- @see https://github.com/xmake-io/xmake/discussions/2916
+--
+function link(self, objectfiles, targetkind, targetfile, flags, opt)
+    opt = opt or {}
+    os.mkdir(path.directory(targetfile))
+    local program, argv = linkargv(self, objectfiles, targetkind, targetfile, flags)
+    if option.get("verbose") then
+        os.execv(program, argv, {envs = self:runenvs(), shell = opt.shell})
+    else
+        os.vrunv(program, argv, {envs = self:runenvs(), shell = opt.shell})
+    end
+end
+
+-- make the compile arguments list
+function compargv(self, sourcefile, objectfile, flags)
+    return self:program(), table.join("-c", "--preproc_with_compile", flags, "--output_file=" .. objectfile, sourcefile)
+end
+
+-- compile the source file
+function compile(self, sourcefile, objectfile, dependinfo, flags, opt)
+    os.mkdir(path.directory(objectfile))
+    local depfile = dependinfo and os.tmpfile() or nil
+    try
+    {
+        function ()
+            local compflags = flags
+            if depfile then
+                compflags = table.join(compflags, "-ppd=" .. depfile)
+            end
+            local outdata, errdata = os.iorunv(compargv(self, sourcefile, objectfile, compflags))
+            return (outdata or "") .. (errdata or "")
+        end,
+        catch
+        {
+            function (errors)
+
+                -- try removing the old object file for forcing to rebuild this source file
+                os.tryrm(objectfile)
+
+                -- find the start line of error
+                local lines = tostring(errors):split("\n")
+                local start = 0
+                for index, line in ipairs(lines) do
+                    if line:find("error:", 1, true) or line:find("错误：", 1, true) then
+                        start = index
+                        break
+                    end
+                end
+
+                -- get 16 lines of errors
+                if start > 0 or not option.get("verbose") then
+                    if start == 0 then start = 1 end
+                    errors = table.concat(table.slice(lines, start, start + ((#lines - start > 16) and 16 or (#lines - start))), "\n")
+                end
+
+                -- raise compiling errors
+                raise(errors)
+            end
+        },
+        finally
+        {
+            function (ok, warnings)
+
+                -- print some warnings
+                if warnings and #warnings > 0 and policy.build_warnings(opt) then
+                    if progress.showing_without_scroll() then
+                        print("")
+                    end
+                    cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+                end
+
+                -- generate the dependent includes
+                if depfile and os.isfile(depfile) then
+                    if dependinfo then
+                        dependinfo.depfiles_format = "cl6x"
+                        dependinfo.depfiles = io.readfile(depfile, {continuation = "\\"})
+                    end
+
+                    -- remove the temporary dependent file
+                    os.tryrm(depfile)
+                end
+            end
+        }
+    }
+end
+
+

xmake/modules/detect/tools/cl6x/has_flags.lua → tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua

@@ -48,7 +48,7 @@ end
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt, islinker)
-    local key = "detect.tools.cl6x." .. (islinker and "has_ldflags" or "has_cflags")
+    local key = "core.tools.cl6x." .. (islinker and "has_ldflags" or "has_cflags")
     local flagskey = opt.program .. "_" .. (opt.programver or "")
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then

tests/apis/custom_toolchain/xmake/modules/detect/tools/find_ar6x.lua

@@ -0,0 +1,58 @@
+--!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-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_ar6x.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+
+-- check
+function _check(program)
+
+    -- make a stub object file
+    local libraryfile = os.tmpfile() .. ".a"
+    local objectfile  = os.tmpfile() .. ".o"
+    io.writefile(objectfile, "")
+
+    -- archive it
+    os.execv(program, {"-r", libraryfile, objectfile})
+
+    -- remove files
+    os.rm(objectfile)
+    os.rm(libraryfile)
+end
+
+-- find ar
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local ar = find_ar6x()
+-- local ar, version = find_ar6x({program = "xcrun -sdk macosx g++", version = true})
+--
+-- @endcode
+--
+function main(opt)
+    opt       = opt or {}
+    opt.check = opt.check or _check
+    return find_program(opt.program or "ar6x", opt)
+end
+

tests/apis/custom_toolchain/xmake/modules/detect/tools/find_cl6x.lua

@@ -0,0 +1,48 @@
+--!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-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_cl6x.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find cl6x
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local cl6x = find_cl6x()
+-- local cl6x, version = find_cl6x({program = "cl6x", version = true})
+--
+-- @endcode
+--
+function main(opt)
+    opt = opt or {}
+    opt.check = "--help"
+    opt.command = "--help"
+    local program = find_program(opt.program or "cl6x", opt)
+    local version = nil
+    if program and opt.version then
+        version = find_programver(program, opt)
+    end
+    return program, version
+end