From 00f3b86d44ab7fac71c4457fc96f8efe478ea226 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Tue, 20 May 2025 10:13:01 +0100
Subject: [PATCH] system/launcher: 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                            | 2 +-
 programs/system/launcher/{trunk => }/Tupfile.lua  | 0
 programs/system/launcher/{trunk => }/build_en.bat | 0
 programs/system/launcher/{trunk => }/build_ru.bat | 0
 programs/system/launcher/{trunk => }/launcher.asm | 9 ++++++---
 6 files changed, 8 insertions(+), 5 deletions(-)
 rename programs/system/launcher/{trunk => }/Tupfile.lua (100%)
 rename programs/system/launcher/{trunk => }/build_en.bat (100%)
 rename programs/system/launcher/{trunk => }/build_ru.bat (100%)
 rename programs/system/launcher/{trunk => }/launcher.asm (98%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 5234d9d40..3769690be 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -426,7 +426,7 @@ tup.append_table(img_files, {
  {"HDD_INFO", VAR_PROGS .. "/system/hdd_info/hdd_info"},
  {"KBD", VAR_PROGS .. "/testing/kbd/trunk/kbd"},
  {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"},
- {"LAUNCHER", VAR_PROGS .. "/system/launcher/trunk/launcher"},
+ {"LAUNCHER", VAR_PROGS .. "/system/launcher/launcher"},
  {"LOADDRV", VAR_PROGS .. "/system/loaddrv/loaddrv"},
  {"MAGNIFY", VAR_PROGS .. "/system/magnify/magnify"},
  {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index d36bec5e3..e9dbd7911 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -67,7 +67,7 @@ fasm system\end\trunk\end.asm %BIN%\end
 fasm system\gmon\gmon.asm %BIN%\gmon
 fasm system\icon\icon.asm %BIN%\icon
 fasm system\kbd\trunk\kbd.ASM %BIN%\kbd
-fasm system\launcher\trunk\launcher.asm %BIN%\launcher
+fasm system\launcher\launcher.asm %BIN%\launcher
 fasm system\menu\trunk\menu.asm %BIN%\@menu
 fasm system\mgb\trunk\mgb.asm %BIN%\mgb
 fasm system\mousemul\trunk\mousemul.asm %BIN%\mousemul
diff --git a/programs/system/launcher/trunk/Tupfile.lua b/programs/system/launcher/Tupfile.lua
similarity index 100%
rename from programs/system/launcher/trunk/Tupfile.lua
rename to programs/system/launcher/Tupfile.lua
diff --git a/programs/system/launcher/trunk/build_en.bat b/programs/system/launcher/build_en.bat
similarity index 100%
rename from programs/system/launcher/trunk/build_en.bat
rename to programs/system/launcher/build_en.bat
diff --git a/programs/system/launcher/trunk/build_ru.bat b/programs/system/launcher/build_ru.bat
similarity index 100%
rename from programs/system/launcher/trunk/build_ru.bat
rename to programs/system/launcher/build_ru.bat
diff --git a/programs/system/launcher/trunk/launcher.asm b/programs/system/launcher/launcher.asm
similarity index 98%
rename from programs/system/launcher/trunk/launcher.asm
rename to programs/system/launcher/launcher.asm
index 1ebb07692..449357230 100644
--- a/programs/system/launcher/trunk/launcher.asm
+++ b/programs/system/launcher/launcher.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;-----------------------------------------------------------------------------
 ;
 ;   LAUNCHER - startup of programs
@@ -28,11 +31,11 @@
 	dd 0x0		; I_Param
 	dd 0x0		; I_Icon
 ;-----------------------------------------------------------------------------
-include "../../../macros.inc"
+include "../../macros.inc"
 
 define __DEBUG__ 1
 define __DEBUG_LEVEL__ 1
-include "../../../debug-fdo.inc"
+include "../../debug-fdo.inc"
 ;-----------------------------------------------------------------------------
 START:                           ; start of execution
 	mcall	68,11
@@ -43,7 +46,7 @@ START:                           ; start of execution
 	mov	ecx,[processinfo+32]
 	test	ecx,ecx
 	jnz	@f
-	
+
 	inc	ecx	; if file size zero
 ;--------------------------------------
 @@: