From ff4855eb6d3222743d0c69b3c3bfcccfa0413220 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 26 Sep 2017 18:08:14 +0000 Subject: [PATCH] Trying to fix TUP: rename @icon.asm to icon.asm git-svn-id: svn://kolibrios.org@7013 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/icon_new/Tupfile.lua | 2 +- programs/system/icon_new/build_en.bat | 2 +- programs/system/icon_new/build_en.sh | 2 +- programs/system/icon_new/build_ru.bat | 2 +- programs/system/icon_new/{@icon.asm => icon.asm} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename programs/system/icon_new/{@icon.asm => icon.asm} (100%) diff --git a/programs/system/icon_new/Tupfile.lua b/programs/system/icon_new/Tupfile.lua index 2a68f5fee6..1883f19df2 100644 --- a/programs/system/icon_new/Tupfile.lua +++ b/programs/system/icon_new/Tupfile.lua @@ -1,3 +1,3 @@ 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({"@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") diff --git a/programs/system/icon_new/build_en.bat b/programs/system/icon_new/build_en.bat index ed8f495db9..f1bec8fe7a 100644 --- a/programs/system/icon_new/build_en.bat +++ b/programs/system/icon_new/build_en.bat @@ -1,5 +1,5 @@ @echo lang fix en >lang.inc -@fasm -m 16384 @icon.asm @icon +@fasm -m 16384 icon.asm @icon @erase lang.inc @kpack @icon @pause diff --git a/programs/system/icon_new/build_en.sh b/programs/system/icon_new/build_en.sh index ec2a0b774e..4eed0e41db 100644 --- a/programs/system/icon_new/build_en.sh +++ b/programs/system/icon_new/build_en.sh @@ -3,7 +3,7 @@ echo "lang fix en" echo "lang fix en" > lang.inc - fasm -m 16384 @icon.asm @icon + fasm -m 16384 icon.asm @icon kpack @icon rm -f lang.inc exit 0 diff --git a/programs/system/icon_new/build_ru.bat b/programs/system/icon_new/build_ru.bat index 5ae64da894..5277c10cf4 100644 --- a/programs/system/icon_new/build_ru.bat +++ b/programs/system/icon_new/build_ru.bat @@ -1,5 +1,5 @@ @echo lang fix ru >lang.inc -@fasm -m 16384 @icon.asm @icon +@fasm -m 16384 icon.asm @icon @erase lang.inc @kpack @icon @pause diff --git a/programs/system/icon_new/@icon.asm b/programs/system/icon_new/icon.asm similarity index 100% rename from programs/system/icon_new/@icon.asm rename to programs/system/icon_new/icon.asm