From 5b7f903e92f7fe7c9364479f61d4bef5200df974 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Wed, 21 May 2025 19:43:18 +0100
Subject: [PATCH] fs/copyr: Post-SVN tidy

- Move source code from `trunk` into program root directory.
- Update build files and ASM include paths.
---
 programs/build_all.bat                     | 2 +-
 programs/fs/copyr/{trunk => }/Tupfile.lua  | 2 +-
 programs/fs/copyr/{trunk => }/ascl.inc     | 0
 programs/fs/copyr/{trunk => }/build_en.bat | 0
 programs/fs/copyr/{trunk => }/build_ru.bat | 0
 programs/fs/copyr/{trunk => }/copyr.asm    | 8 +++++++-
 6 files changed, 9 insertions(+), 3 deletions(-)
 rename programs/fs/copyr/{trunk => }/Tupfile.lua (79%)
 rename programs/fs/copyr/{trunk => }/ascl.inc (100%)
 rename programs/fs/copyr/{trunk => }/build_en.bat (100%)
 rename programs/fs/copyr/{trunk => }/build_ru.bat (100%)
 rename programs/fs/copyr/{trunk => }/copyr.asm (98%)

diff --git a/programs/build_all.bat b/programs/build_all.bat
index 38ec1cbe2..65338383e 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -112,7 +112,7 @@ echo *
 echo Building fs
 echo *
 fasm fs\copy2\trunk\copy2.asm %BIN%\copy2
-fasm fs\copyr\trunk\copyr.asm %BIN%\copyr
+fasm fs\copyr\copyr.asm %BIN%\copyr
 fasm fs\kfar\trunk\kfar.asm %BIN%\kfar
 rem fasm fs\mfar\trunk\mfar.asm %BIN%\mfar
 fasm fs\sysxtree\trunk\sysxtree.asm %BIN%\sysxtree
diff --git a/programs/fs/copyr/trunk/Tupfile.lua b/programs/fs/copyr/Tupfile.lua
similarity index 79%
rename from programs/fs/copyr/trunk/Tupfile.lua
rename to programs/fs/copyr/Tupfile.lua
index c57f5b769..77d38b3f6 100644
--- a/programs/fs/copyr/trunk/Tupfile.lua
+++ b/programs/fs/copyr/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/fs/copyr/trunk/ascl.inc b/programs/fs/copyr/ascl.inc
similarity index 100%
rename from programs/fs/copyr/trunk/ascl.inc
rename to programs/fs/copyr/ascl.inc
diff --git a/programs/fs/copyr/trunk/build_en.bat b/programs/fs/copyr/build_en.bat
similarity index 100%
rename from programs/fs/copyr/trunk/build_en.bat
rename to programs/fs/copyr/build_en.bat
diff --git a/programs/fs/copyr/trunk/build_ru.bat b/programs/fs/copyr/build_ru.bat
similarity index 100%
rename from programs/fs/copyr/trunk/build_ru.bat
rename to programs/fs/copyr/build_ru.bat
diff --git a/programs/fs/copyr/trunk/copyr.asm b/programs/fs/copyr/copyr.asm
similarity index 98%
rename from programs/fs/copyr/trunk/copyr.asm
rename to programs/fs/copyr/copyr.asm
index 065c297d6..54752a64a 100644
--- a/programs/fs/copyr/trunk/copyr.asm
+++ b/programs/fs/copyr/copyr.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                                           ;
 ; FILE COPY - system module for copy        ;
@@ -24,7 +30,7 @@
     dd      param_area , 0x0      ; I_Param , I_Icon
 
 include 'lang.inc'              ; Language support for locales: ru_RU (CP866), en_US.
-include '..\..\..\macros.inc'   ; very useful stuff for MeOS
+include '..\..\macros.inc'   ; very useful stuff for MeOS
 include 'ascl.inc'
 
 START:                          ; start of execution