summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/modules_support/builder.lua
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2024-02-05 19:20:53 +0100
committerArthur LAURENT <[email protected]>2024-02-05 19:21:12 +0100
commitcf5c45be7013afc766e63f6d756f32d77ae426cc (patch)
treeee38ad8a02fa766feb13a8d22f3bb64f40133786 /xmake/rules/c++/modules/modules_support/builder.lua
parent359ad44c2c98b3a42325bb308b0657072edb622c (diff)
cleanup
Diffstat (limited to 'xmake/rules/c++/modules/modules_support/builder.lua')
-rw-r--r--xmake/rules/c++/modules/modules_support/builder.lua29
1 files changed, 4 insertions, 25 deletions
diff --git a/xmake/rules/c++/modules/modules_support/builder.lua b/xmake/rules/c++/modules/modules_support/builder.lua
index b3426736f..768c337ce 100644
--- a/xmake/rules/c++/modules/modules_support/builder.lua
+++ b/xmake/rules/c++/modules/modules_support/builder.lua
@@ -42,7 +42,7 @@ function _build_modules(target, sourcebatch, modules, opt)
goto CONTINUE
end
- local name, provide, cppfile = compiler_support.get_provided_module(module)
+ local name, _, cppfile = compiler_support.get_provided_module(module)
cppfile = cppfile or module.cppfile
local deps = {}
@@ -50,8 +50,7 @@ function _build_modules(target, sourcebatch, modules, opt)
table.insert(deps, opt.batchjobs and target:name() .. dep or dep)
end
- local fileconfig = target:fileconfig(cppfile)
- opt.build_module(deps, module, name, provide, objectfile, cppfile, fileconfig)
+ opt.build_module(deps, module, name, objectfile, cppfile)
::CONTINUE::
end
@@ -192,21 +191,10 @@ function build_modules_for_batchjobs(target, batchjobs, sourcebatch, modules, op
local modulesjobs = {}
_build_modules(target, sourcebatch, modules, table.join(opt, {
- build_module = function(deps, module, name, provide, objectfile, cppfile, fileconfig)
+ build_module = function(deps, module, name, objectfile, cppfile)
local job_name = name and target:name() .. name or cppfile
modulesjobs[job_name] = _builder(target).make_module_buildjobs(target, batchjobs, job_name, deps, {module = module, objectfile = objectfile, cppfile = cppfile})
-
- if provide and fileconfig and fileconfig.public then
- batchjobs:addjob(name .. "_metafile", function(index, total)
- local metafilepath = compiler_support.get_metafile(target, cppfile)
- depend.on_changed(function()
- progress.show((index * 100) / total, "${color.build.target}<%s> generating.module.metadata %s", target:name(), name)
- local metadata = _generate_meta_module_info(target, name, cppfile, module.requires)
- json.savefile(metafilepath, metadata)
- end, {dependfile = target:dependfile(metafilepath), files = {cppfile}, changed = target:is_rebuilt()})
- end, {rootjob = opt.rootjob})
- end
end
}))
@@ -222,17 +210,8 @@ function build_modules_for_batchcmds(target, batchcmds, sourcebatch, modules, op
-- build modules
_build_modules(target, sourcebatch, modules, table.join(opt, {
- build_module = function(_, module, name, provide, objectfile, cppfile, fileconfig)
+ build_module = function(_, module, _, objectfile, cppfile)
depmtime = math.max(depmtime, _builder(target).make_module_buildcmds(target, batchcmds, {module = module, cppfile = cppfile, objectfile = objectfile, progress = opt.progress}))
-
- if provide and fileconfig and fileconfig.public then
- local metafilepath = compiler_support.get_metafile(target, cppfile)
- depend.on_changed(function()
- progress.show(opt.progress, "${color.build.target}<%s> generating.module.metadata %s", target:name(), name)
- local metadata = _generate_meta_module_info(target, name, cppfile, module.requires)
- json.savefile(metafilepath, metadata)
- end, {dependfile = target:dependfile(metafilepath), files = {cppfile}, changed = target:is_rebuilt()})
- end
end
}))