From 6045e90d24e444f91d51fe39df652213216b20a5 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Sat, 24 May 2025 13:04:57 +0100
Subject: [PATCH] develop/scancode: 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/scancode/{trunk => }/Tupfile.lua  |  2 +-
 programs/develop/scancode/{trunk => }/build_en.bat |  0
 programs/develop/scancode/{trunk => }/build_ru.bat |  0
 programs/develop/scancode/{trunk => }/scancode.asm | 10 ++++++++--
 6 files changed, 11 insertions(+), 5 deletions(-)
 rename programs/develop/scancode/{trunk => }/Tupfile.lua (79%)
 rename programs/develop/scancode/{trunk => }/build_en.bat (100%)
 rename programs/develop/scancode/{trunk => }/build_ru.bat (100%)
 rename programs/develop/scancode/{trunk => }/scancode.asm (98%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index ee49f4270..b8080e31d 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -480,7 +480,7 @@ tup.append_table(img_files, {
  {"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"},
+ {"DEVELOP/SCANCODE", VAR_PROGS .. "/develop/scancode/scancode"},
  {"DEVELOP/EXAMPLES/CIRCLE", VAR_PROGS .. "/develop/examples/circle/circle"},
  {"DEVELOP/EXAMPLES/COLORREF", VAR_PROGS .. "/demos/colorref/trunk/colorref"},
  {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 2c42c4619..a8f7b8cae 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -94,7 +94,7 @@ rem fasm develop\hexview\trunk\hexview.asm hexview
 fasm develop\keyascii\keyascii.asm %BIN%\develop\keyascii
 fasm develop\mtdbg\mtdbg.asm %BIN%\develop\mtdbg
 rem fasm develop\param\trunk\param.asm param
-fasm develop\scancode\trunk\scancode.asm %BIN%\develop\scancode
+fasm develop\scancode\scancode.asm %BIN%\develop\scancode
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\tinypad
 fasm develop\cObj\cObj.asm %BIN%\develop\cObj
 
diff --git a/programs/develop/scancode/trunk/Tupfile.lua b/programs/develop/scancode/Tupfile.lua
similarity index 79%
rename from programs/develop/scancode/trunk/Tupfile.lua
rename to programs/develop/scancode/Tupfile.lua
index c64f69238..a1216622c 100644
--- a/programs/develop/scancode/trunk/Tupfile.lua
+++ b/programs/develop/scancode/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/scancode/trunk/build_en.bat b/programs/develop/scancode/build_en.bat
similarity index 100%
rename from programs/develop/scancode/trunk/build_en.bat
rename to programs/develop/scancode/build_en.bat
diff --git a/programs/develop/scancode/trunk/build_ru.bat b/programs/develop/scancode/build_ru.bat
similarity index 100%
rename from programs/develop/scancode/trunk/build_ru.bat
rename to programs/develop/scancode/build_ru.bat
diff --git a/programs/develop/scancode/trunk/scancode.asm b/programs/develop/scancode/scancode.asm
similarity index 98%
rename from programs/develop/scancode/trunk/scancode.asm
rename to programs/develop/scancode/scancode.asm
index 24c3a9f58..497ec79f2 100644
--- a/programs/develop/scancode/trunk/scancode.asm
+++ b/programs/develop/scancode/scancode.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;
 ;   KEYBOARD SCANCODE EXAMPLE
 ;
@@ -5,7 +11,7 @@
 ;
 
 include "lang.inc"
-include "..\..\..\macros.inc"
+include "..\..\macros.inc"
 
     use32
     org    0x0
@@ -165,7 +171,7 @@ draw_window:
     or   edx, 0x34000000
     mov  edi, title                ; WINDOW LABEL
     mcall
-                                   
+
     mov  eax, 4
     mov  ebx, 15*65536+10
     xor  ecx, ecx