summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoral1-ce <[email protected]>2024-07-05 13:05:13 +0300
committeral1-ce <[email protected]>2024-07-05 13:05:13 +0300
commit3bdf20ec3046c24b52cff3442b87a9e997fe6905 (patch)
tree4b4ab767699eddec58a80b59bd7866dfe7c25b05
parent1421536bb40e231b59cfbafa87e2c23ef5e86c4e (diff)
Rename build variable and add per file progress message
-rw-r--r--xmake/rules/vala/xmake.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/rules/vala/xmake.lua b/xmake/rules/vala/xmake.lua
index 15c76dc2c..c76fc9800 100644
--- a/xmake/rules/vala/xmake.lua
+++ b/xmake/rules/vala/xmake.lua
@@ -116,17 +116,17 @@ rule("vala.build")
-- if it's only a vala file
if path.extension(sourcefile) == ".vala" then
table.insert(argv, path(sourcefile))
+ batchcmds:show_progress(opt.progress, "${color.build.object}compiling.vala %s", sourcefile)
end
end
- batchcmds:show_progress(opt.progress, "${color.build.object}compiling.vala")
batchcmds:vrunv(valac.program, argv)
end)
- on_buildcmd_file(function (target, batchcmds, sourcebatch, opt)
+ on_buildcmd_file(function (target, batchcmds, sourcefile, opt)
-- Again, only vala files need special treatment
- if path.extension(sourcebatch) == ".vala" then
- local sourcefile_c = target:autogenfile((sourcebatch:gsub(".vala$", ".c")))
+ if path.extension(sourcefile) == ".vala" then
+ local sourcefile_c = target:autogenfile((sourcefile:gsub(".vala$", ".c")))
local basedir = path.directory(sourcefile_c)
batchcmds:mkdir(basedir)
@@ -134,7 +134,7 @@ rule("vala.build")
local objectfile = target:objectfile(sourcefile_c)
table.insert(target:objectfiles(), objectfile)
- batchcmds:add_depfiles(sourcebatch)
+ batchcmds:add_depfiles(sourcefile)
batchcmds:set_depmtime(os.mtime(objectfile))
batchcmds:set_depcache(target:dependfile(objectfile))