diff options
| author | ruki <[email protected]> | 2020-03-10 23:00:11 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-03-10 12:01:11 +0800 |
| commit | f3d3ca766a2d6486de98ae6b492ec2ff2aa60657 (patch) | |
| tree | c2cc6fc35262c48fa3bc7960a872bdfde9e7b4e5 /xmake/actions/build/kinds/binary.lua | |
| parent | fb3610ea1dbfbb31cc05d7dc272fa0dd7c825893 (diff) | |
rewrite action/build
Diffstat (limited to 'xmake/actions/build/kinds/binary.lua')
| -rw-r--r-- | xmake/actions/build/kinds/binary.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua index c11fadd7c..83b47d50d 100644 --- a/xmake/actions/build/kinds/binary.lua +++ b/xmake/actions/build/kinds/binary.lua @@ -24,7 +24,7 @@ import("core.theme.theme") import("core.tool.linker") import("core.tool.compiler") import("core.project.depend") -import("object") +import("object", {alias = "add_batchjobs_for_object"}) -- do link target function _do_link_target(target, opt) @@ -134,7 +134,7 @@ function _link_target(target, opt) end -- on link - target:script("link", _on_link_target)(target, table.join(opt, {origin = _do_link_target})) + target:script("link", _on_link_target)(target, opt) -- do after link for target local after_link = target:script("link_after") @@ -151,8 +151,10 @@ function _link_target(target, opt) end end --- build binary target -function build(target, opt) - object.build(target, opt) - _link_target(target, opt) +-- add batch jobs for building binary target +function main(batchjobs, rootjob, target) + local job_link = batchjobs:addjob(target:name() .. "/link", function (index, total) + _link_target(target, {progress = (index * 100) / total}) + end) + return add_batchjobs_for_object(batchjobs, job_link, target) end |
