From 3ea561f6b5ff4b51d578ee0b51e5b2fbab8ef980 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Tue, 20 May 2025 20:05:05 +0100
Subject: [PATCH] system/run: Post-SVN clean up

- Move source code from `trunk` into program root directory.
- Update build files and ASM include paths.
---
 programs/build_all.bat                       |  2 +-
 programs/system/run/{trunk => }/Tupfile.lua  |  2 +-
 programs/system/run/{trunk => }/build_en.bat |  0
 programs/system/run/{trunk => }/build_ru.bat |  0
 programs/system/run/{trunk => }/makefile     |  0
 programs/system/run/{trunk => }/run.asm      | 13 +++++++++----
 programs/system/run/{trunk => }/run.mac      |  0
 programs/system/run/{trunk => }/run.txt      |  0
 programs/system/run/{trunk => }/txtbut.inc   |  0
 9 files changed, 11 insertions(+), 6 deletions(-)
 rename programs/system/run/{trunk => }/Tupfile.lua (79%)
 rename programs/system/run/{trunk => }/build_en.bat (100%)
 rename programs/system/run/{trunk => }/build_ru.bat (100%)
 rename programs/system/run/{trunk => }/makefile (100%)
 rename programs/system/run/{trunk => }/run.asm (96%)
 rename programs/system/run/{trunk => }/run.mac (100%)
 rename programs/system/run/{trunk => }/run.txt (100%)
 rename programs/system/run/{trunk => }/txtbut.inc (100%)

diff --git a/programs/build_all.bat b/programs/build_all.bat
index 8b660045f..bfb9cceae 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -75,7 +75,7 @@ fasm system\PANEL\trunk\@TASKBAR.ASM %BIN%\@TASKBAR
 fasm system\pcidev\trunk\pcidev.asm %BIN%\pcidev
 fasm system\RB\trunk\@RB.ASM %BIN%\@RB
 fasm system\rdsave\rdsave.asm %BIN%\rdsave
-fasm system\run\trunk\run.asm %BIN%\run
+fasm system\run\run.asm %BIN%\run
 fasm system\setup\trunk\setup.asm %BIN%\setup
 fasm system\skinsel\skinsel.asm %BIN%\skinsel
 fasm system\ss\trunk\@ss.asm %BIN%\@ss
diff --git a/programs/system/run/trunk/Tupfile.lua b/programs/system/run/Tupfile.lua
similarity index 79%
rename from programs/system/run/trunk/Tupfile.lua
rename to programs/system/run/Tupfile.lua
index 17fe2d193..df442fab3 100644
--- a/programs/system/run/trunk/Tupfile.lua
+++ b/programs/system/run/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/run/trunk/build_en.bat b/programs/system/run/build_en.bat
similarity index 100%
rename from programs/system/run/trunk/build_en.bat
rename to programs/system/run/build_en.bat
diff --git a/programs/system/run/trunk/build_ru.bat b/programs/system/run/build_ru.bat
similarity index 100%
rename from programs/system/run/trunk/build_ru.bat
rename to programs/system/run/build_ru.bat
diff --git a/programs/system/run/trunk/makefile b/programs/system/run/makefile
similarity index 100%
rename from programs/system/run/trunk/makefile
rename to programs/system/run/makefile
diff --git a/programs/system/run/trunk/run.asm b/programs/system/run/run.asm
similarity index 96%
rename from programs/system/run/trunk/run.asm
rename to programs/system/run/run.asm
index a4046c644..d62f753e3 100644
--- a/programs/system/run/trunk/run.asm
+++ b/programs/system/run/run.asm
@@ -1,11 +1,16 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 window_h=85
 window_w=430
 ;--- другие макросы ---
-include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include 'txtbut.inc'
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'run.mac'
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), it_IT, en_US.
 use32
diff --git a/programs/system/run/trunk/run.mac b/programs/system/run/run.mac
similarity index 100%
rename from programs/system/run/trunk/run.mac
rename to programs/system/run/run.mac
diff --git a/programs/system/run/trunk/run.txt b/programs/system/run/run.txt
similarity index 100%
rename from programs/system/run/trunk/run.txt
rename to programs/system/run/run.txt
diff --git a/programs/system/run/trunk/txtbut.inc b/programs/system/run/txtbut.inc
similarity index 100%
rename from programs/system/run/trunk/txtbut.inc
rename to programs/system/run/txtbut.inc