From 4fcc17675c3dc8a99641ff0fc8bc4e196f3d5ecb Mon Sep 17 00:00:00 2001 From: IgorA Date: Sun, 16 Mar 2025 23:55:34 +0200 Subject: [PATCH] Movback: Deleted trunk dir. Files moved --- data/Tupfile.lua | 2 +- programs/demos/movback/{trunk => }/Tupfile.lua | 2 +- programs/demos/movback/{trunk => }/movback.asm | 11 ++++++++--- programs/demos/movback/trunk/build_en.bat | 5 ----- programs/demos/movback/trunk/build_ru.bat | 5 ----- 5 files changed, 10 insertions(+), 15 deletions(-) rename programs/demos/movback/{trunk => }/Tupfile.lua (79%) rename programs/demos/movback/{trunk => }/movback.asm (92%) delete mode 100644 programs/demos/movback/trunk/build_en.bat delete mode 100644 programs/demos/movback/trunk/build_ru.bat diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 52fc89420..6e17ac0a4 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -457,7 +457,7 @@ tup.append_table(img_files, { {"DEMOS/BUDHBROT", VAR_PROGS .. "/demos/buddhabrot/trunk/buddhabrot"}, {"DEMOS/EYES", VAR_PROGS .. "/demos/eyes/trunk/eyes"}, {"DEMOS/FIREWORK", VAR_PROGS .. "/demos/firework/firework"}, - {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/trunk/movback"}, + {"DEMOS/MOVBACK", VAR_PROGS .. "/demos/movback/movback"}, {"DEMOS/PLASMA", VAR_PROGS .. "/demos/plasma/plasma"}, {"DEMOS/SPIRAL", VAR_PROGS .. "/demos/spiral/spiral"}, {"DEMOS/TINYFRAC", VAR_PROGS .. "/demos/tinyfrac/trunk/tinyfrac"}, diff --git a/programs/demos/movback/trunk/Tupfile.lua b/programs/demos/movback/Tupfile.lua similarity index 79% rename from programs/demos/movback/trunk/Tupfile.lua rename to programs/demos/movback/Tupfile.lua index d1bfd409c..dd4f17306 100644 --- a/programs/demos/movback/trunk/Tupfile.lua +++ b/programs/demos/movback/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/demos/movback/trunk/movback.asm b/programs/demos/movback/movback.asm similarity index 92% rename from programs/demos/movback/trunk/movback.asm rename to programs/demos/movback/movback.asm index 39a81d0d3..040a9714b 100644 --- a/programs/demos/movback/trunk/movback.asm +++ b/programs/demos/movback/movback.asm @@ -1,6 +1,11 @@ -include "lang.inc" -include "../../../macros.inc" -include "../../../KOSfuncs.inc" +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; SPDX-License-Identifier: GPL-2.0-only +; A MoveBack demo +; Copyright (C) 2010-2025 KolibriOS team +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +include "../../macros.inc" +include "../../KOSfuncs.inc" WND_SIZE_X = 320 WND_SIZE_Y = 200 diff --git a/programs/demos/movback/trunk/build_en.bat b/programs/demos/movback/trunk/build_en.bat deleted file mode 100644 index d0e61b85c..000000000 --- a/programs/demos/movback/trunk/build_en.bat +++ /dev/null @@ -1,5 +0,0 @@ -@erase lang.inc -@echo lang fix en_US >lang.inc -@fasm movback.asm movback -@erase lang.inc -@pause diff --git a/programs/demos/movback/trunk/build_ru.bat b/programs/demos/movback/trunk/build_ru.bat deleted file mode 100644 index 05b5a016e..000000000 --- a/programs/demos/movback/trunk/build_ru.bat +++ /dev/null @@ -1,5 +0,0 @@ -@erase lang.inc -@echo lang fix ru_RU >lang.inc -@fasm movback.asm movback -@erase lang.inc -@pause