improve to find armasm

5 files changed, 321 insertions, 2 deletions

diff --git a/xmake/modules/core/tools/armasm64_msvc.lua b/xmake/modules/core/tools/armasm64_msvc.lua
new file mode 100644
index 000000000..cc710ca0a
--- /dev/null
+++ b/xmake/modules/core/tools/armasm64_msvc.lua
@@ -0,0 +1,23 @@
+--!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        armasm64_msvc.lua
+--
+
+-- imports
+inherit("armasm_msvc")
+
diff --git a/xmake/modules/core/tools/armasm_msvc.lua b/xmake/modules/core/tools/armasm_msvc.lua
new file mode 100644
index 000000000..10ddefce6
--- /dev/null
+++ b/xmake/modules/core/tools/armasm_msvc.lua
@@ -0,0 +1,188 @@
+--!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        armasm_msvc.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.base.global")
+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   = "-Os"
+    ,   aggressive = "-Ofast"
+    }
+    return maps[level]
+end
+
+-- make the language flag
+function nf_language(self, stdname)
+
+    -- the stdc maps
+    if _g.cmaps == nil then
+        _g.cmaps =
+        {
+            ansi        = "-c89"
+        ,   c89         = "-c89"
+        ,   gnu89       = "-c89"
+        ,   c99         = "-c99"
+        ,   gnu99       = "-c99"
+        ,   c11         = "-c11"
+        ,   gnu11       = "-c11"
+        ,   clatest     = {"-c11", "-c99", "-c89"}
+        ,   gnulatest   = {"-c11", "-c99", "-c89"}
+        }
+    end
+    local maps = _g.cmaps
+    local result = maps[stdname]
+    if type(result) == "table" then
+        for _, v in ipairs(result) do
+            if self:has_flags(v, "cxflags") then
+                result = v
+                maps[stdname] = result
+                return result
+            end
+        end
+    else
+        return result
+    end
+end
+
+-- make runtime flag
+function nf_runtime(self, runtime)
+    if runtime == "microlib" then
+        return {"--pd", "__MICROLIB SETA 1"}
+    end
+end
+
+-- make the define flag
+-- eg.
+-- add_defines("MACRO") -> --pd "MACRO  SETA 1
+-- add_defines("MACRO=3") -> --pd "MACRO SETA 3"
+function nf_define(self, macro)
+    local def = macro:split("=")
+    local key = def[1]:trim()
+    local value = "1"
+    if #def == 2 then
+        value = def[2]:trim()
+    end
+    return {"--pd", key .. " SETA " .. value}
+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 compile arguments list
+function compargv(self, sourcefile, objectfile, flags)
+    return self:program(), table.join(flags, "-o", objectfile, sourcefile)
+end
+
+-- compile the source file
+function compile(self, sourcefile, objectfile, dependinfo, flags)
+
+    -- ensure the object directory
+    os.mkdir(path.directory(objectfile))
+
+    -- compile it
+    try
+    {
+        function ()
+            local outdata, errdata = os.iorunv(compargv(self, sourcefile, objectfile, flags))
+            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 (option.get("verbose") or option.get("warning") or global.get("build_warning")) then
+                    if progress.showing_without_scroll() then
+                        print("")
+                    end
+                    cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+                end
+            end
+        }
+    }
+end
+
+
+
diff --git a/xmake/modules/detect/tools/find_armasm64_msvc.lua b/xmake/modules/detect/tools/find_armasm64_msvc.lua
new file mode 100644
index 000000000..d485606c3
--- /dev/null
+++ b/xmake/modules/detect/tools/find_armasm64_msvc.lua
@@ -0,0 +1,54 @@
+--!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_armasm64_msvc.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+import("detect.sdks.find_mdk")
+
+-- find armasm
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local armasm = find_armasm64_msvc()
+-- local armasm, version = find_armasm64_msvc({program = "armasm64", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    opt.check = "-h"
+
+    -- find program
+    local program = find_program(opt.program or "armasm64.exe", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt.version then
+        version = find_programver(program, opt)
+    end
+    return program, version
+end
diff --git a/xmake/modules/detect/tools/find_armasm_msvc.lua b/xmake/modules/detect/tools/find_armasm_msvc.lua
new file mode 100644
index 000000000..49209ccef
--- /dev/null
+++ b/xmake/modules/detect/tools/find_armasm_msvc.lua
@@ -0,0 +1,54 @@
+--!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_armasm_msvc.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+import("detect.sdks.find_mdk")
+
+-- find armasm
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local armasm = find_armasm_msvc()
+-- local armasm, version = find_armasm_msvc({program = "armasm", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    opt.check = "-h"
+
+    -- find program
+    local program = find_program(opt.program or "armasm.exe", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt.version then
+        version = find_programver(program, opt)
+    end
+    return program, version
+end
diff --git a/xmake/toolchains/msvc/load.lua b/xmake/toolchains/msvc/load.lua
index ddd6f2d25..74e119e35 100644
--- a/xmake/toolchains/msvc/load.lua
+++ b/xmake/toolchains/msvc/load.lua
@@ -49,9 +49,9 @@ function main(toolchain)
     if toolchain:is_arch("x86") then
         toolchain:set("toolset", "as",  "ml.exe")
     elseif toolchain:is_arch("arm64") then
-        toolchain:set("toolset", "as",  "armasm64.exe")
+        toolchain:set("toolset", "as",  "[email protected]")
     elseif toolchain:is_arch("arm.*") then
-        toolchain:set("toolset", "as",  "armasm.exe")
+        toolchain:set("toolset", "as",  "[email protected]")
     else
         toolchain:set("toolset", "as",  "ml64.exe")
     end