From 3b9d27ddc16190e6c7bb52bee4360a76271d1820 Mon Sep 17 00:00:00 2001
From: Eric Swenson <eric@swenson.org>
Date: Wed, 10 Oct 2018 22:59:15 -0700
Subject: [PATCH] - Fix redumping compiler to actually do that (had wrong
 MSNAME originally) - Clean up how compiler is build and redumped - Set
 version number of compiler to 2000 - Use DIRED to get rid of UNFASL files in
 lisp; and liblsp; directories. - Work around occasional hang when building
 animal Resolves #1322.

---
 build/lisp.tcl | 134 ++++++++++++-------------------------------------
 1 file changed, 32 insertions(+), 102 deletions(-)

diff --git a/build/lisp.tcl b/build/lisp.tcl
index 8d867ad8..f02e44cf 100644
--- a/build/lisp.tcl
+++ b/build/lisp.tcl
@@ -29,6 +29,7 @@ respond "*" ":link .info.;lisp struct,libdoc;struct doc\r"
 respond "*" ":link l;-read- -this-,lisp;-read- -this-\r"
 
 # lisp compiler
+respond "*" ":link comlap;cdmacs fasl,cd.fas >\r"
 respond "*" ":link comlap;complr fasl,comlap;cl.fas >\r"
 respond "*" ":link comlap;phas1 fasl,comlap;ph.fas >\r"
 respond "*" ":link comlap;comaux fasl,comlap;cx.fas >\r"
@@ -41,8 +42,8 @@ type ":vk\r"
 respond "*" "lisp\013"
 respond "Alloc?" "n\r"
 respond "*" "(load \"comlap;ccload\")"
-respond ";BKPT CCLOAD:DUMPVERNO" "(setq ccload:dumpverno 2154)"
-respond "2154" "(return)"
+respond ";BKPT CCLOAD:DUMPVERNO" "(setq ccload:dumpverno 1998)"
+respond "1998" "(return)"
 respond "*" ":kill\r"
 respond "*" ":link sys;ts complr,lspdmp;cl.dmp >\r"
 respond "*" ":link sys;ts cl,sys;ts complr\r"
@@ -354,28 +355,24 @@ type ":kill\r"
 #type ":kill\r"
 
 # compile lisp compiler
-respond "*" ":link comlap;cdmacs fasl,cd.fas >\r"
 respond "*" "complr\013"
-respond "_" ".temp.;_comlap;comaux\r"
-respond "_" ".temp.;_comlap;complr\r"
-respond "_" ".temp.;_comlap;faslap\r"
-respond "_" ".temp.;_comlap;initia\r"
-respond "_" ".temp.;_comlap;maklap\r"
-respond "_" ".temp.;_comlap;phas1\r"
-respond "_" ".temp.;_comlap;srctrn\r"
+respond "_" "comlap;cd.fas 40_cdmacs\r"
+respond "_" "comlap;cx.fas 25_comaux\r"
+respond "_" "comlap;cl.fas 936_complr\r"
+respond "_" "comlap;fl.fas 392_faslap\r"
+respond "_" "comlap;in.fas 120_initia\r"
+respond "_" "comlap;mk.fas 80_maklap\r"
+respond "_" "comlap;ph.fas 86_phas1\r"
+respond "_" "comlap;st.fas 20_srctrn\r"
 respond "_" "\032"
 type ":kill\r"
-respond "*" ":move .temp.;comaux fasl,comlap;cx.fas 25\r"
-respond "*" ":move .temp.;complr fasl,comlap;cl.fas 936\r"
-respond "*" ":move .temp.;faslap fasl,comlap;fl.fas 392\r"
-respond "*" ":move .temp.;initia fasl,comlap;in.fas 120\r"
-respond "*" ":move .temp.;maklap fasl,comlap;mk.fas 80\r"
-respond "*" ":move .temp.;phas1 fasl,comlap;ph.fas 86\r"
-respond "*" ":move .temp.;srctrn fasl,comlap;st.fas 20\r"
 
 # and redump compiler
