fix all codes about sourcebatches

1 files changed, 6 insertions, 18 deletions

diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua
index 4c81c2890..a9f1adf93 100644
--- a/xmake/plugins/project/clang/compile_commands.lua
+++ b/xmake/plugins/project/clang/compile_commands.lua
@@ -55,21 +55,12 @@ function _make_object(jsonfile, target, sourcefile, objectfile)
     _g.firstline = false
 end
  
--- make each objects
-function _make_each_objects(jsonfile, target, sourcekind, sourcebatch)
+-- make objects
+function _make_objects(jsonfile, target, sourcekind, sourcebatch)
     for index, objectfile in ipairs(sourcebatch.objectfiles) do
         _make_object(jsonfile, target, sourcebatch.sourcefiles[index], objectfile)
     end
 end
- 
--- make single object
-function _make_single_object(jsonfile, target, sourcekind, sourcebatch)
-
-    -- not supported now, ignore it directly
-    for _, sourcefile in ipairs(table.wrap(sourcebatch.sourcefiles)) do
-        cprint("${bright color.warning}warning: ${clear}ignore[%s]: %s", target:name(), sourcefile)
-    end
-end
 
 -- make target
 function _make_target(jsonfile, target)
@@ -80,13 +71,10 @@ function _make_target(jsonfile, target)
     target:set("pcxxheader", nil)
 
     -- build source batches
-    for sourcekind, sourcebatch in pairs(target:sourcebatches()) do
-        if not sourcebatch.rulename then
-            if type(sourcebatch.objectfiles) == "string" then
-                _make_single_object(jsonfile, target, sourcekind, sourcebatch)
-            else
-                _make_each_objects(jsonfile, target, sourcekind, sourcebatch)
-            end
+    for _, sourcebatch in pairs(target:sourcebatches()) do
+        local sourcekind = sourcebatch.sourcekind
+        if sourcekind then
+            _make_objects(jsonfile, target, sourcekind, sourcebatch)
         end
     end
 end