From 30ab1f2ace1ac00ef5cf15d0b502c4f96c7bea90 Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Thu, 29 May 2025 00:33:45 +0100
Subject: [PATCH] demos/life: Post-SVN tidy

- Move source code from `trunk` into root directory.
- Update build files.
---
 programs/demos/life/{trunk => }/Tupfile.lua  | 2 +-
 programs/demos/life/{trunk => }/ascl.inc     | 0
 programs/demos/life/{trunk => }/build_en.bat | 0
 programs/demos/life/{trunk => }/build_ru.bat | 0
 programs/demos/life/{trunk => }/life.asm     | 0
 5 files changed, 1 insertion(+), 1 deletion(-)
 rename programs/demos/life/{trunk => }/Tupfile.lua (64%)
 rename programs/demos/life/{trunk => }/ascl.inc (100%)
 rename programs/demos/life/{trunk => }/build_en.bat (100%)
 rename programs/demos/life/{trunk => }/build_ru.bat (100%)
 rename programs/demos/life/{trunk => }/life.asm (100%)

diff --git a/programs/demos/life/trunk/Tupfile.lua b/programs/demos/life/Tupfile.lua
similarity index 64%
rename from programs/demos/life/trunk/Tupfile.lua
rename to programs/demos/life/Tupfile.lua
index acbec6fda..bb0b08e19 100644
--- a/programs/demos/life/trunk/Tupfile.lua
+++ b/programs/demos/life/Tupfile.lua
@@ -1,4 +1,4 @@
 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")
 tup.rule("life.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "life")
diff --git a/programs/demos/life/trunk/ascl.inc b/programs/demos/life/ascl.inc
similarity index 100%
rename from programs/demos/life/trunk/ascl.inc
rename to programs/demos/life/ascl.inc
diff --git a/programs/demos/life/trunk/build_en.bat b/programs/demos/life/build_en.bat
similarity index 100%
rename from programs/demos/life/trunk/build_en.bat
rename to programs/demos/life/build_en.bat
diff --git a/programs/demos/life/trunk/build_ru.bat b/programs/demos/life/build_ru.bat
similarity index 100%
rename from programs/demos/life/trunk/build_ru.bat
rename to programs/demos/life/build_ru.bat
diff --git a/programs/demos/life/trunk/life.asm b/programs/demos/life/life.asm
similarity index 100%
rename from programs/demos/life/trunk/life.asm
rename to programs/demos/life/life.asm