Merge pull request #2697 from as564335sa/dev

Support for incremental compilation and parse header file deps for keil/armcc/armclang

3 files changed, 98 insertions, 1 deletions

diff --git a/xmake/modules/core/project/depend.lua b/xmake/modules/core/project/depend.lua
index 89a517c07..632ecd70f 100644
--- a/xmake/modules/core/project/depend.lua
+++ b/xmake/modules/core/project/depend.lua
@@ -25,6 +25,7 @@ import("private.tools.cl.parse_deps", {alias = "parse_deps_cl"})
 import("private.tools.cl.parse_deps_json", {alias = "parse_deps_cl_json"})
 import("private.tools.rc.parse_deps", {alias = "parse_deps_rc"})
 import("private.tools.gcc.parse_deps", {alias = "parse_deps_gcc"})
+import("private.tools.armcc.parse_deps", {alias = "parse_deps_armcc"})
 
 -- load depfiles
 function _load_depfiles(parser, dependinfo, depfiles)
@@ -58,6 +59,9 @@ function load(dependfile)
             elseif dependinfo.depfiles_rc then
                 _load_depfiles(parse_deps_rc, dependinfo, dependinfo.depfiles_rc)
                 dependinfo.depfiles_rc = nil
+            elseif dependinfo.depfiles_armcc then
+                _load_depfiles(parse_deps_armcc, dependinfo, dependinfo.depfiles_armcc)
+                dependinfo.depfiles_armcc = nil
             end
             return dependinfo
         end
diff --git a/xmake/modules/core/tools/armcc.lua b/xmake/modules/core/tools/armcc.lua
index 403e143f0..9121e3a04 100644
--- a/xmake/modules/core/tools/armcc.lua
+++ b/xmake/modules/core/tools/armcc.lua
@@ -131,10 +131,16 @@ function compile(self, sourcefile, objectfile, dependinfo, flags)
     os.mkdir(path.directory(objectfile))
 
     -- compile it
+    local depfile = dependinfo and os.tmpfile() or nil
     try
     {
         function ()
-            local outdata, errdata = os.iorunv(compargv(self, sourcefile, objectfile, flags))
+            
+            local compflags = flags
+            if depfile then
+                compflags = table.join(compflags, "--depend", depfile)
+            end
+            local outdata, errdata = os.iorunv(compargv(self, sourcefile, objectfile, compflags))
             return (outdata or "") .. (errdata or "")
         end,
         catch
@@ -175,6 +181,16 @@ function compile(self, sourcefile, objectfile, dependinfo, flags)
                     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_armcc = io.readfile(depfile, {continuation = "\\"})
+                    end
+
+                    -- remove the temporary dependent file
+                    os.tryrm(depfile)
+                end
             end
         }
     }
diff --git a/xmake/modules/private/tools/armcc/parse_deps.lua b/xmake/modules/private/tools/armcc/parse_deps.lua
new file mode 100644
index 000000000..b4cfb7833
--- /dev/null
+++ b/xmake/modules/private/tools/armcc/parse_deps.lua
@@ -0,0 +1,77 @@
+--!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      smalli
+-- @file        parse_deps_armcc.lua
+--
+
+-- imports
+import("core.project.project")
+import("core.base.hashset")
+
+-- a placeholder for spaces in path
+local space_placeholder = "\001"
+
+-- normailize path of a dependecy
+function _normailize_dep(dep, projectdir)
+    if path.is_absolute(dep) then
+        dep = path.translate(dep)
+    else
+        dep = path.absolute(dep, projectdir)
+    end
+    if dep:startswith(projectdir) then
+        return path.relative(dep, projectdir)
+    else
+        return dep
+    end
+end
+
+-- parse depsfiles from string
+--
+-- parse_deps(io.readfile(depfile, {continuation = "\\"}))
+--
+-- eg.
+-- build\\.objs\\apps\\cross\\cortex-m3\\release\\APPS\\main.c.o: APPS\\main.c\
+-- build\\.objs\\apps\\cross\\cortex-m3\\release\\APPS\\main.c.o: D:\\Keil533\\ARM\\ARMCC\\bin\\..\\include\\stdarg.h\
+-- build\\.objs\\apps\\cross\\cortex-m3\\release\\APPS\\main.c.o: D:\\Keil533\\ARM\\ARMCC\\bin\\..\\include\\stdio.h\
+-- build\\.objs\\apps\\cross\\cortex-m3\\release\\APPS\\main.c.o: D:\\Keil533\\ARM\\ARMCC\\bin\\..\\include\\string.h\
+-- build\\.objs\\apps\\cross\\cortex-m3\\release\\APPS\\main.c.o: APPS\\main.h\
+--
+--
+function main(depsdata)
+
+    local block = 0
+    local results = hashset.new()
+    local projectdir = os.projectdir()
+    local line = depsdata:rtrim() -- maybe there will be an empty newline at the end. so we trim it first
+    local plain = {plain = true}
+    line = line:replace("\\ ", space_placeholder, plain)
+    for _, includefile in ipairs(line:split('\n', plain)) do
+        if is_host("windows") and includefile:match("^%w\\:") then
+            includefile = includefile:replace("\\:", ":", plain)
+        end
+        includefile = includefile:replace(space_placeholder, ' ', plain)
+        includefile = includefile:split(".o:", {plain = true})[2]
+        includefile = includefile:replace(' ', '', plain)
+        if #includefile > 0 then
+            includefile = _normailize_dep(includefile, projectdir)
+            if includefile then
+                results:insert(includefile)
+            end
+        end
+    end
+    return results:to_array()
+end