add buildjobs and test

7 files changed, 116 insertions, 0 deletions

diff --git a/tests/apis/rules_order/src/main.c b/tests/apis/rules_order/src/main.c
new file mode 100644
index 000000000..d612d8782
--- /dev/null
+++ b/tests/apis/rules_order/src/main.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main(int argc, char** argv)
+{
+    return 0;
+}
diff --git a/tests/apis/rules_order/src/test.man b/tests/apis/rules_order/src/test.man
new file mode 100644
index 000000000..a17df88c2
--- /dev/null
+++ b/tests/apis/rules_order/src/test.man
@@ -0,0 +1 @@
+## hello xmake
diff --git a/tests/apis/rules_order/src/test.md b/tests/apis/rules_order/src/test.md
new file mode 100644
index 000000000..a17df88c2
--- /dev/null
+++ b/tests/apis/rules_order/src/test.md
@@ -0,0 +1 @@
+## hello xmake
diff --git a/tests/apis/rules_order/test.lua b/tests/apis/rules_order/test.lua
new file mode 100644
index 000000000..a4a38b0ce
--- /dev/null
+++ b/tests/apis/rules_order/test.lua
@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake")
+end
diff --git a/tests/apis/rules_order/xmake.lua b/tests/apis/rules_order/xmake.lua
new file mode 100644
index 000000000..4d383791c
--- /dev/null
+++ b/tests/apis/rules_order/xmake.lua
@@ -0,0 +1,32 @@
+
+rule("markdown")
+    add_deps("man", {order = true})
+    set_extensions(".md", ".markdown")
+    before_build_file(function (target, sourcefile)
+        print("before_build_file: %s", sourcefile)
+    end)
+    on_build_file(function (target, sourcefile)
+        print("after_build_file: %s", sourcefile)
+    end)
+    after_build_file(function (target, sourcefile)
+        print("after_build_file: %s", sourcefile)
+    end)
+
+rule("man")
+    set_extensions(".man")
+    before_build_file(function (target, sourcefile)
+        print("before_build_file: %s", sourcefile)
+    end)
+    on_build_file(function (target, sourcefile)
+        print("after_build_file: %s", sourcefile)
+    end)
+    after_build_file(function (target, sourcefile)
+        print("after_build_file: %s", sourcefile)
+    end)
+
+target("test")
+    set_kind("binary")
+    add_rules("markdown")
+    add_files("src/*.c")
+    add_files("src/*.md")
+    add_files("src/*.man")
diff --git a/xmake/actions/build/kinds/object.lua b/xmake/actions/build/kinds/object.lua
index 1ebee8e94..d0a1d33f3 100644
--- a/xmake/actions/build/kinds/object.lua
+++ b/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.async.buildjobs")
 import("private.utils.batchcmds")
 
 -- add batch jobs for the custom rule
diff --git a/xmake/modules/private/async/buildjobs.lua b/xmake/modules/private/async/buildjobs.lua
new file mode 100644
index 000000000..1861a3250
--- /dev/null
+++ b/xmake/modules/private/async/buildjobs.lua
@@ -0,0 +1,72 @@
+--!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        buildjobs.lua
+--
+
+-- imports
+import("core.base.hashset")
+
+-- build jobs for node dependencies
+function _build_jobs_for_nodedeps(nodes, jobs, rootjob, jobrefs, nodeinfo)
+    local targetjob_ref = jobrefs[nodeinfo.name]
+    if targetjob_ref then
+        jobs:add(targetjob_ref, rootjob)
+    else
+        local nodejob = jobs:add(nodeinfo.job, rootjob)
+        if nodejob then
+            jobrefs[nodeinfo.name] = nodejob
+            for _, depname in ipairs(nodeinfo.deps) do
+                local dep = nodes[depname]
+                if dep then
+                    _build_jobs_for_nodedeps(nodes, jobs, nodejob, jobrefs, dep)
+                end
+            end
+        end
+    end
+end
+
+-- build jobs
+--
+-- @code
+--[[
+    nodes["node1"] = {
+        name = "node1",
+        deps = {"node2", "node3"},
+        job = batchjobs:newjob("/job/node1", function(index, total)
+        end)
+    }
+--]]
+function main(nodes, jobs, rootjob)
+    local depset = hashset.new()
+    for _, nodeinfo in pairs(nodes) do
+        assert(nodeinfo.job)
+        for _, depname in ipairs(nodeinfo.deps) do
+            depset:insert(depname)
+        end
+    end
+    local nodes_root = {}
+    for _, nodeinfo in pairs(nodes) do
+        if not depset:has(nodeinfo.name) then
+            table.insert(nodes_root, nodeinfo)
+        end
+    end
+    local jobrefs = {}
+    for _, nodeinfo in pairs(nodes_root) do
+        _build_jobs_for_nodedeps(nodes, jobs, rootjob, jobrefs, nodeinfo)
+    end
+end