From 81f1297d3a31804d5b7e07156939a349d0273933 Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Wed, 9 Sep 2020 03:06:11 +0100
Subject: [PATCH] Use a second XFILE to patch/initialise Muddle 56.

Previously the first XFILE printed out some commands to run after STINK
had completed, which is awkward if you're building Muddle repeatedly.
This automates the second half of the build process.
---
 build/muddle.tcl                        |  9 +++------
 src/mudsys/{assem.xfile => mud56.assem} |  8 ++------
 src/mudsys/mud56.init                   | 10 ++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)
 rename src/mudsys/{assem.xfile => mud56.assem} (81%)
 create mode 100644 src/mudsys/mud56.init

diff --git a/build/muddle.tcl b/build/muddle.tcl
index 2c3eb24e..6f1cc64e 100644
--- a/build/muddle.tcl
+++ b/build/muddle.tcl
@@ -4,7 +4,7 @@ respond "*" ":cwd mudsys\r"
 respond "*" ":midas ts stink_sysen2;stink 121t\r"
 expect ":KILL"
 
-respond "*" ":xfile assem xfile\r"
+respond "*" ":xfile mud56 assem\r"
 expect -timeout 300 "Assembly done!"
 
 mkdir "mudsav"
@@ -13,11 +13,8 @@ respond "*" ":mudsys;stink\r"
 respond "STINK." "MMUD56 STINK\033@\033\033"
 expect  "SETPUR"
 respond "\n" "D\033\033"
-respond "\n" "strng/\0331\"56^?^?^?\033\r"
-respond "\n" ":pdump mudsav; ts mud56\r"
-respond "*" ":start\r"
-respond "*" ":pdump mudsav; ts mud56\r"
-respond "*" ":kill\r"
+respond "\n" ":xfile mud56 init\r"
+expect -timeout 100 "Init done!"
 
 respond "*" ":midas sys3; ts mudinq_sysen2; mudinq\r"
 expect ":KILL"
diff --git a/src/mudsys/assem.xfile b/src/mudsys/mud56.assem
similarity index 81%
rename from src/mudsys/assem.xfile
rename to src/mudsys/mud56.assem
index 13a398e4..68b4bc9c 100644
--- a/src/mudsys/assem.xfile
+++ b/src/mudsys/mud56.assem
@@ -1,4 +1,4 @@
-:Build TS MDL for ITS
+: Assemble Muddle 56 for ITS 
 :midas;73 PURE
 :midas;73 SPECS
 :midas;73 CONST
@@ -38,10 +38,6 @@ To link and initialize:
 	:mudsys;stink
 	MMUD56 STINK$@$$	(must be uppercase)
 	D$$			(must be uppercase)
-	strng/$1"56^?^?^?$	(type ^? as ^ then ?)
-	:pdump mudsav;ts mud56
-	$g			(wait for return to DDT)
-	:pdump mudsav;ts mud56
-	:kill
+	:xfile mud56 init
 Assembly done!
 
diff --git a/src/mudsys/mud56.init b/src/mudsys/mud56.init
new file mode 100644
index 00000000..f7de1e26
--- /dev/null
+++ b/src/mudsys/mud56.init
@@ -0,0 +1,10 @@
+STRNG/1"56^?^?^?
+
+:pdump mudsav;ts mud56
+g
+
+:pdump mudsav;ts mud56
+:kill
+:
+Init done!
+