improve build dependence

11 files changed, 34 insertions, 32 deletions

diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua
index 8b5ffcbd6..c9286a80b 100644
--- a/xmake/modules/core/tools/cl.lua
+++ b/xmake/modules/core/tools/cl.lua
@@ -369,7 +369,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     local objectdir = path.directory(objectfile)
@@ -384,7 +384,7 @@ function _compile1(self, sourcefile, objectfile, depinfo, flags)
 
             -- generate includes file
             local compflags = flags
-            if depinfo then
+            if dependinfo then
                 compflags = table.join(flags, "-showIncludes")
             end
             return os.iorunv(_compargv1(self, sourcefile, objectfile, compflags))
@@ -410,8 +410,9 @@ function _compile1(self, sourcefile, objectfile, depinfo, flags)
     }
 
     -- generate the dependent includes
-    if depinfo and outdata then
-        depinfo.includes = _include_deps(self, outdata)
+    if dependinfo and outdata then
+        dependinfo.files = dependinfo.files or {}
+        table.join2(dependinfo.files, _include_deps(self, outdata))
     end
 end
 
@@ -426,13 +427,13 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
 
diff --git a/xmake/modules/core/tools/dmd.lua b/xmake/modules/core/tools/dmd.lua
index a3c5c1f79..cb3565207 100644
--- a/xmake/modules/core/tools/dmd.lua
+++ b/xmake/modules/core/tools/dmd.lua
@@ -171,7 +171,7 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index a79c122c4..e0fa9a188 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -433,7 +433,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -485,8 +485,9 @@ function _compile1(self, sourcefile, objectfile, depinfo, flags)
     }
 
     -- generate the dependent includes
-    if depinfo and self:kind() ~= "as" then
-        depinfo.includes = _include_deps(self, sourcefile, flags)
+    if dependinfo and self:kind() ~= "as" then
+        dependinfo.files = dependinfo.files or {}
+        table.join2(dependinfo.files, _include_deps(self, sourcefile, flags))
     end
 end
 
@@ -501,12 +502,12 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
diff --git a/xmake/modules/core/tools/go.lua b/xmake/modules/core/tools/go.lua
index 538ac3c66..f092c3daa 100644
--- a/xmake/modules/core/tools/go.lua
+++ b/xmake/modules/core/tools/go.lua
@@ -131,7 +131,7 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua
index 5724ebc69..e706d242d 100644
--- a/xmake/modules/core/tools/ml.lua
+++ b/xmake/modules/core/tools/ml.lua
@@ -102,7 +102,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -122,12 +122,12 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
diff --git a/xmake/modules/core/tools/nvcc.lua b/xmake/modules/core/tools/nvcc.lua
index 551b25f8c..0e9a16dc2 100644
--- a/xmake/modules/core/tools/nvcc.lua
+++ b/xmake/modules/core/tools/nvcc.lua
@@ -242,7 +242,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -305,12 +305,12 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua
index 52d9c0100..4ff7a2faa 100644
--- a/xmake/modules/core/tools/rc.lua
+++ b/xmake/modules/core/tools/rc.lua
@@ -65,7 +65,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -109,13 +109,13 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
 
diff --git a/xmake/modules/core/tools/rustc.lua b/xmake/modules/core/tools/rustc.lua
index b8679f6e5..7be852edd 100644
--- a/xmake/modules/core/tools/rustc.lua
+++ b/xmake/modules/core/tools/rustc.lua
@@ -115,7 +115,7 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
diff --git a/xmake/modules/core/tools/swiftc.lua b/xmake/modules/core/tools/swiftc.lua
index d8b1e333c..7f72be37f 100644
--- a/xmake/modules/core/tools/swiftc.lua
+++ b/xmake/modules/core/tools/swiftc.lua
@@ -232,7 +232,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -252,12 +252,12 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
diff --git a/xmake/modules/core/tools/tcc.lua b/xmake/modules/core/tools/tcc.lua
index ad1939012..98c157edf 100644
--- a/xmake/modules/core/tools/tcc.lua
+++ b/xmake/modules/core/tools/tcc.lua
@@ -189,7 +189,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -252,12 +252,12 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end
 
diff --git a/xmake/modules/core/tools/yasm.lua b/xmake/modules/core/tools/yasm.lua
index 7eb8a32ab..aaa0c647c 100644
--- a/xmake/modules/core/tools/yasm.lua
+++ b/xmake/modules/core/tools/yasm.lua
@@ -91,7 +91,7 @@ function _compargv1(self, sourcefile, objectfile, flags)
 end
 
 -- complie the source file
-function _compile1(self, sourcefile, objectfile, depinfo, flags)
+function _compile1(self, sourcefile, objectfile, dependinfo, flags)
 
     -- ensure the object directory
     os.mkdir(path.directory(objectfile))
@@ -111,12 +111,12 @@ function compargv(self, sourcefiles, objectfile, flags)
 end
 
 -- complie the source file
-function compile(self, sourcefiles, objectfile, depinfo, flags)
+function compile(self, sourcefiles, objectfile, dependinfo, flags)
 
     -- only support single source file now
     assert(type(sourcefiles) ~= "table", "'object:sources' not support!")
 
     -- for only single source file
-    _compile1(self, sourcefiles, objectfile, depinfo, flags)
+    _compile1(self, sourcefiles, objectfile, dependinfo, flags)
 end