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

Trying to fix TUP: rename @icon.asm to icon.asm #2

Browse Source 
git-svn-id: svn://kolibrios.org@7014 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2017-09-26 18:13:32 +00:00
parent ff4855eb6d
commit 3e898fb6aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/Tupfile.lua
View File

@ -308,13 +308,14 @@ end
if tup.getconfig('NO_FASM') ~= 'full' then if tup.getconfig('NO_FASM') ~= 'full' then
tup.append_table(img_files, { tup.append_table(img_files, {
{"KERNEL.MNT", "../kernel/trunk/kernel.mnt"}, {"KERNEL.MNT", "../kernel/trunk/kernel.mnt"},
{"@MENU", PROGS .. "/system/menu/trunk/menu"},
{"@VOLUME", PROGS .. "/media/volume/volume"},
{"@TASKBAR", PROGS .. "/system/taskbar/trunk/TASKBAR"},
{"@DOCKY", PROGS .. "/system/docky/trunk/docky"}, {"@DOCKY", PROGS .. "/system/docky/trunk/docky"},
{"@OPEN", PROGS .. "/system/open/open"}, {"@ICON", PROGS .. "/system/icon_new/icon"},
{"@MENU", PROGS .. "/system/menu/trunk/menu"},
{"@NOTIFY", PROGS .. "/system/notify3/notify"}, {"@NOTIFY", PROGS .. "/system/notify3/notify"},
{"@OPEN", PROGS .. "/system/open/open"},
{"@TASKBAR", PROGS .. "/system/taskbar/trunk/TASKBAR"},
{"@SS", PROGS .. "/system/ss/trunk/@ss"}, {"@SS", PROGS .. "/system/ss/trunk/@ss"},
{"@VOLUME", PROGS .. "/media/volume/volume"},
{"ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"}, {"ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"},
{"CALC", PROGS .. "/other/calc/trunk/calc"}, {"CALC", PROGS .. "/other/calc/trunk/calc"},
{"CALENDAR", PROGS .. "/system/calendar/trunk/calendar"}, {"CALENDAR", PROGS .. "/system/calendar/trunk/calendar"},
@ -330,7 +331,6 @@ tup.append_table(img_files, {
{"FSPEED", PROGS .. "/fs/fspeed/fspeed"}, {"FSPEED", PROGS .. "/fs/fspeed/fspeed"},
{"GMON", PROGS .. "/system/gmon/gmon"}, {"GMON", PROGS .. "/system/gmon/gmon"},
{"HDD_INFO", PROGS .. "/system/hdd_info/trunk/hdd_info"}, {"HDD_INFO", PROGS .. "/system/hdd_info/trunk/hdd_info"},
{"@ICON", PROGS .. "/system/icon_new/@icon"},
{"CROPFLAT", PROGS .. "/system/cropflat/cropflat"}, {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"},
{"KBD", PROGS .. "/system/kbd/trunk/kbd"}, {"KBD", PROGS .. "/system/kbd/trunk/kbd"},
{"KPACK", PROGS .. "/other/kpack/trunk/kpack"}, {"KPACK", PROGS .. "/other/kpack/trunk/kpack"},

2
programs/system/icon_new/Tupfile.lua
View File

@ -1,3 +1,3 @@
if tup.getconfig("NO_FASM") ~= "" then return end if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"}) tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
tup.rule({"icon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "@icon") tup.rule({"icon.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "icon")