diff options
| author | ruki <[email protected]> | 2025-04-01 00:51:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2025-04-08 15:31:57 +0800 |
| commit | f4706b4b526fe88f5849eb0daa3a4d0713862d0c (patch) | |
| tree | 3f001a2ed26964f28e3daeb06f9f0ea73e486c98 | |
| parent | 530148989c8d444e78e0b1d8be4157cf5b3e8c46 (diff) | |
fix script name
| -rw-r--r-- | xmake/actions/build/target_utils.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/actions/build/target_utils.lua b/xmake/actions/build/target_utils.lua index b242c0a58..3a1013ef9 100644 --- a/xmake/actions/build/target_utils.lua +++ b/xmake/actions/build/target_utils.lua @@ -139,7 +139,7 @@ function add_targetjobs_for_script(jobgraph, target, instance, opt) -- target("test") -- on_build(function (target, opt) -- end) - local jobname = string.format("%s/%s/%s", instance == target and "target" or "rule", instance:fullname(), script_name) + local jobname = string.format("%s/%s/%s", target:fullname(), instance:fullname(), script_name) jobgraph:add(jobname, function (index, total, opt) script(target, {progress = opt.progress}) end) @@ -158,7 +158,7 @@ function add_targetjobs_for_script(jobgraph, target, instance, opt) local scriptcmd_name = opt.scriptcmd_name local scriptcmd = instance:script(scriptcmd_name) if scriptcmd then - local jobname = string.format("%s/%s/%s", instance == target and "target" or "rule", instance:fullname(), scriptcmd_name) + local jobname = string.format("%s/%s/%s", target:fullname(), instance:fullname(), scriptcmd_name) jobgraph:add(jobname, function (index, total, opt) local batchcmds_ = batchcmds.new({target = target}) scriptcmd(target, batchcmds_, {progress = opt.progress}) @@ -333,7 +333,7 @@ function add_filejobs_for_script(jobgraph, target, instance, sourcebatch, opt) -- target("test") -- on_build_files(function (target, sourcebatch, opt) -- end) - local jobname = string.format("%s/%s/%s", instance == target and "target" or "rule", instance:fullname(), script_files_name) + local jobname = string.format("%s/%s/%s", target:fullname(), instance:fullname(), script_files_name) jobgraph:add(jobname, function (index, total, opt) script_files(target, sourcebatch, {progress = opt.progress, distcc = distcc}) end) @@ -369,7 +369,7 @@ function add_filejobs_for_script(jobgraph, target, instance, sourcebatch, opt) -- target("test") -- on_build_file(function (target, sourcefile, opt) -- end) - local jobname = string.format("%s/%s/%s", instance == target and "target" or "rule", instance:fullname(), script_file_name) + local jobname = string.format("%s/%s/%s", target:fullname(), instance:fullname(), script_file_name) jobgraph:add(jobname, function (index, total, opt) local sourcekind = sourcebatch.sourcekind for _, sourcefile in ipairs(sourcebatch.sourcefiles) do @@ -392,7 +392,7 @@ function add_filejobs_for_script(jobgraph, target, instance, sourcebatch, opt) local scriptcmd_files = instance:script(scriptcmd_files_name) if scriptcmd_files then local distcc = instance:extraconf(scriptcmd_files_name, "distcc") - local jobname = string.format("%s/%s/%s", instance == target and "target" or "rule", instance:fullname(), scriptcmd_files_name) + local jobname = string.format("%s/%s/%s", target:fullname(), instance:fullname(), scriptcmd_files_name) jobgraph:add(jobname, function (index, total, opt) local batchcmds_ = batchcmds.new({target = target}) scriptcmd_files(target, batchcmds_, sourcebatch, {progress = opt.progress, distcc = distcc}) @@ -413,7 +413,7 @@ function add_filejobs_for_script(jobgraph, target, instance, sourcebatch, opt) local scriptcmd_file = instance:script(scriptcmd_file_name) if scriptcmd_file then local distcc = instance:extraconf(scriptcmd_file_name, "distcc") - local jobname = string.format("%s/%s/%s", instance == target and "target" or "rule", instance:fullname(), scriptcmd_file_name) + local jobname = string.format("%s/%s/%s", target:fullname(), instance:fullname(), scriptcmd_file_name) jobgraph:add(jobname, function (index, total, opt) local batchcmds_ = batchcmds.new({target = target}) local sourcekind = sourcebatch.sourcekind |
