From 1de0212bfb19e24be3dac355d7a756f8c273f290 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Fri, 23 May 2025 14:23:38 +0100
Subject: [PATCH] develop/h2d2b: 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                          |  2 +-
 programs/develop/h2d2b/{trunk => }/Tupfile.lua  |  2 +-
 programs/develop/h2d2b/{trunk => }/build_en.bat |  0
 programs/develop/h2d2b/{trunk => }/build_ru.bat |  0
 programs/develop/h2d2b/{trunk => }/h2d2b.asm    | 16 +++++++++++-----
 6 files changed, 14 insertions(+), 8 deletions(-)
 rename programs/develop/h2d2b/{trunk => }/Tupfile.lua (79%)
 rename programs/develop/h2d2b/{trunk => }/build_en.bat (100%)
 rename programs/develop/h2d2b/{trunk => }/build_ru.bat (100%)
 rename programs/develop/h2d2b/{trunk => }/h2d2b.asm (95%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 8f33e3368..5c493b928 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -476,7 +476,7 @@ tup.append_table(img_files, {
  {"DEVELOP/FASM", VAR_PROGS .. "/develop/fasm/1.73/fasm"},
  {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"},
  {"DEVELOP/PIPET", VAR_PROGS .. "/other/pipet/pipet"},
- {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/trunk/h2d2b"},
+ {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/h2d2b"},
  {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/trunk/heed"},
  {"DEVELOP/MTDBG", VAR_PROGS .. "/develop/mtdbg/mtdbg"},
  {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 391df975e..1be34a785 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -88,7 +88,7 @@ echo Building develop
 echo *
 fasm develop\cmd\trunk\cmd.asm %BIN%\cmd
 fasm develop\fasm\trunk\fasm.asm %BIN%\develop\fasm
-fasm develop\h2d2b\trunk\h2d2b.asm %BIN%\develop\h2d2b
+fasm develop\h2d2b\h2d2b.asm %BIN%\develop\h2d2b
 fasm develop\heed\trunk\heed.asm %BIN%\demos\heed
 rem fasm develop\hexview\trunk\hexview.asm hexview
 fasm develop\keyascii\trunk\keyascii.asm %BIN%\develop\keyascii
diff --git a/programs/develop/h2d2b/trunk/Tupfile.lua b/programs/develop/h2d2b/Tupfile.lua
similarity index 79%
rename from programs/develop/h2d2b/trunk/Tupfile.lua
rename to programs/develop/h2d2b/Tupfile.lua
index 5456b466f..66eade163 100644
--- a/programs/develop/h2d2b/trunk/Tupfile.lua
+++ b/programs/develop/h2d2b/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/h2d2b/trunk/build_en.bat b/programs/develop/h2d2b/build_en.bat
similarity index 100%
rename from programs/develop/h2d2b/trunk/build_en.bat
rename to programs/develop/h2d2b/build_en.bat
diff --git a/programs/develop/h2d2b/trunk/build_ru.bat b/programs/develop/h2d2b/build_ru.bat
similarity index 100%
rename from programs/develop/h2d2b/trunk/build_ru.bat
rename to programs/develop/h2d2b/build_ru.bat
diff --git a/programs/develop/h2d2b/trunk/h2d2b.asm b/programs/develop/h2d2b/h2d2b.asm
similarity index 95%
rename from programs/develop/h2d2b/trunk/h2d2b.asm
rename to programs/develop/h2d2b/h2d2b.asm
index eddd82ee2..44ba594d6 100644
--- a/programs/develop/h2d2b/trunk/h2d2b.asm
+++ b/programs/develop/h2d2b/h2d2b.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;;      h2d2b v0.5 big fonts by Leency      ;;
 ;;      09.11.2016                          ;;
 
@@ -17,11 +23,11 @@ use32
     db  'MENUET01'
     dd  1,start,i_end,e_end,e_end,0,sys_path
 
-include '../../../proc32.inc'
-include '../../../macros.inc' ; макросы облегчают жизнь ассемблерщиков!
-include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../proc32.inc'
+include '../../macros.inc' ; макросы облегчают жизнь ассемблерщиков!
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include 'lang.inc'      ; Language support for locales: ru_RU (CP866), en_US.
 
 @use_library