From 2742e2570e844fa5aea019831652cc248b7c1275 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Mon, 19 May 2025 19:52:17 +0100
Subject: [PATCH] system/board: Post-SVN clean up

- 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/system/board/{trunk => }/Tupfile.lua  |  2 +-
 programs/system/board/{trunk => }/board.asm    | 11 ++++++++---
 programs/system/board/{trunk => }/build_de.bat |  0
 programs/system/board/{trunk => }/build_en.bat |  0
 programs/system/board/{trunk => }/build_ru.bat |  0
 programs/system/board/{trunk => }/makefile     |  0
 8 files changed, 12 insertions(+), 7 deletions(-)
 rename programs/system/board/{trunk => }/Tupfile.lua (79%)
 rename programs/system/board/{trunk => }/board.asm (98%)
 rename programs/system/board/{trunk => }/build_de.bat (100%)
 rename programs/system/board/{trunk => }/build_en.bat (100%)
 rename programs/system/board/{trunk => }/build_ru.bat (100%)
 rename programs/system/board/{trunk => }/makefile (100%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 8c8d302e5..57df97528 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -467,7 +467,7 @@ tup.append_table(img_files, {
  {"DEMOS/UNVWATER", VAR_PROGS .. "/demos/unvwater/unvwater"},
  {"DEMOS/WEB", VAR_PROGS .. "/demos/web/trunk/web"},
  {"DEMOS/ZEROLINE", VAR_PROGS .. "/demos/zeroline/trunk/zeroline"},
- {"DEVELOP/BOARD", VAR_PROGS .. "/system/board/trunk/board"},
+ {"DEVELOP/BOARD", VAR_PROGS .. "/system/board/board"},
  {"DEVELOP/DBGBOARD", VAR_PROGS .. "/system/dbgboard/dbgboard"},
  {"DEVELOP/CEDIT", SRC_PROGS .. "/develop/cedit/CEDIT"},
  {"DEVELOP/CHARSETS", VAR_PROGS .. "/develop/charsets/charsets"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 4e64253b7..2df3966e5 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -57,9 +57,9 @@ echo *
 echo Building system
 echo *
 fasm system\calendar\trunk\calendar.asm %BIN%\calendar
-fasm system\board\trunk\board.asm %BIN%\develop\board
+fasm system\board\board.asm %BIN%\develop\board
 fasm system\commouse\trunk\commouse.asm %BIN%\commouse
-fasm system\cpu\trunk\cpu.asm %BIN%\cpu 
+fasm system\cpu\trunk\cpu.asm %BIN%\cpu
 fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
 fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
 fasm system\docpack\trunk\docpack.asm %BIN%\docpack
diff --git a/programs/system/board/trunk/Tupfile.lua b/programs/system/board/Tupfile.lua
similarity index 79%
rename from programs/system/board/trunk/Tupfile.lua
rename to programs/system/board/Tupfile.lua
index 9c91277c8..20b08bace 100644
--- a/programs/system/board/trunk/Tupfile.lua
+++ b/programs/system/board/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/system/board/trunk/board.asm b/programs/system/board/board.asm
similarity index 98%
rename from programs/system/board/trunk/board.asm
rename to programs/system/board/board.asm
index b7c8a9e50..693b41241 100644
--- a/programs/system/board/trunk/board.asm
+++ b/programs/system/board/board.asm
@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;------------------------------------------------------------------------------
 ; DEBUG BOARD for APPLICATIONS and KERNEL DEVELOPMENT
 ; See f63
@@ -15,8 +20,8 @@ org 0
         dd      0
 ;------------------------------------------------------------------------------
 include 'lang.inc'
-include '../../../macros.inc'
-include '../../../debug.inc'
+include '../../macros.inc'
+include '../../debug.inc'
 purge   newline
 ;SMALL FONT
 MAXSTRINGS = 45
@@ -190,7 +195,7 @@ key:
 open_boardlog:
 		mcall 70, open_log_in_tinypad
         jmp     red
-		
+
 ;------------------------------------------------------------------------------
 button:
         mcall   17                        ; get id
diff --git a/programs/system/board/trunk/build_de.bat b/programs/system/board/build_de.bat
similarity index 100%
rename from programs/system/board/trunk/build_de.bat
rename to programs/system/board/build_de.bat
diff --git a/programs/system/board/trunk/build_en.bat b/programs/system/board/build_en.bat
similarity index 100%
rename from programs/system/board/trunk/build_en.bat
rename to programs/system/board/build_en.bat
diff --git a/programs/system/board/trunk/build_ru.bat b/programs/system/board/build_ru.bat
similarity index 100%
rename from programs/system/board/trunk/build_ru.bat
rename to programs/system/board/build_ru.bat
diff --git a/programs/system/board/trunk/makefile b/programs/system/board/makefile
similarity index 100%
rename from programs/system/board/trunk/makefile
rename to programs/system/board/makefile