From 1d529167e79adedda84557af79c8e08ced2b31c0 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 23 May 2025 17:29:03 +0100 Subject: [PATCH] develop/heed: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. --- data/Tupfile.lua | 2 +- programs/build_all.bat | 4 ++-- programs/develop/heed/{trunk => }/Tupfile.lua | 2 +- programs/develop/heed/{trunk => }/build.sh | 0 programs/develop/heed/{trunk => }/build_en.bat | 0 programs/develop/heed/{trunk => }/build_ru.bat | 0 programs/develop/heed/{trunk => }/cp1251-8x16 | Bin programs/develop/heed/{trunk => }/cp866-8x16 | Bin programs/develop/heed/{trunk => }/heed.asm | 16 +++++++++++----- programs/develop/heed/{trunk => }/koi8-r-8x16 | Bin 10 files changed, 15 insertions(+), 9 deletions(-) rename programs/develop/heed/{trunk => }/Tupfile.lua (79%) rename programs/develop/heed/{trunk => }/build.sh (100%) rename programs/develop/heed/{trunk => }/build_en.bat (100%) rename programs/develop/heed/{trunk => }/build_ru.bat (100%) rename programs/develop/heed/{trunk => }/cp1251-8x16 (100%) rename programs/develop/heed/{trunk => }/cp866-8x16 (100%) rename programs/develop/heed/{trunk => }/heed.asm (99%) rename programs/develop/heed/{trunk => }/koi8-r-8x16 (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 5c493b928..59d4ac632 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -477,7 +477,7 @@ tup.append_table(img_files, { {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"}, {"DEVELOP/PIPET", VAR_PROGS .. "/other/pipet/pipet"}, {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/h2d2b"}, - {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/trunk/heed"}, + {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/heed"}, {"DEVELOP/MTDBG", VAR_PROGS .. "/develop/mtdbg/mtdbg"}, {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"}, {"DEVELOP/SCANCODE", VAR_PROGS .. "/develop/scancode/trunk/scancode"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 1be34a785..a0aed1637 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -89,7 +89,7 @@ echo * fasm develop\cmd\trunk\cmd.asm %BIN%\cmd fasm develop\fasm\trunk\fasm.asm %BIN%\develop\fasm fasm develop\h2d2b\h2d2b.asm %BIN%\develop\h2d2b -fasm develop\heed\trunk\heed.asm %BIN%\demos\heed +fasm develop\heed\heed.asm %BIN%\demos\heed rem fasm develop\hexview\trunk\hexview.asm hexview fasm develop\keyascii\trunk\keyascii.asm %BIN%\develop\keyascii fasm develop\mtdbg\mtdbg.asm %BIN%\develop\mtdbg @@ -235,7 +235,7 @@ fasm media\kiv\kiv.asm %BIN%\nightbuild\kiv fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot fasm media\animage\animage.asm %BIN%\nightbuild\animage fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp -fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed +fasm develop\heed\heed.asm %BIN%\nightbuild\heed fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info diff --git a/programs/develop/heed/trunk/Tupfile.lua b/programs/develop/heed/Tupfile.lua similarity index 79% rename from programs/develop/heed/trunk/Tupfile.lua rename to programs/develop/heed/Tupfile.lua index 4887a5de8..90fa2dbde 100644 --- a/programs/develop/heed/trunk/Tupfile.lua +++ b/programs/develop/heed/Tupfile.lua @@ -1,5 +1,5 @@ if tup.getconfig("NO_FASM") ~= "" then return end -HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR") +HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR") tup.include(HELPERDIR .. "/use_fasm.lua") add_include(tup.getvariantdir()) diff --git a/programs/develop/heed/trunk/build.sh b/programs/develop/heed/build.sh similarity index 100% rename from programs/develop/heed/trunk/build.sh rename to programs/develop/heed/build.sh diff --git a/programs/develop/heed/trunk/build_en.bat b/programs/develop/heed/build_en.bat similarity index 100% rename from programs/develop/heed/trunk/build_en.bat rename to programs/develop/heed/build_en.bat diff --git a/programs/develop/heed/trunk/build_ru.bat b/programs/develop/heed/build_ru.bat similarity index 100% rename from programs/develop/heed/trunk/build_ru.bat rename to programs/develop/heed/build_ru.bat diff --git a/programs/develop/heed/trunk/cp1251-8x16 b/programs/develop/heed/cp1251-8x16 similarity index 100% rename from programs/develop/heed/trunk/cp1251-8x16 rename to programs/develop/heed/cp1251-8x16 diff --git a/programs/develop/heed/trunk/cp866-8x16 b/programs/develop/heed/cp866-8x16 similarity index 100% rename from programs/develop/heed/trunk/cp866-8x16 rename to programs/develop/heed/cp866-8x16 diff --git a/programs/develop/heed/trunk/heed.asm b/programs/develop/heed/heed.asm similarity index 99% rename from programs/develop/heed/trunk/heed.asm rename to programs/develop/heed/heed.asm index 8c3c30f06..1e3962f55 100644 --- a/programs/develop/heed/trunk/heed.asm +++ b/programs/develop/heed/heed.asm @@ -1,3 +1,9 @@ +; SPDX-License-Identifier: NOASSERTION +; + +; Text encoded with Code Page 866 - Cyrillic + + ;-------------------------------------------------------------------- ; v.016 30.07.2011 ; Start with open file path @@ -60,11 +66,11 @@ use32 _title equ 'HeEd 0.16', 0 include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US. -include '../../../KOSfuncs.inc' -include '../../../config.inc' ; for nightbuild -include '../../../macros.inc' -include '../../libraries/box_lib/trunk/box_lib.mac' -include '../../../load_lib.mac' +include '../../KOSfuncs.inc' +include '../../config.inc' ; for nightbuild +include '../../macros.inc' +include '../libraries/box_lib/trunk/box_lib.mac' +include '../../load_lib.mac' @use_library ;-------------------------------------------------------------------- diff --git a/programs/develop/heed/trunk/koi8-r-8x16 b/programs/develop/heed/koi8-r-8x16 similarity index 100% rename from programs/develop/heed/trunk/koi8-r-8x16 rename to programs/develop/heed/koi8-r-8x16