Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

tup began to track dot-files as well, switch to an out-of-tree script to get the current revision

Browse Source 
git-svn-id: svn://kolibrios.org@8060 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
CleverMouse 2020-09-10 16:46:01 +00:00
parent 5531c1c36c
commit dd9ab58a5e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/Tupfile.lua
View File

@ -764,6 +764,7 @@ for i,v in ipairs(img_dirs) do
end end
end end
-- copy files -- copy files
output_deps = {"kolibri.img"}
for i,v in ipairs(img_files) do for i,v in ipairs(img_files) do
local_file = v[2] local_file = v[2]
if v[1] == "KERNEL.MNT" and tup.getconfig("INSERT_REVISION_ID") ~= "" if v[1] == "KERNEL.MNT" and tup.getconfig("INSERT_REVISION_ID") ~= ""
@ -773,8 +774,8 @@ for i,v in ipairs(img_files) do
-- note that .revision and .kernel.mnt must begin with . -- note that .revision and .kernel.mnt must begin with .
-- to prevent tup from tracking them -- to prevent tup from tracking them
if build_type == "rus" if build_type == "rus"
then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(cat .revision)]"|iconv -f utf8 -t cp866)' then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-revision)]"|iconv -f utf8 -t cp866)'
else str='$(date -u +"[auto-build %d %b %Y %R, r$(cat .revision)]")' else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-revision)]")'
end end
str = string.gsub(str, "%$", "\\$") -- escape $ as \$ str = string.gsub(str, "%$", "\\$") -- escape $ as \$
str = string.gsub(str, "%%", "%%%%") -- escape % as %% str = string.gsub(str, "%%", "%%%%") -- escape % as %%
@ -782,12 +783,13 @@ for i,v in ipairs(img_files) do
make_img_command = make_img_command .. " && str=" .. str make_img_command = make_img_command .. " && str=" .. str
make_img_command = make_img_command .. ' && echo -n $str | dd of=.kernel.mnt bs=1 seek=`expr 279 - length "$str"` conv=notrunc 2>/dev/null' make_img_command = make_img_command .. ' && echo -n $str | dd of=.kernel.mnt bs=1 seek=`expr 279 - length "$str"` conv=notrunc 2>/dev/null'
local_file = ".kernel.mnt" local_file = ".kernel.mnt"
table.insert(output_deps, local_file)
end end
make_img_command = make_img_command .. ' && mcopy -moi kolibri.img "' .. local_file .. '" "::' .. v[1] .. '"' make_img_command = make_img_command .. ' && mcopy -moi kolibri.img "' .. local_file .. '" "::' .. v[1] .. '"'
end end
-- generate tup rule for kolibri.img -- generate tup rule for kolibri.img
tup.definerule{inputs = input_deps, command = make_img_command, outputs = {"kolibri.img"}} tup.definerule{inputs = input_deps, command = make_img_command, outputs = output_deps}
tup.definerule{inputs = {"../kernel/trunk/boot/uefi4kos.asm", "kolibri.img", "../kernel/trunk/kernel.bin"}, command = "fasm ../kernel/trunk/boot/uefi4kos.asm %o", outputs = {"kolibri.efi"}} tup.definerule{inputs = {"../kernel/trunk/boot/uefi4kos.asm", "kolibri.img", "../kernel/trunk/kernel.bin"}, command = "fasm ../kernel/trunk/boot/uefi4kos.asm %o", outputs = {"kolibri.efi"}}
-- generate command and dependencies for mkisofs -- generate command and dependencies for mkisofs