-respond "*" "comlap\033\023"
+respond "*" "comlap\033\033\023"
 respond "*" ":lisp ccload\r"
+expect "Dumping LSPDMP"
+type ":vk\r"
+respond "*" ":kill\r"
 
 # Additional LSPLIB packages
 respond "*" "complr\013"
@@ -495,86 +492,12 @@ respond "*" ":link libdoc;stepmm info,.info.;lisp stepmm\r"
 respond "*" ":copy nilcom;string >,libdoc;string nil\r"
 
 # can't build any more LIBLSP FASLs because directory is full
-respond "*" ":delete liblsp;%print unfasl\r"
-respond "*" ":delete liblsp;6bit   unfasl\r"
-respond "*" ":delete liblsp;apropo unfasl\r"
-respond "*" ":delete liblsp;arith  unfasl\r"
-respond "*" ":delete liblsp;aryfil unfasl\r"
-respond "*" ":delete liblsp;atan   unfasl\r"
-respond "*" ":delete liblsp;autodf unfasl\r"
-respond "*" ":delete liblsp;bboole unfasl\r"
-respond "*" ":delete liblsp;bench  unfasl\r"
-respond "*" ":delete liblsp;binprt unfasl\r"
-respond "*" ":delete liblsp;break  unfasl\r"
-respond "*" ":delete liblsp;bs     unfasl\r"
-respond "*" ":delete liblsp;carcdr unfasl\r"
-respond "*" ":delete liblsp;char   unfasl\r"
-respond "*" ":delete liblsp;comrd  unfasl\r"
-respond "*" ":delete liblsp;comred unfasl\r"
-respond "*" ":delete liblsp;dbg    unfasl\r"
-respond "*" ":delete liblsp;debug* unfasl\r"
-respond "*" ":delete liblsp;defsta unfasl\r"
-respond "*" ":delete liblsp;doctor unfasl\r"
-respond "*" ":delete liblsp;dow    unfasl\r"
-respond "*" ":delete liblsp;dprint unfasl\r"
-respond "*" ":delete liblsp;dribbl unfasl\r"
-respond "*" ":delete liblsp;dumpgc unfasl\r"
-respond "*" ":delete liblsp;fake-s unfasl\r"
-respond "*" ":delete liblsp;fasdmp unfasl\r"
-respond "*" ":delete liblsp;fforma unfasl\r"
-respond "*" ":delete liblsp;filbit unfasl\r"
-respond "*" ":delete liblsp;fload  unfasl\r"
-respond "*" ":delete liblsp;fontrd unfasl\r"
-respond "*" ":delete liblsp;for    unfasl\r"
-respond "*" ":delete lisp;gcdemn unfasl\r"
-respond "*" ":delete liblsp;genfns unfasl\r"
-respond "*" ":delete liblsp;gprint unfasl\r"
-respond "*" ":delete liblsp;graph$ unfasl\r"
-respond "*" ":delete liblsp;grapha unfasl\r"
-respond "*" ":delete liblsp;graphm unfasl\r"
-respond "*" ":delete liblsp;graphs unfasl\r"
-respond "*" ":delete liblsp;grapht unfasl\r"
-respond "*" ":delete liblsp;impdef unfasl\r"
-respond "*" ":delete liblsp;iota   unfasl\r"
-respond "*" ":delete liblsp;laugh  unfasl\r"
-respond "*" ":delete liblsp;letfex unfasl\r"
-respond "*" ":delete liblsp;lets   unfasl\r"
-respond "*" ":delete liblsp;linere unfasl\r"
-respond "*" ":delete liblsp;lispm  unfasl\r"
-respond "*" ":delete liblsp;lispt  unfasl\r"
-respond "*" ":delete liblsp;loop   unfasl\r"
-respond "*" ":delete liblsp;lspmac unfasl\r"
-respond "*" ":delete liblsp;lusets unfasl\r"
-respond "*" ":delete liblsp;more   unfasl\r"
-respond "*" ":delete liblsp;nshare unfasl\r"
-respond "*" ":delete liblsp;octal  unfasl\r"
-respond "*" ":delete liblsp;od     unfasl\r"
-respond "*" ":delete liblsp;optdef unfasl\r"
-respond "*" ":delete liblsp;phsprt unfasl\r"
-respond "*" ":delete liblsp;privob unfasl\r"
-respond "*" ":delete liblsp;prompt unfasl\r"
-respond "*" ":delete liblsp;qtrace unfasl\r"
-respond "*" ":delete liblsp;reads  unfasl\r"
-respond "*" ":delete liblsp;redo   unfasl\r"
-respond "*" ":delete liblsp;save   unfasl\r"
-respond "*" ":delete liblsp;sets   unfasl\r"
-respond "*" ":delete liblsp;sharab unfasl\r"
-respond "*" ":delete liblsp;share  unfasl\r"
-respond "*" ":delete liblsp;sixbit unfasl\r"
-respond "*" ":delete liblsp;smurf  unfasl\r"
-respond "*" ":delete liblsp;split  unfasl\r"
-respond "*" ":delete liblsp;stack  unfasl\r"
-respond "*" ":delete liblsp;statty unfasl\r"
-respond "*" ":delete liblsp;stepmm unfasl\r"
-respond "*" ":delete liblsp;stepr  unfasl\r"
-respond "*" ":delete liblsp;string unfasl\r"
-respond "*" ":delete liblsp;sun    unfasl\r"
-respond "*" ":delete liblsp;time   unfasl\r"
-respond "*" ":delete liblsp;trap   unfasl\r"
-respond "*" ":delete liblsp;tty    unfasl\r"
-respond "*" ":delete liblsp;ttyhak unfasl\r"
-respond "*" ":delete liblsp;wifs   unfasl\r"
-respond "*" ":delete liblsp;window unfasl\r"
+# cleanup unfasl files in lisp;
+respond "*" ":dired liblsp;\r"
+respond "@" "delete * unfasl\r"
+respond "Delete? (Y or N):" "y"
+respond "@" "q\r"
+expect ":KILL"
 
 respond "*" "complr\013"
 respond "_" "\007"
