From c475a94751172b1f55ae1340c06552ac532b350b Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 20 May 2025 20:13:25 +0100 Subject: [PATCH] system/skincfg: 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 ++-- programs/system/skincfg/{trunk => }/Tupfile.lua | 2 +- .../system/skincfg/{trunk => }/build_en.bat | 0 programs/system/skincfg/{trunk => }/build_en.sh | 0 .../system/skincfg/{trunk => }/build_es.bat | 0 .../system/skincfg/{trunk => }/build_et.bat | 0 programs/system/skincfg/{trunk => }/build_et.sh | 0 .../system/skincfg/{trunk => }/build_it.bat | 0 .../system/skincfg/{trunk => }/build_ru.bat | 0 programs/system/skincfg/{trunk => }/build_ru.sh | 0 programs/system/skincfg/{trunk => }/build_sp.sh | 0 .../system/skincfg/{trunk => }/drawskin.inc | 0 programs/system/skincfg/{trunk => }/idata.inc | 0 .../system/skincfg/{trunk => }/kglobals.inc | 0 programs/system/skincfg/{trunk => }/makefile | 0 programs/system/skincfg/{trunk => }/skincfg.asm | 17 ++++++++++------- programs/system/skincfg/{trunk => }/udata.inc | 0 .../system/skincfg/{trunk => }/unpacker.inc | 0 19 files changed, 14 insertions(+), 11 deletions(-) rename programs/system/skincfg/{trunk => }/Tupfile.lua (79%) rename programs/system/skincfg/{trunk => }/build_en.bat (100%) rename programs/system/skincfg/{trunk => }/build_en.sh (100%) rename programs/system/skincfg/{trunk => }/build_es.bat (100%) rename programs/system/skincfg/{trunk => }/build_et.bat (100%) rename programs/system/skincfg/{trunk => }/build_et.sh (100%) rename programs/system/skincfg/{trunk => }/build_it.bat (100%) rename programs/system/skincfg/{trunk => }/build_ru.bat (100%) rename programs/system/skincfg/{trunk => }/build_ru.sh (100%) rename programs/system/skincfg/{trunk => }/build_sp.sh (100%) rename programs/system/skincfg/{trunk => }/drawskin.inc (100%) rename programs/system/skincfg/{trunk => }/idata.inc (100%) rename programs/system/skincfg/{trunk => }/kglobals.inc (100%) rename programs/system/skincfg/{trunk => }/makefile (100%) rename programs/system/skincfg/{trunk => }/skincfg.asm (98%) rename programs/system/skincfg/{trunk => }/udata.inc (100%) rename programs/system/skincfg/{trunk => }/unpacker.inc (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 617fa917b..7638742e1 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -439,7 +439,7 @@ tup.append_table(img_files, { {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"}, {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"}, {"SETUP", VAR_PROGS .. "/system/setup/setup"}, - {"SKINCFG", VAR_PROGS .. "/system/skincfg/trunk/skincfg"}, + {"SKINCFG", VAR_PROGS .. "/system/skincfg/skincfg"}, {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"}, {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"}, {"TINYPAD", VAR_PROGS .. "/develop/tinypad/trunk/tinypad"}, diff --git a/programs/build_all.bat b/programs/build_all.bat index 4074647dc..1da5d0119 100644 --- a/programs/build_all.bat +++ b/programs/build_all.bat @@ -61,7 +61,7 @@ fasm system\board\board.asm %BIN%\develop\board fasm system\commouse\trunk\commouse.asm %BIN%\commouse fasm system\cpu\cpu.asm %BIN%\cpu fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid -fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg +fasm system\skincfg\skincfg.asm %BIN%\skincfg fasm system\docpack\docpack.asm %BIN%\docpack fasm system\end\trunk\end.asm %BIN%\end fasm system\gmon\gmon.asm %BIN%\gmon @@ -237,7 +237,7 @@ fasm media\animage\animage.asm %BIN%\nightbuild\animage fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad -fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg +fasm system\skincfg\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\rdsave.asm %BIN%\nightbuild\rdsave diff --git a/programs/system/skincfg/trunk/Tupfile.lua b/programs/system/skincfg/Tupfile.lua similarity index 79% rename from programs/system/skincfg/trunk/Tupfile.lua rename to programs/system/skincfg/Tupfile.lua index 5ce9033cb..6ee0f673e 100644 --- a/programs/system/skincfg/trunk/Tupfile.lua +++ b/programs/system/skincfg/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/skincfg/trunk/build_en.bat b/programs/system/skincfg/build_en.bat similarity index 100% rename from programs/system/skincfg/trunk/build_en.bat rename to programs/system/skincfg/build_en.bat diff --git a/programs/system/skincfg/trunk/build_en.sh b/programs/system/skincfg/build_en.sh similarity index 100% rename from programs/system/skincfg/trunk/build_en.sh rename to programs/system/skincfg/build_en.sh diff --git a/programs/system/skincfg/trunk/build_es.bat b/programs/system/skincfg/build_es.bat similarity index 100% rename from programs/system/skincfg/trunk/build_es.bat rename to programs/system/skincfg/build_es.bat diff --git a/programs/system/skincfg/trunk/build_et.bat b/programs/system/skincfg/build_et.bat similarity index 100% rename from programs/system/skincfg/trunk/build_et.bat rename to programs/system/skincfg/build_et.bat diff --git a/programs/system/skincfg/trunk/build_et.sh b/programs/system/skincfg/build_et.sh similarity index 100% rename from programs/system/skincfg/trunk/build_et.sh rename to programs/system/skincfg/build_et.sh diff --git a/programs/system/skincfg/trunk/build_it.bat b/programs/system/skincfg/build_it.bat similarity index 100% rename from programs/system/skincfg/trunk/build_it.bat rename to programs/system/skincfg/build_it.bat diff --git a/programs/system/skincfg/trunk/build_ru.bat b/programs/system/skincfg/build_ru.bat similarity index 100% rename from programs/system/skincfg/trunk/build_ru.bat rename to programs/system/skincfg/build_ru.bat diff --git a/programs/system/skincfg/trunk/build_ru.sh b/programs/system/skincfg/build_ru.sh similarity index 100% rename from programs/system/skincfg/trunk/build_ru.sh rename to programs/system/skincfg/build_ru.sh diff --git a/programs/system/skincfg/trunk/build_sp.sh b/programs/system/skincfg/build_sp.sh similarity index 100% rename from programs/system/skincfg/trunk/build_sp.sh rename to programs/system/skincfg/build_sp.sh diff --git a/programs/system/skincfg/trunk/drawskin.inc b/programs/system/skincfg/drawskin.inc similarity index 100% rename from programs/system/skincfg/trunk/drawskin.inc rename to programs/system/skincfg/drawskin.inc diff --git a/programs/system/skincfg/trunk/idata.inc b/programs/system/skincfg/idata.inc similarity index 100% rename from programs/system/skincfg/trunk/idata.inc rename to programs/system/skincfg/idata.inc diff --git a/programs/system/skincfg/trunk/kglobals.inc b/programs/system/skincfg/kglobals.inc similarity index 100% rename from programs/system/skincfg/trunk/kglobals.inc rename to programs/system/skincfg/kglobals.inc diff --git a/programs/system/skincfg/trunk/makefile b/programs/system/skincfg/makefile similarity index 100% rename from programs/system/skincfg/trunk/makefile rename to programs/system/skincfg/makefile diff --git a/programs/system/skincfg/trunk/skincfg.asm b/programs/system/skincfg/skincfg.asm similarity index 98% rename from programs/system/skincfg/trunk/skincfg.asm rename to programs/system/skincfg/skincfg.asm index 5a2f14eb5..13b531b93 100644 --- a/programs/system/skincfg/trunk/skincfg.asm +++ b/programs/system/skincfg/skincfg.asm @@ -1,3 +1,6 @@ +; SPDX-License-Identifier: NOASSERTION +; + ; ; UNIFORM WINDOW COLOURS & SKIN ; @@ -28,15 +31,15 @@ M01header.params: dd cur_dir_path ; path to file include 'lang.inc' -include '../../../proc32.inc' -include '../../../config.inc' ;for nightbuild -include '../../../macros.inc' -include '../../../string.inc' -include '../../../dll.inc' +include '../../proc32.inc' +include '../../config.inc' ;for nightbuild +include '../../macros.inc' +include '../../string.inc' +include '../../dll.inc' include 'kglobals.inc' include 'unpacker.inc' -include '../../../KOSfuncs.inc' -include '../../../load_lib.mac' +include '../../KOSfuncs.inc' +include '../../load_lib.mac' @use_library ;****************************************************************************** ;-------------------------------------- diff --git a/programs/system/skincfg/trunk/udata.inc b/programs/system/skincfg/udata.inc similarity index 100% rename from programs/system/skincfg/trunk/udata.inc rename to programs/system/skincfg/udata.inc diff --git a/programs/system/skincfg/trunk/unpacker.inc b/programs/system/skincfg/unpacker.inc similarity index 100% rename from programs/system/skincfg/trunk/unpacker.inc rename to programs/system/skincfg/unpacker.inc