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

@@ -195,8 +195,8 @@ extra_files = {
  {"kolibrios/develop/utils/SPEDump", SRC_PROGS .. "/develop/SPEDump/SPEDump.kex"},
  {"kolibrios/emul/", "common/emul/*"},
  {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"},
- {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/readme.txt"},
- {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/keyboard.png"},
+ {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/trunk/readme.txt"},
+ {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/trunk/keyboard.png"},
  {"kolibrios/emul/fceu/fceu", SRC_PROGS .. "/emulator/fceu/fceu"},
  {"kolibrios/emul/fceu/FCEU ReadMe.txt", SRC_PROGS .. "/emulator/fceu/FCEU ReadMe.txt"},
  {"kolibrios/emul/chip8/chip8", VAR_PROGS .. "/emulator/chip8/chip8"},
@@ -284,7 +284,7 @@ extra_files = {
  {"kolibrios/netsurf/res/", "common/network/netsurf/res/*"},
  {"kolibrios/res/skins/", "../skins/authors.txt"},
  {"kolibrios/res/templates/", "common/templates/*"},
- {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/games/*"},
+ {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/trunk/games/*"},
  {"kolibrios/res/templates/NES/", "common/templates/NES/*"},
  {"kolibrios/res/wallpapers/", "common/wallpapers/*"},
  {"kolibrios/res/system/", build_type .. "/settings/kolibri.lbl"},
@@ -409,7 +409,7 @@ tup.append_table(img_files, {
  {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"},
  {"ACLOCK", VAR_PROGS .. "/demos/aclock/aclock"},
  {"APM", VAR_PROGS .. "/system/apm/apm"},
- {"CALC", VAR_PROGS .. "/other/calc/calc"},
+ {"CALC", VAR_PROGS .. "/other/calc/trunk/calc"},
  {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"},
  {"CALENDAR", VAR_PROGS .. "/system/calendar/calendar"},
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
@@ -434,8 +434,8 @@ 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"},
- {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
+ {"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"},
  {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"},
@@ -523,10 +523,10 @@ tup.append_table(img_files, {
  {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"},
  {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"},
  {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
- {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
+ {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/trunk/animage"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
- {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},
- {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/listplay"},
+ {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"},
+ {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"},
  {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"},
  {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"},
  {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/trunk/palitra"},
@@ -641,7 +641,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 }) end
 
 if build_type == "ru_RU" then tup.append_table(extra_files, {
- {"kolibrios/utils/period", VAR_PROGS .. "/other/period/period"},
+ {"kolibrios/utils/period", VAR_PROGS .. "/other/period/trunk/period"},
  {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end
 
@@ -752,7 +752,7 @@ tup.append_table(img_files, {
 tup.append_table(extra_files, {
 -- {"kolibrios/3D/cubeline", VAR_PROGS .. "/demos/cubeline/trunk/cubeline"},
  {"kolibrios/3D/gears", VAR_PROGS .. "/demos/gears/gears"},
- {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/e80"},
+ {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"},
  {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"},
  {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"},
  {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/checkers"},

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\rtfread.asm %BIN%\nightbuild\rtfread
 ;restore

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())
 

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