From 0c8c1436aec182a09e08fdd02b7b23727ff11236 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Sat, 22 Aug 2020 19:28:03 -0700
Subject: [PATCH] Fix More Build Anomalies

---
 Source/ZPM3/Build.cmd   |   5 +++++
 Source/ZPM3/Clean.cmd   |   3 +++
 Source/ZPM3/Makefile    |   7 +++----
 Source/ZPM3/autotog.com | Bin 512 -> 0 bytes
 Source/ZPM3/autotog.z80 |   8 ++++----
 Source/ZPM3/clrhist.com | Bin 128 -> 0 bytes
 Source/ZPM3/setz3.com   | Bin 256 -> 0 bytes
 Tools/Makefile.inc      |   1 +
 8 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 Source/ZPM3/autotog.com
 delete mode 100644 Source/ZPM3/clrhist.com
 delete mode 100644 Source/ZPM3/setz3.com

diff --git a/Source/ZPM3/Build.cmd b/Source/ZPM3/Build.cmd
index 93ad5eb5..5430167b 100644
--- a/Source/ZPM3/Build.cmd
+++ b/Source/ZPM3/Build.cmd
@@ -43,6 +43,11 @@ copy genbnk.dat gencpm.dat
 zx gencpm -auto -display
 rem pause
 
+rem ZPM3 Tools
+zx Z80ASM -clrhist/F
+zx Z80ASM -setz3/F
+zx Z80ASM -autotog/F
+
 rem Loader
 
 tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst
diff --git a/Source/ZPM3/Clean.cmd b/Source/ZPM3/Clean.cmd
index c2471144..3c953899 100644
--- a/Source/ZPM3/Clean.cmd
+++ b/Source/ZPM3/Clean.cmd
@@ -16,6 +16,9 @@ if exist zpmldr.com del zpmldr.com
 if exist cpmldr.com del cpmldr.com
 if exist startzpm.com del startzpm.com
 if exist gencpm.com del gencpm.com
+if exist clrhist.com del clrhist.com
+if exist setz3.com del setz3.com
+if exist autotog.com del autotog.com
 if exist *.dat del *.dat
 if exist biosldr?.rel del biosldr?.rel
 if exist *.bin del *.bin
diff --git a/Source/ZPM3/Makefile b/Source/ZPM3/Makefile
index db2c13dc..69d1458f 100644
--- a/Source/ZPM3/Makefile
+++ b/Source/ZPM3/Makefile
@@ -1,9 +1,6 @@
 OBJECTS = zpmldr.com zpmldr.sys cpm3.sys startzpm.com zccp.com
-#ifdef REBUILD_ZPM_TOOLS
+NODELETE = makedos.com zinstal.zpm bnkbdos3.spr resbdos3.spr
 OBJECTS += setz3.com clrhist.com autotog.com
-#else
-NODELETE = setz3.com clrhist.com autotog.com makedos.com zinstal.zpm bnkbdos3.spr resbdos3.spr
-#endif
 OBJECTS += cpmldr.com cpmldr.sys zinstal.zpm makedos.com gencpm.dat bnkbios3.spr bnkbdos3.spr resbdos3.spr
 OTHERS = zpmldr.bin loader.bin biosldrd.rel biosldrc.rel util.rel gencpm.com
 DEST = ../../Binary/ZPM3/
@@ -53,7 +50,9 @@ startzpm.com: ../ZCCP/startzpm.com
 	cp $< $@
 
 cpmldr.com: ../CPM3/cpmldr.com
+	rm -f /tmp/casefn.cache
 	cp $< $@
 
 cpmldr.sys: ../CPM3/cpmldr.sys
+	rm -f /tmp/casefn.cache
 	cp $< $@
diff --git a/Source/ZPM3/autotog.com b/Source/ZPM3/autotog.com
deleted file mode 100644
index 3c7a5980c7744b404e9190fa8c0e10b1149de8a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmX>c$)pe*=@;S{Va3I(px_u9;veGg&KZ)Qo}QChtWc7Xs!&{#Sdyxcp9bbQmX_oz
zIOpf)Cg!Cm1Qg}x7L;V>r6Xxo@b}|%%}Y!I=_W$4n;WM~W-+nK_4Prj3vv=Gixm<T
zl8Q1@(-bmNa|#r4Q;Ule(^FNV0(^~eSgVj(tdN&qu8<0LT#B9o#E%N)nI#ztae;co
z=uLq*HAPRw-%kMy{N3Cj3@9nc%*e-imX+Z+pP}GNCLkkSuT^O!lcELF*;z~)ii!?k
znqScaL@Qj>TFG>}OoIzVZ4=~Xk~j=veG@#-D6vy8hJlfTL0IbT!UL}sFrBn!kfH?u
E009w?DgXcg

diff --git a/Source/ZPM3/autotog.z80 b/Source/ZPM3/autotog.z80
index b59a6663..9862af58 100644
--- a/Source/ZPM3/autotog.z80
+++ b/Source/ZPM3/autotog.z80
@@ -45,13 +45,13 @@ ACPoff	equ	85h	; Offset in SCB base page of Auto Command Prompting bit
 HELPmsg:
 	db	' SYNTAX:'
 	db	10,13
-	db	'  AUTOTOG	Toggles the state of the Auto Command Prompting'
+	db	'  AUTOTOG      Toggles the state of the Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG ON	Enables Auto Command Prompting'
+	db	'  AUTOTOG ON   Enables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG OFF	Disables Auto Command Prompting'
+	db	'  AUTOTOG OFF  Disables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG //	Displays a brief help message'
+	db	'  AUTOTOG //   Displays a brief help message'
 	db	'$'
 ONmsg:
 	db	'ZPM3 Auto Command Prompting is now enabled. Toggle with ^Q.'
diff --git a/Source/ZPM3/clrhist.com b/Source/ZPM3/clrhist.com
deleted file mode 100644
index 02a39c830fd64cd567d6ae470075eb33c222b7ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
dcmX@i%*babD9Cu0l_6cP_4L2v)(leg1OO4T5c2>4

diff --git a/Source/ZPM3/setz3.com b/Source/ZPM3/setz3.com
deleted file mode 100644
index 4ddb374f7fde1623e0851a6b05db4e864f310a72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 256
zcmX?nnlZ}Q)h~>Z0SFX=BmF`gBdoZ16%>M9L!yj93}g_TT2ib~l98$q<s1;CkeXMP
zS(Klbo0?amkeHHElv-S@keLUT4|aCaLD!sLq>!3ZoT`wVlbTorR9T{snWm7JU!qV{
znwOWEmku^m4{o=DzCOrmm(1dVoWx3ywVA~VNky5dX$l#sIRy&2K<g6IQ&j|c8TmNR
pvN9Zh8_mgBwON7nHIQJq%4aC}k`XAJuGf6ASh?u9HG>p3008v<Ms)xH

diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc
index f0018217..26cf36e2 100644
--- a/Tools/Makefile.inc
+++ b/Tools/Makefile.inc
@@ -66,6 +66,7 @@ CPM=$(TOOLS)/cpm/bin
 
 %.com: %.z80
 	$(ZXCC) $(CPM)/Z80ASM -$(basename $<)/F ; \
+	rm -f /tmp/casefn.cache ; \
 	mv $$($(CASEFN) $@) tmp.com ; mv tmp.com $@
 
 %.bin: %.asm