diff options
| author | ruki <[email protected]> | 2024-02-02 22:53:07 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-02-02 22:53:07 +0800 |
| commit | 0e13da284bcf633da644d680fbc33f246124eda4 (patch) | |
| tree | f0f897124b7e3e49b04f3abf4721afef937589a5 | |
| parent | a204e49f7d3d39e27e621b3c5eb241c0021497a5 (diff) | |
rename apis
4 files changed, 16 insertions, 16 deletions
diff --git a/xmake/rules/c++/modules/modules_support/builder.lua b/xmake/rules/c++/modules/modules_support/builder.lua index c58f19510..5117b3a2c 100644 --- a/xmake/rules/c++/modules/modules_support/builder.lua +++ b/xmake/rules/c++/modules/modules_support/builder.lua @@ -214,7 +214,7 @@ function build_modules_for_batchjobs(target, batchjobs, sourcebatch, modules, op build_module = function(deps, build, module, name, provide, objectfile, cppfile, fileconfig) local job_name = name and target:name() .. name or cppfile - modulesjobs[job_name] = _builder(target).make_module_build_job(target, batchjobs, job_name, deps, {build = build, module = module, objectfile = objectfile, cppfile = cppfile}) + modulesjobs[job_name] = _builder(target).make_module_buildjobs(target, batchjobs, job_name, deps, {build = build, module = module, objectfile = objectfile, cppfile = cppfile}) if provide and fileconfig and fileconfig.public then batchjobs:addjob(name .. "_metafile", function(index, total) @@ -242,7 +242,7 @@ function build_modules_for_batchcmds(target, batchcmds, sourcebatch, modules, op -- build modules _build_modules(target, sourcebatch, modules, table.join(opt, { build_module = function(_, build, module, name, provide, objectfile, cppfile, fileconfig) - depmtime = math.max(depmtime, _builder(target).make_module_build_cmds(target, batchcmds, {build = build, module = module, cppfile = cppfile, objectfile = objectfile, progress = opt.progress})) + depmtime = math.max(depmtime, _builder(target).make_module_buildcmds(target, batchcmds, {build = build, 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) @@ -276,7 +276,7 @@ function build_headerunits_for_batchjobs(target, batchjobs, sourcebatch, modules _build_headerunits(target, headerunits, table.join(opt, { build_headerunit = function(headerunit, key, bmifile, outputdir, build) local job_name = target:name() .. key - local job = _builder(target).make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmifile, outputdir, table.join(opt, {build = build})) + local job = _builder(target).make_headerunit_buildjobs(target, job_name, batchjobs, headerunit, bmifile, outputdir, table.join(opt, {build = build})) if job then modulesjobs[job_name] = job end @@ -308,7 +308,7 @@ function build_headerunits_for_batchcmds(target, batchcmds, sourcebatch, modules local depmtime = 0 _build_headerunits(target, headerunits, table.join(opt, { build_headerunit = function(headerunit, _, bmifile, outputdir, build) - depmtime = math.max(depmtime, _builder(target).make_headerunit_build_cmds(target, batchcmds, headerunit, bmifile, outputdir, table.join({build = build}, opt))) + depmtime = math.max(depmtime, _builder(target).make_headerunit_buildcmds(target, batchcmds, headerunit, bmifile, outputdir, table.join({build = build}, opt))) end })) batchcmds:set_depmtime(depmtime) diff --git a/xmake/rules/c++/modules/modules_support/clang/builder.lua b/xmake/rules/c++/modules/modules_support/clang/builder.lua index d84bb0cd6..b9054dabf 100644 --- a/xmake/rules/c++/modules/modules_support/clang/builder.lua +++ b/xmake/rules/c++/modules/modules_support/clang/builder.lua @@ -190,7 +190,7 @@ function get_module_required_defines(target, sourcefile) end -- build module file for batchjobs -function make_module_build_job(target, batchjobs, job_name, deps, opt) +function make_module_buildjobs(target, batchjobs, job_name, deps, opt) local name, provide, _ = compiler_support.get_provided_module(opt.module) local bmifile = provide and compiler_support.get_bmi_path(provide.bmi) @@ -245,7 +245,7 @@ function make_module_build_job(target, batchjobs, job_name, deps, opt) end -- build module file for batchcmds -function make_module_build_cmds(target, batchcmds, opt) +function make_module_buildcmds(target, batchcmds, opt) local name, provide, _ = compiler_support.get_provided_module(opt.module) local bmifile = provide and compiler_support.get_bmi_path(provide.bmi) @@ -276,7 +276,7 @@ function make_module_build_cmds(target, batchcmds, opt) end -- build headerunit file for batchjobs -function make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmifile, outputdir, opt) +function make_headerunit_buildjobs(target, job_name, batchjobs, headerunit, bmifile, outputdir, opt) local already_exists = add_headerunit_to_target_mapper(target, headerunit, bmifile) if not already_exists then @@ -309,7 +309,7 @@ function make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmif end -- build headerunit file for batchcmds -function make_headerunit_build_cmds(target, batchcmds, headerunit, bmifile, outputdir, opt) +function make_headerunit_buildcmds(target, batchcmds, headerunit, bmifile, outputdir, opt) batchcmds:mkdir(outputdir) add_headerunit_to_target_mapper(target, headerunit, bmifile) diff --git a/xmake/rules/c++/modules/modules_support/gcc/builder.lua b/xmake/rules/c++/modules/modules_support/gcc/builder.lua index f0599c7f2..a82c779a2 100644 --- a/xmake/rules/c++/modules/modules_support/gcc/builder.lua +++ b/xmake/rules/c++/modules/modules_support/gcc/builder.lua @@ -226,7 +226,7 @@ function get_module_required_defines(target, sourcefile) end -- build module file for batchjobs -function make_module_build_job(target, batchjobs, job_name, deps, opt) +function make_module_buildjobs(target, batchjobs, job_name, deps, opt) local name, provide, _ = compiler_support.get_provided_module(opt.module) local bmifile = provide and compiler_support.get_bmi_path(provide.bmi) @@ -273,7 +273,7 @@ function make_module_build_job(target, batchjobs, job_name, deps, opt) end -- build module file for batchcmds -function make_module_build_cmds(target, batchcmds, opt) +function make_module_buildcmds(target, batchcmds, opt) local name, provide, _ = compiler_support.get_provided_module(opt.module) local module_mapperflag = compiler_support.get_modulemapperflag(target) @@ -304,7 +304,7 @@ function make_module_build_cmds(target, batchcmds, opt) end -- build headerunit file for batchjobs -function make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmifile, outputdir, opt) +function make_headerunit_buildjobs(target, job_name, batchjobs, headerunit, bmifile, outputdir, opt) local _headerunit = headerunit _headerunit.path = headerunit.type == ":quote" and "./" .. path.relative(headerunit.path) or headerunit.path @@ -345,7 +345,7 @@ function make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmif end -- build headerunit file for batchcmds -function make_headerunit_build_cmds(target, batchcmds, headerunit, bmifile, outputdir, opt) +function make_headerunit_buildcmds(target, batchcmds, headerunit, bmifile, outputdir, opt) local headerunit_mapper = _generate_headerunit_modulemapper_file({name = path.normalize(headerunit.path), bmifile = bmifile}) batchcmds:mkdir(outputdir) diff --git a/xmake/rules/c++/modules/modules_support/msvc/builder.lua b/xmake/rules/c++/modules/modules_support/msvc/builder.lua index 824989777..cca964c58 100644 --- a/xmake/rules/c++/modules/modules_support/msvc/builder.lua +++ b/xmake/rules/c++/modules/modules_support/msvc/builder.lua @@ -204,7 +204,7 @@ function get_module_required_defines(target, sourcefile) end -- build module file for batchjobs -function make_module_build_job(target, batchjobs, job_name, deps, opt) +function make_module_buildjobs(target, batchjobs, job_name, deps, opt) local name, provide, _ = compiler_support.get_provided_module(opt.module) local bmifile = provide and compiler_support.get_bmi_path(provide.bmi) @@ -254,7 +254,7 @@ function make_module_build_job(target, batchjobs, job_name, deps, opt) end -- build module file for batchcmds -function make_module_build_cmds(target, batchcmds, opt) +function make_module_buildcmds(target, batchcmds, opt) local name, provide, _ = compiler_support.get_provided_module(opt.module) local bmifile = provide and compiler_support.get_bmi_path(provide.bmi) @@ -281,7 +281,7 @@ function make_module_build_cmds(target, batchcmds, opt) end -- build headerunit file for batchjobs -function make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmifile, outputdir, opt) +function make_headerunit_buildjobs(target, job_name, batchjobs, headerunit, bmifile, outputdir, opt) local already_exists = add_headerunit_to_target_mapper(target, headerunit, bmifile) if not already_exists then @@ -316,7 +316,7 @@ function make_headerunit_build_job(target, job_name, batchjobs, headerunit, bmif end -- build headerunit file for batchcmds -function make_headerunit_build_cmds(target, batchcmds, headerunit, bmifile, outputdir, opt) +function make_headerunit_buildcmds(target, batchcmds, headerunit, bmifile, outputdir, opt) batchcmds:mkdir(outputdir) |
