improve rules and generators

.gitignore

@@ -24,6 +24,9 @@ winenv/
 *.7z
 *.run
 
+# for compiler
+compile_commands.json
+
 # Makefile generation
 /core/xmake.config.h
 /core/.config.mak

xmake/actions/build/kinds/object.lua

@@ -24,6 +24,7 @@ import("core.project.rule")
 import("core.project.config")
 import("core.project.project")
 import("private.async.runjobs")
+import("private.utils.batchcmds")
 
 -- add batch jobs for the custom rule
 function _add_batchjobs_for_rule(batchjobs, rootjob, target, sourcebatch, suffix)
@@ -32,7 +33,7 @@ function _add_batchjobs_for_rule(batchjobs, rootjob, target, sourcebatch, suffix
     local rulename = assert(sourcebatch.rulename, "unknown rule for sourcebatch!")
     local ruleinst = assert(project.rule(rulename) or rule.rule(rulename), "unknown rule: %s", rulename)
 
-    -- add batch jobs
+    -- add batch jobs for xx_build_files
     local scriptname = "build_files" .. (suffix and ("_" .. suffix) or "")
     local script = ruleinst:script(scriptname)
     if script then
@@ -43,7 +44,10 @@ function _add_batchjobs_for_rule(batchjobs, rootjob, target, sourcebatch, suffix
                 script(target, sourcebatch, {progress = (index * 100) / total})
             end, rootjob)
         end
-    else
+    end
+
+    -- add batch jobs for xx_build_file
+    if not script then
         scriptname = "build_file" .. (suffix and ("_" .. suffix) or "")
         script = ruleinst:script(scriptname)
         if script then
@@ -55,6 +59,35 @@ function _add_batchjobs_for_rule(batchjobs, rootjob, target, sourcebatch, suffix
             end
         end
     end
+
+    -- add batch jobs for xx_buildcmd_files
+    if not script then
+        scriptname = "buildcmd_files" .. (suffix and ("_" .. suffix) or "")
+        script = ruleinst:script(scriptname)
+        if script then
+            batchjobs:addjob("rule/" .. rulename .. "/" .. scriptname, function (index, total)
+                local batchcmds_ = batchcmds.new({target = target})
+                script(target, batchcmds_, sourcebatch, {progress = (index * 100) / total})
+                batchcmds_:runcmds({dryrun = option.get("dry-run")})
+            end, rootjob)
+        end
+    end
+
+    -- add batch jobs for xx_buildcmd_file
+    if not script then
+        scriptname = "buildcmd_file" .. (suffix and ("_" .. suffix) or "")
+        script = ruleinst:script(scriptname)
+        if script then
+            local sourcekind = sourcebatch.sourcekind
+            for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
+                batchjobs:addjob(sourcefile, function (index, total)
+                    local batchcmds_ = batchcmds.new({target = target})
+                    script(target, batchcmds_, sourcefile, {sourcekind = sourcekind, progress = (index * 100) / total})
+                    batchcmds_:runcmds({dryrun = option.get("dry-run")})
+                end, rootjob)
+            end
+        end
+    end
 end
 
 -- add batch jobs for target

xmake/core/project/rule.lua

@@ -173,6 +173,9 @@ function rule.apis()
         ,   "rule.on_package"
         ,   "rule.on_install"
         ,   "rule.on_uninstall"
+        ,   "rule.on_buildcmd"
+        ,   "rule.on_buildcmd_file"
+        ,   "rule.on_buildcmd_files"
             -- rule.before_xxx
         ,   "rule.before_run"
         ,   "rule.before_load"
@@ -184,6 +187,9 @@ function rule.apis()
         ,   "rule.before_package"
         ,   "rule.before_install"
         ,   "rule.before_uninstall"
+        ,   "rule.before_buildcmd"
+        ,   "rule.before_buildcmd_file"
+        ,   "rule.before_buildcmd_files"
             -- rule.after_xxx
         ,   "rule.after_run"
         ,   "rule.after_load"
@@ -195,6 +201,9 @@ function rule.apis()
         ,   "rule.after_package"
         ,   "rule.after_install"
         ,   "rule.after_uninstall"
+        ,   "rule.after_buildcmd"
+        ,   "rule.after_buildcmd_file"
+        ,   "rule.after_buildcmd_files"
         }
     }
 end

xmake/modules/private/action/require/impl/install_packages.lua

@@ -422,7 +422,7 @@ function main(requires, opt)
     -- fetch and register packages (with system) from local first
     runjobs("fetch_packages", function (index)
         local instance = packages[index]
-        if instance and (not option.get("force") or (option.get("shallow") and instance:is_toplevel())) then
+        if instance and (not option.get("force") or (option.get("shallow") and not instance:is_toplevel())) then
             instance:envs_enter()
             instance:fetch()
             instance:envs_leave()