From 7ea104c3a8baf417f9d42be0132d913f73a652d4 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Tue, 21 Nov 2017 20:31:52 +0000 Subject: [PATCH] Build kerpack from source, remove binary. git-svn-id: svn://kolibrios.org@7118 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/common/kerpack | Bin 6421 -> 0 bytes .../other/outdated/kerpack/trunk/Tupfile.lua | 2 ++ .../other/outdated/kerpack/trunk/kerpack.asm | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 data/common/kerpack create mode 100644 programs/other/outdated/kerpack/trunk/Tupfile.lua diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 13895b97e5..3c9fbc4492 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -19,7 +19,6 @@ img_files = { {"ICONS32.PNG", "common/icons32.png"}, {"ICONS16.PNG", "common/icons16.png"}, {"INDEX.HTM", "common/index_htm"}, - {"KERPACK", "common/kerpack"}, {"KUZKINA.MID", "common/kuzkina.mid"}, {"LANG.INC", build_type .. "/lang.inc"}, {"NOTIFY3.PNG", "common/notify3.png"}, @@ -352,6 +351,7 @@ tup.append_table(img_files, { {"CROPFLAT", PROGS .. "/system/cropflat/cropflat"}, {"KBD", PROGS .. "/system/kbd/trunk/kbd"}, {"KPACK", PROGS .. "/other/kpack/trunk/kpack"}, + {"KERPACK", PROGS .. "/other/outdated/kerpack/trunk/kerpack"}, {"LAUNCHER", PROGS .. "/system/launcher/trunk/launcher"}, {"ESKIN", PROGS .. "/system/eskin/trunk/eskin"}, {"MAGNIFY", PROGS .. "/demos/magnify/trunk/magnify"}, diff --git a/data/common/kerpack b/data/common/kerpack deleted file mode 100644 index 511e23d2daab0a765ccd64373f1aee2768090f8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6421 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 diff --git a/programs/other/outdated/kerpack/trunk/Tupfile.lua b/programs/other/outdated/kerpack/trunk/Tupfile.lua new file mode 100644 index 0000000000..a782471730 --- /dev/null +++ b/programs/other/outdated/kerpack/trunk/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("kerpack.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "kerpack") diff --git a/programs/other/outdated/kerpack/trunk/kerpack.asm b/programs/other/outdated/kerpack/trunk/kerpack.asm index 2eecddb919..15345eac73 100644 --- a/programs/other/outdated/kerpack/trunk/kerpack.asm +++ b/programs/other/outdated/kerpack/trunk/kerpack.asm @@ -31,7 +31,7 @@ use32 dd 0 ;params dd 0 ;cur_dir_path ;--------------------------------------------------------------------- -include '../../../macros.inc' +include '../../../../macros.inc' ; do not touch "purge mov"!!! purge mov ; for the correct patch of loader ; do not touch "purge mov"!!! @@ -414,4 +414,4 @@ pack_length: rd 1 ; Compress data area end ;--------------------------------------------------------------------- I_END: -;--------------------------------------------------------------------- \ No newline at end of file +;---------------------------------------------------------------------