@@ -594,9 +517,11 @@ respond "_" "\032"
 type ":kill\r"
 
 # clean up remaining unfasl files in liblsp
-respond "*" ":delete liblsp;askusr unfasl\r"
-respond "*" ":delete liblsp;cgprin unfasl\r"
-respond "*" ":delete liblsp;cgrub unfasl\r"
+respond "*" ":dired liblsp;\r"
+respond "@" "delete * unfasl\r"
+respond "Delete? (Y or N):" "y"
+respond "@" "q\r"
+expect ":KILL"
 
 respond "*" "complr\013"
 respond "_" "\007"
@@ -693,7 +618,7 @@ respond "_" "\032"
 type ":kill\r"
 
 # cleanup unfasl files in liblsp;
-respond "*" ":dired liblsp\r"
+respond "*" ":dired liblsp;\r"
 respond "@" "delete * unfasl\r"
 respond "Delete? (Y or N):" "y"
 respond "@" "q\r"
@@ -750,9 +675,14 @@ respond "_" "games;_games;parse\r"
 respond "_" "games;_games;pattrn\r"
 respond "_" "games;_games;words\r"
 respond "_" "games;_games;word\r"
+respond "_" "\032"
+type ":kill\r"
+
+respond "*" "complr\013"
 respond "_" "games;_games;animal 133\r"
 respond "_" "\032"
 type ":kill\r"
+
 respond "*" "l\013"
 respond "Alloc?" "n"
 respond "*" "(load '((games) animal fasl))"