From df3cc4dfbfa9952c9a5824f687a780b91e96a43f Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Tue, 25 Jun 2024 15:24:04 +0200
Subject: [PATCH] Moved scripts back to version control.

---
 lib/make/mb_openmsx.mk | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index 885e6c0..a87c71a 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -13,15 +13,14 @@ MB_OPENMSX_JOYPORTB     ?=
 MB_OPENMSX_SCALE_FACTOR ?= 3
 MB_OPENMSX_THROTTLE     ?= off
 MB_OPENMSX_RENDERER     ?=
-MB_OPENMSX_SCRIPTS      ?= ~/.openMSX/share/scripts
+MB_OPENMSX_CTL_CACHE    ?= ~/.openMSX/share/omsxctl
 MB_OPENMSX_SAVE_ON_EXIT ?= off
 
+# TODO: create openMSX issue to control extensions from the comment line.
 define _mb_openmsx_setup
-	$(call mb_msxhub_file,$(MB_OPENMSX_SCRIPTS),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
-	$(call mb_msxhub_file,$(MB_OPENMSX_SCRIPTS),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
-	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/boot_env.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl,$(MB_OPENMSX_SCRIPTS)))
-	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/boot_hdd.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl,$(MB_OPENMSX_SCRIPTS)))
-	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/fail_after.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl,$(MB_OPENMSX_SCRIPTS)))
+	$(if $(wildcard $(MB_OPENMSX_CTL_CACHE)),,$(call mb_mkdir,$(MB_OPENMSX_CTL_CACHE)))
+	$(call mb_msxhub_file,$(MB_OPENMSX_CTL_CACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
+	$(call mb_msxhub_file,$(MB_OPENMSX_CTL_CACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)
 	$(if $(wildcard ~/.openMSX/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/ide-nextor.xml,~/.openMSX/share/extensions/))
 endef
 
@@ -45,11 +44,15 @@ define _mb_openmsx_run
 		$(MB_OPENMSX_EXTRA_HDD) \
 		$(MB_OPENMSX_EXTRA_MEM) \
 		$(MB_OPENMSX_EXTS) \
+		-script $(MB_OPENMSX_CTL_CACHE)/omsxctl.tcl \
+		-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_env.tcl \
+		-script $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_hdd.tcl \
+		-script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \
 	-control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml
 endef
 
 define mb_openmsx_dosctl
-	$(if $(wildcard $(MB_OPENMSX_SCRIPTS)/omsxctl.tcl),,$(call _mb_openmsx_setup))
-	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_SCRIPTS)/omsxctl.com,$(1)))
+	$(if $(wildcard $(MB_OPENMSX_CTL_CACHE)/omsxctl.tcl),,$(call _mb_openmsx_setup))
+	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTL_CACHE)/omsxctl.com,$(1)))
 	$(call _mb_openmsx_run,$(1))
 endef