add find armlink, armar, armasm

8 files changed, 327 insertions, 8 deletions

diff --git a/xmake/modules/core/tools/armcc.lua b/xmake/modules/core/tools/armcc.lua
new file mode 100644
index 000000000..40854eb7a
--- /dev/null
+++ b/xmake/modules/core/tools/armcc.lua
@@ -0,0 +1,25 @@
+--!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        armcc.lua
+--
+
+inherit("gcc")
+
+function init(self)
+    _super.init(self)
+end
diff --git a/xmake/modules/core/tools/armclang.lua b/xmake/modules/core/tools/armclang.lua
new file mode 100644
index 000000000..42bec8fd5
--- /dev/null
+++ b/xmake/modules/core/tools/armclang.lua
@@ -0,0 +1,25 @@
+--!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        armclang.lua
+--
+
+inherit("gcc")
+
+function init(self)
+    _super.init(self)
+end
diff --git a/xmake/modules/detect/tools/find_armar.lua b/xmake/modules/detect/tools/find_armar.lua
new file mode 100644
index 000000000..725d6a988
--- /dev/null
+++ b/xmake/modules/detect/tools/find_armar.lua
@@ -0,0 +1,65 @@
+--!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_armar.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+import("detect.sdks.find_mdk")
+
+-- find armar
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local armar = find_armar()
+-- local armar, version = find_armar({program = "armar", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    opt.check = "-h"
+
+    -- find program
+    local program = find_program(opt.program or "armar.exe", opt)
+    if not program then
+        local mdk = find_mdk()
+        if mdk then
+            if mdk.sdkdir_armcc then
+                program = find_program(path.join(mdk.sdkdir_armcc, "bin", "armar.exe"), opt)
+            end
+            if not program and mdk.sdkdir_armclang then
+                program = find_program(path.join(mdk.sdkdir_armclang, "bin", "armar.exe"), opt)
+            end
+        end
+    end
+
+    -- 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.lua b/xmake/modules/detect/tools/find_armasm.lua
new file mode 100644
index 000000000..280333195
--- /dev/null
+++ b/xmake/modules/detect/tools/find_armasm.lua
@@ -0,0 +1,65 @@
+--!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.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()
+-- local armasm, version = find_armasm({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)
+    if not program then
+        local mdk = find_mdk()
+        if mdk then
+            if mdk.sdkdir_armcc then
+                program = find_program(path.join(mdk.sdkdir_armcc, "bin", "armasm.exe"), opt)
+            end
+            if not program and mdk.sdkdir_armclang then
+                program = find_program(path.join(mdk.sdkdir_armclang, "bin", "armasm.exe"), opt)
+            end
+        end
+    end
+
+    -- 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_armlink.lua b/xmake/modules/detect/tools/find_armlink.lua
new file mode 100644
index 000000000..3ab383c86
--- /dev/null
+++ b/xmake/modules/detect/tools/find_armlink.lua
@@ -0,0 +1,65 @@
+--!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_armlink.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+import("detect.sdks.find_mdk")
+
+-- find armlink
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local armlink = find_armlink()
+-- local armlink, version = find_armlink({program = "armlink", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+    opt.check = "-h"
+
+    -- find program
+    local program = find_program(opt.program or "armlink.exe", opt)
+    if not program then
+        local mdk = find_mdk()
+        if mdk then
+            if mdk.sdkdir_armcc then
+                program = find_program(path.join(mdk.sdkdir_armcc, "bin", "armlink.exe"), opt)
+            end
+            if not program and mdk.sdkdir_armclang then
+                program = find_program(path.join(mdk.sdkdir_armclang, "bin", "armlink.exe"), opt)
+            end
+        end
+    end
+
+    -- 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/armcc/xmake.lua b/xmake/toolchains/armcc/xmake.lua
new file mode 100644
index 000000000..1ba3a15eb
--- /dev/null
+++ b/xmake/toolchains/armcc/xmake.lua
@@ -0,0 +1,41 @@
+--!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        xmake.lua
+--
+
+toolchain("armcc")
+
+    set_homepage("https://www2.keil.com/mdk5/compiler/5")
+    set_description("ARM Compiler Version 5 of Keil MDK")
+
+    set_kind("standalone")
+
+    set_toolset("cc", "armcc")
+    set_toolset("cxx", "armcc")
+    set_toolset("ld", "armlink")
+    set_toolset("sh", "armlink")
+    set_toolset("ar", "armar")
+    set_toolset("ex", "armar")
+    set_toolset("as", "armasm")
+
+    on_check(function (toolchain)
+        return import("lib.detect.find_tool")("armcc")
+    end)
+
+    on_load(function (toolchain)
+    end)
diff --git a/xmake/toolchains/armclang/xmake.lua b/xmake/toolchains/armclang/xmake.lua
new file mode 100644
index 000000000..5461d2f3d
--- /dev/null
+++ b/xmake/toolchains/armclang/xmake.lua
@@ -0,0 +1,41 @@
+--!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        xmake.lua
+--
+
+toolchain("armclang")
+
+    set_homepage("https://www2.keil.com/mdk5/compiler/6")
+    set_description("ARM Compiler Version 6 of Keil MDK")
+
+    set_kind("standalone")
+
+    set_toolset("cc", "armclang")
+    set_toolset("cxx", "armclang")
+    set_toolset("ld", "armlink")
+    set_toolset("sh", "armlink")
+    set_toolset("ar", "armar")
+    set_toolset("ex", "armar")
+    set_toolset("as", "armasm")
+
+    on_check(function (toolchain)
+        return import("lib.detect.find_tool")("armclang")
+    end)
+
+    on_load(function (toolchain)
+    end)
diff --git a/xmake/toolchains/clang/xmake.lua b/xmake/toolchains/clang/xmake.lua
index cf184baf6..ea4a45e30 100644
--- a/xmake/toolchains/clang/xmake.lua
+++ b/xmake/toolchains/clang/xmake.lua
@@ -18,17 +18,13 @@
 -- @file        xmake.lua
 --
 
--- define toolchain
 toolchain("clang")
 
-    -- set homepage
     set_homepage("https://clang.llvm.org/")
     set_description("A C language family frontend for LLVM")
 
-    -- mark as standalone toolchain
     set_kind("standalone")
 
-    -- set toolset
     set_toolset("cc", "clang")
     set_toolset("cxx", "clang", "clang++")
     set_toolset("ld", "clang++", "clang")
@@ -40,15 +36,11 @@ toolchain("clang")
     set_toolset("mxx", "clang", "clang++")
     set_toolset("as", "clang")
 
-    -- check toolchain
     on_check(function (toolchain)
         return import("lib.detect.find_tool")("clang")
     end)
 
-    -- on load
     on_load(function (toolchain)
-
-        -- add march flags
         local march
         if toolchain:is_arch("x86_64", "x64") then
             march = "-m64"