From 0ea5c00cfe45042e07eb64d2723a605d1c18fbde Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Tue, 20 May 2025 16:41:41 +0100
Subject: [PATCH] system/rdsave: 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 ++--
 .../system/rdsave/{trunk => }/Tupfile.lua     |  2 +-
 programs/system/rdsave/{trunk => }/app.ini    |  0
 programs/system/rdsave/{trunk => }/build.sh   |  0
 .../system/rdsave/{trunk => }/build_en.bat    |  0
 .../system/rdsave/{trunk => }/build_et.bat    |  0
 .../system/rdsave/{trunk => }/build_it.bat    |  0
 .../system/rdsave/{trunk => }/build_ru.bat    |  0
 programs/system/rdsave/{trunk => }/makefile   |  0
 programs/system/rdsave/{trunk => }/rdsave.asm | 20 ++++++++++++-------
 programs/system/rdsave/{trunk => }/str.inc    |  0
 12 files changed, 17 insertions(+), 11 deletions(-)
 rename programs/system/rdsave/{trunk => }/Tupfile.lua (79%)
 rename programs/system/rdsave/{trunk => }/app.ini (100%)
 rename programs/system/rdsave/{trunk => }/build.sh (100%)
 rename programs/system/rdsave/{trunk => }/build_en.bat (100%)
 rename programs/system/rdsave/{trunk => }/build_et.bat (100%)
 rename programs/system/rdsave/{trunk => }/build_it.bat (100%)
 rename programs/system/rdsave/{trunk => }/build_ru.bat (100%)
 rename programs/system/rdsave/{trunk => }/makefile (100%)
 rename programs/system/rdsave/{trunk => }/rdsave.asm (98%)
 rename programs/system/rdsave/{trunk => }/str.inc (100%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index c843dbf94..e3dc4cf3c 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -434,7 +434,7 @@ tup.append_table(img_files, {
  {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"},
  {"MYKEY", VAR_PROGS .. "/system/MyKey/MyKey"},
  {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
- {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"},
+ {"RDSAVE", VAR_PROGS .. "/system/rdsave/rdsave"},
  {"RTFREAD", VAR_PROGS .. "/other/rtfread/trunk/rtfread"},
  {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
  {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 6603dfef2..0bb76a127 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -74,7 +74,7 @@ fasm system\mousemul\mousemul.asm %BIN%\mousemul
 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\trunk\rdsave.asm %BIN%\rdsave
+fasm system\rdsave\rdsave.asm %BIN%\rdsave
 fasm system\run\trunk\run.asm %BIN%\run
 fasm system\setup\trunk\setup.asm %BIN%\setup
 fasm system\skinsel\skinsel.asm %BIN%\skinsel
@@ -240,7 +240,7 @@ fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
 fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg
 fasm system\hdd_info\hdd_info.asm %BIN%\nightbuild\hdd_info
 fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
-fasm system\rdsave\trunk\rdsave.asm %BIN%\nightbuild\rdsave
+fasm system\rdsave\rdsave.asm %BIN%\nightbuild\rdsave
 fasm other\kpack\trunk\kpack.asm %BIN%\nightbuild\kpack
 fasm other\rtfread\trunk\rtfread.asm %BIN%\nightbuild\rtfread
 ;restore
diff --git a/programs/system/rdsave/trunk/Tupfile.lua b/programs/system/rdsave/Tupfile.lua
similarity index 79%
rename from programs/system/rdsave/trunk/Tupfile.lua
rename to programs/system/rdsave/Tupfile.lua
index 32649eae1..3915ba57b 100644
--- a/programs/system/rdsave/trunk/Tupfile.lua
+++ b/programs/system/rdsave/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/rdsave/trunk/app.ini b/programs/system/rdsave/app.ini
similarity index 100%
rename from programs/system/rdsave/trunk/app.ini
rename to programs/system/rdsave/app.ini
diff --git a/programs/system/rdsave/trunk/build.sh b/programs/system/rdsave/build.sh
similarity index 100%
rename from programs/system/rdsave/trunk/build.sh
rename to programs/system/rdsave/build.sh
diff --git a/programs/system/rdsave/trunk/build_en.bat b/programs/system/rdsave/build_en.bat
similarity index 100%
rename from programs/system/rdsave/trunk/build_en.bat
rename to programs/system/rdsave/build_en.bat
diff --git a/programs/system/rdsave/trunk/build_et.bat b/programs/system/rdsave/build_et.bat
similarity index 100%
rename from programs/system/rdsave/trunk/build_et.bat
rename to programs/system/rdsave/build_et.bat
diff --git a/programs/system/rdsave/trunk/build_it.bat b/programs/system/rdsave/build_it.bat
similarity index 100%
rename from programs/system/rdsave/trunk/build_it.bat
rename to programs/system/rdsave/build_it.bat
diff --git a/programs/system/rdsave/trunk/build_ru.bat b/programs/system/rdsave/build_ru.bat
similarity index 100%
rename from programs/system/rdsave/trunk/build_ru.bat
rename to programs/system/rdsave/build_ru.bat
diff --git a/programs/system/rdsave/trunk/makefile b/programs/system/rdsave/makefile
similarity index 100%
rename from programs/system/rdsave/trunk/makefile
rename to programs/system/rdsave/makefile
diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/rdsave.asm
similarity index 98%
rename from programs/system/rdsave/trunk/rdsave.asm
rename to programs/system/rdsave/rdsave.asm
index e60757068..59947715b 100644
--- a/programs/system/rdsave/trunk/rdsave.asm
+++ b/programs/system/rdsave/rdsave.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;   RDsave для Kolibri (0.6.5.0 и старше)
 ;   Save RAM-disk to hard or floppy drive
 ;---------------------------------------------------------------------
@@ -25,15 +31,15 @@ dd cur_dir_path
 
 
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), et_EE, it_IT, en_US.
-include '../../../macros.inc'
+include '../../macros.inc'
 if debug eq yes
-include '../../../debug.inc'
+include '../../debug.inc'
 end if
-include '../../../proc32.inc'
-include '../../../dll.inc'
-include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../proc32.inc'
+include '../../dll.inc'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include 'str.inc'
 
 	@use_library
diff --git a/programs/system/rdsave/trunk/str.inc b/programs/system/rdsave/str.inc
similarity index 100%
rename from programs/system/rdsave/trunk/str.inc
rename to programs/system/rdsave/str.inc