From f44288082c0c6ec4027f61ce660dad6943582467 Mon Sep 17 00:00:00 2001
From: curt mayer <curt@zen-room.org>
Date: Sun, 16 Feb 2020 19:03:19 -0800
Subject: [PATCH] towards a clean make and 'git status'

---
 Binary/.gitignore              |   1 +
 Makefile                       |   1 +
 Source/Apps/.gitignore         |   4 ++
 Source/BL/.gitignore           |   2 +
 Source/BPBIOS/.gitignore       |   5 ++
 Source/CBIOS/.gitignore        |   2 +
 Source/CPM22/.gitignore        |   3 +
 Source/CPM3/.gitignore         |  10 +++
 Source/Forth/.gitignore        |   2 +
 Source/HBIOS/.gitignore        |   8 +++
 Source/HBIOS/Build.sh          | 122 +++++++++++++++++++++++++++++++++
 Source/Images/Makefile         |   9 +--
 Source/Makefile                |   7 +-
 Source/Prop/Spin/.gitignore    |   2 +
 Source/ZCPR-DJ/.gitignore      |   2 +
 Source/ZCPR/.gitignore         |   3 +
 Source/ZPM3/.gitignore         |  14 ++++
 Source/ZPM3/Makefile           |   8 ++-
 Source/ZPM3/autotog.com        | Bin 512 -> 0 bytes
 Source/ZPM3/autotog.z80        |  10 +--
 Source/ZPM3/clrhist.com        | Bin 128 -> 0 bytes
 Source/ZPM3/setz3.com          | Bin 256 -> 0 bytes
 Source/ZSDOS/.gitignore        |   4 ++
 Tools/unix/cpmtools/.gitignore |   8 +++
 Tools/unix/uz80as/.gitignore   |   2 +
 Tools/unix/zx/.gitignore       |   3 +
 26 files changed, 221 insertions(+), 11 deletions(-)
 create mode 100644 Binary/.gitignore
 create mode 100644 Source/Apps/.gitignore
 create mode 100644 Source/BL/.gitignore
 create mode 100644 Source/BPBIOS/.gitignore
 create mode 100644 Source/CBIOS/.gitignore
 create mode 100644 Source/CPM22/.gitignore
 create mode 100644 Source/CPM3/.gitignore
 create mode 100644 Source/Forth/.gitignore
 create mode 100644 Source/HBIOS/.gitignore
 create mode 100755 Source/HBIOS/Build.sh
 create mode 100644 Source/Prop/Spin/.gitignore
 create mode 100644 Source/ZCPR-DJ/.gitignore
 create mode 100644 Source/ZCPR/.gitignore
 create mode 100644 Source/ZPM3/.gitignore
 delete mode 100644 Source/ZPM3/autotog.com
 delete mode 100644 Source/ZPM3/clrhist.com
 delete mode 100644 Source/ZPM3/setz3.com
 create mode 100644 Source/ZSDOS/.gitignore
 create mode 100644 Tools/unix/cpmtools/.gitignore
 create mode 100644 Tools/unix/uz80as/.gitignore
 create mode 100644 Tools/unix/zx/.gitignore

diff --git a/Binary/.gitignore b/Binary/.gitignore
new file mode 100644
index 00000000..a8a0dcec
--- /dev/null
+++ b/Binary/.gitignore
@@ -0,0 +1 @@
+*.bin
diff --git a/Makefile b/Makefile
index a7b09930..ba64fcc0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 all:
 	cd Tools/unix ; make install
 	cd Source ; make all
+	cd Source/Images ; make al
 
 clean:
 	cd Tools/unix ; make clean
diff --git a/Source/Apps/.gitignore b/Source/Apps/.gitignore
new file mode 100644
index 00000000..bbe9d6aa
--- /dev/null
+++ b/Source/Apps/.gitignore
@@ -0,0 +1,4 @@
+*.COM
+*.lst
+*.hex
+*.com
diff --git a/Source/BL/.gitignore b/Source/BL/.gitignore
new file mode 100644
index 00000000..7e5922f7
--- /dev/null
+++ b/Source/BL/.gitignore
@@ -0,0 +1,2 @@
+*.bin
+*.lst
diff --git a/Source/BPBIOS/.gitignore b/Source/BPBIOS/.gitignore
new file mode 100644
index 00000000..d0e0dcfa
--- /dev/null
+++ b/Source/BPBIOS/.gitignore
@@ -0,0 +1,5 @@
+*.prn
+*.rel
+*.img
+bpsys.dat
+def-ww.lib
diff --git a/Source/CBIOS/.gitignore b/Source/CBIOS/.gitignore
new file mode 100644
index 00000000..7e5922f7
--- /dev/null
+++ b/Source/CBIOS/.gitignore
@@ -0,0 +1,2 @@
+*.bin
+*.lst
diff --git a/Source/CPM22/.gitignore b/Source/CPM22/.gitignore
new file mode 100644
index 00000000..c41f07b8
--- /dev/null
+++ b/Source/CPM22/.gitignore
@@ -0,0 +1,3 @@
+*.bin
+*.hex
+*.lst
diff --git a/Source/CPM3/.gitignore b/Source/CPM3/.gitignore
new file mode 100644
index 00000000..c493d7f9
--- /dev/null
+++ b/Source/CPM3/.gitignore
@@ -0,0 +1,10 @@
+*.sym
+*.lst
+*.sys
+*.rel
+cpmldr.com
+gencpm.dat
+bios3.spr
+bnkbios3.spr
+options.lib
+zpmbios3.spr
diff --git a/Source/Forth/.gitignore b/Source/Forth/.gitignore
new file mode 100644
index 00000000..cfc62af0
--- /dev/null
+++ b/Source/Forth/.gitignore
@@ -0,0 +1,2 @@
+*.bin
+*.sym
diff --git a/Source/HBIOS/.gitignore b/Source/HBIOS/.gitignore
new file mode 100644
index 00000000..fd4dbec9
--- /dev/null
+++ b/Source/HBIOS/.gitignore
@@ -0,0 +1,8 @@
+*.bin
+*.lst
+*.rom
+*.dat
+*.tmp
+build.inc
+cpm.sys
+zsys.sys
diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh
new file mode 100755
index 00000000..b44c2347
--- /dev/null
+++ b/Source/HBIOS/Build.sh
@@ -0,0 +1,122 @@
+#!/bin/bash
+
+CPMCP=../../Tools/`uname`/cpmcp
+
+# positional arguments
+platform=$1
+config=$2
+romsize=$3
+romname=$4
+
+# prompt if no match
+platforms=($(find Config -name \*.asm -print | \
+	sed -e 's,Config/,,' -e 's/_.*$//' | sort -u))
+
+while ! echo ${platforms[@]} | grep -q -w -s "$platform" ; do
+	echo -n "Enter platform [" ${platforms[@]} "] :"
+	read platform
+done
+
+configs=$(find Config -name ${platform}_\* -print | \
+	sed -e 's,Config/,,' -e "s/${platform}_//" -e "s/.asm//")
+while ! echo ${configs[@]} | grep -s -w -q "$config" ; do
+	echo -n "Enter config for $platform [" ${configs[@]} "] :"
+	read config
+done
+configfile=Config/${platform}_${config}.asm
+
+while [ ! '(' "$romsize" = 1024 -o "$romsize" = 512 ')' ] ; do
+	echo -n "Romsize :"
+	read romsize
+done
+
+if [ -z "$romname" ] ; then
+	romname=${platform}_${config}
+fi
+echo Building for $romname for $platform $config $romsize
+
+if [ $platform == UNA ] ; then
+	CBIOS=../CBIOS/cbios_una.bin
+else
+	CBIOS=../CBIOS/cbios_wbw.bin
+fi
+
+Apps=(assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm inttest)
+timestamp=$(date +%Y-%m-%d)
+
+blankfile=Blank${romsize}.dat
+romdiskfile=RomDisk.tmp
+romfmt=wbw_rom${romsize}
+outdir=../../Binary
+
+echo "creating empty rom disk of size $romsize in $blankfile"
+LANG=en_US.US-ASCII tr '\000' '\345' </dev/zero | dd of=$blankfile bs=1024 count=`expr $romsize - 128`
+
+# # Initialize working variables
+# $OutDir = "../../Binary"		# Output directory for final image file
+# $RomFmt = "wbw_rom${RomSize}"		# Location of files to imbed in ROM disk
+# $BlankROM = "Blank${RomSize}KB.dat"	# An initial "empty" image for the ROM disk of propoer size
+# $RomDiskFile = "RomDisk.tmp"		# Temporary filename used to create ROM disk image
+# $RomFile = "${OutDir}/${RomName}.rom"	# Final name of ROM image
+# $ComFile = "${OutDir}/${RomName}.com"	# Final name of COM image (command line loadable HBIOS/CBIOS)
+# $ImgFile = "${OutDir}/${RomName}.img"	# Final name of IMG image (memory loadable HBIOS/CBIOS image)
+
+cat <<- EOF > build.inc
+; RomWBW Configured for $platform $config $timestamp
+;
+#DEFINE	TIMESTAMP	"$timestamp"
+;
+ROMSIZE		.EQU	$romsize
+;
+#INCLUDE "$configfile"
+;
+EOF
+
+cp ../CPM22/os2ccp.bin ccp.bin
+cp ../CPM22/os3bdos.bin bdos.bin
+cp ../ZCPR-DJ/zcpr.bin zcpr.bin
+cp ../ZSDOS/zsdos.bin zsdos.bin
+cp ../Forth/camel80.bin camel80.bin
+
+make -f Makefile dbgmon.bin prefix.bin romldr.bin eastaegg.bin nascom.bin \
+	tastybasic.bin imgpad.bin imgpad0.bin
+if [ $platform != UNA ] ; then
+	make -f Makefile hbios_rom.bin hbios_app.bin hbios_img.bin
+fi
+
+cat ccp.bin bdos.bin $CBIOS >cpm.bin
+cat zcpr.bin zsdos.bin $CBIOS >zsys.bin
+
+cat prefix.bin cpm.bin >cpm.sys
+cat prefix.bin zsys.bin >zsys.sys
+
+cat romldr.bin eastaegg.bin dbgmon.bin cpm.bin zsys.bin >osimg.bin
+cat camel80.bin nascom.bin tastybasic.bin imgpad0.bin >osimg1.bin
+
+echo "Building ${romsize}KB $romname ROM disk data file..."
+cp $blankfile $romdiskfile
+$CPMCP -f $romfmt $romdiskfile ../RomDsk/ROM_${romsize}KB/*.* 0:
+
+if [ $(find ../RomDsk/$platform -type f -print 2>/dev/null | wc -l) -gt 0 ] ; then
+	$CPMCP -f $romfmt $romdiskfile ../RomDsk/$platform/*.* 0:
+fi
+
+for i in ${apps[@]} ; do
+	$CPMCP -f $romfmt $romdiskfile ../../Binary/Apps/$i.com 0:
+done
+
+for i in *.sys ; do
+	$CPMCP -f $romfmt $romdiskfile $i 0:
+done
+
+if [ $platform != UNA ] ; then
+	cp osimg.bin $outdir/UNA_WBW_SYS.bin
+	cp $romdiskfile $outdir/UNA_WBW_ROM$romsize.bin
+	cat ../UBIOS/UNA-BIOS.BIN osimg.bin ../UBIOS/FSFAT.BIN $romdiskfile >$romname.rom
+else
+	cat hbios_rom.bin osimg.bin osimg1.bin osimg.bin $romdiskfile >$romname.rom
+	cat hbios_app.bin osimg.bin > $romname.com
+	cat hbios_img.bin osimg.bin > $romname.img
+fi
+
+#rm $romdiskfile
diff --git a/Source/Images/Makefile b/Source/Images/Makefile
index a00615a5..6c696362 100644
--- a/Source/Images/Makefile
+++ b/Source/Images/Makefile
@@ -63,14 +63,15 @@ HDSIZE=$(shell expr 128 '*' 65)
 	for u in $$(seq 0 15) ; do \
 		dir=d_$$d/u$$u ; \
 		if [ -d $$dir ] ; then \
-			echo $(CPMCP) -f $$fmt $@ $$dir/*.* $$u: ; \
-			$(CPMCP) -f $$fmt $@ $$dir/*.* $$u: ; \
+			echo $(CPMCP) -f $$fmt $@ $$($(CASEFN) $$dir/*.*) $$u: ; \
+			$(CPMCP) -f $$fmt $@ $$($(CASEFN) $$dir/*.*) $$u: ; \
 		fi ; \
 	done ; \
 	if [ -f d_$$d.txt ] ; then \
 		grep -v ^# d_$$d.txt | while read file user ; do \
-			echo $(CPMCP) -f $$fmt $@ $$file $$user ; \
-			$(CPMCP) -f $$fmt $@ $$file $$user ; \
+			echo $$file $$user ; \
+			echo $(CPMCP) -f $$fmt $@ $$($(CASEFN) $$file) $$user ; \
+			$(CPMCP) -f $$fmt $@ $$($(CASEFN) $$file) $$user ; \
 		done ; \
 	fi ; \
 	if [ "$$sys" ] ; then \
diff --git a/Source/Makefile b/Source/Makefile
index 8c22dd8f..66476f19 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -5,8 +5,13 @@ SUBDIRS += ZPM3
 SUBDIRS += Forth
 NOTDONE += Fonts
 SUBDIRS += BL
-SUBDIRS += Images
 SUBDIRS += BPBIOS
 SUBDIRS += HBIOS
 TOOLS = ../Tools
 include $(TOOLS)/Makefile.inc
+
+install:: SUBDIRS += Images
+
+clean:: SUBDIRS += Images
+
+clobber:: SUBDIRS += Images
diff --git a/Source/Prop/Spin/.gitignore b/Source/Prop/Spin/.gitignore
new file mode 100644
index 00000000..aeab9be3
--- /dev/null
+++ b/Source/Prop/Spin/.gitignore
@@ -0,0 +1,2 @@
+*.list
+*.eeprom
diff --git a/Source/ZCPR-DJ/.gitignore b/Source/ZCPR-DJ/.gitignore
new file mode 100644
index 00000000..b533485d
--- /dev/null
+++ b/Source/ZCPR-DJ/.gitignore
@@ -0,0 +1,2 @@
+*.rel
+*.bin
diff --git a/Source/ZCPR/.gitignore b/Source/ZCPR/.gitignore
new file mode 100644
index 00000000..532702d2
--- /dev/null
+++ b/Source/ZCPR/.gitignore
@@ -0,0 +1,3 @@
+*.bin
+*.hex
+*.com
diff --git a/Source/ZPM3/.gitignore b/Source/ZPM3/.gitignore
new file mode 100644
index 00000000..ac1d4c6f
--- /dev/null
+++ b/Source/ZPM3/.gitignore
@@ -0,0 +1,14 @@
+*.lst
+*.sym
+biosldr.rel
+bnkbios3.spr
+cpm3.sys
+gencpm.com
+gencpm.dat
+startzpm.com
+zccp.com
+zinstal.zpm
+zpmldr.com
+setz3.com
+clrhist.com
+autotog.com
diff --git a/Source/ZPM3/Makefile b/Source/ZPM3/Makefile
index b58790f9..c0bc6a4f 100644
--- a/Source/ZPM3/Makefile
+++ b/Source/ZPM3/Makefile
@@ -1,4 +1,5 @@
-OBJECTS = ZPMLDR.COM cpm3.sys zinstal.zpm startzpm.com zccp.com
+OBJECTS = ZPMLDR.COM cpm3.sys zinstal.zpm startzpm.com zccp.com \
+	setz3.com clrhist.com autotog.com
 OTHERS = biosldr.rel gencpm.com gencpm.dat bnkbios3.spr
 TOOLS =../../Tools
 RELPATH = Source/ZPM3
@@ -32,3 +33,8 @@ zinstal.zpm: ../ZCCP/zinstal.zpm
 startzpm.com: ../ZCCP/startzpm.com
 	cp $< $@
 
+setz3.com: setz3.z80
+
+clrhist.com: clrhist.z80
+
+autotog.com: autotog.z80
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..48977581 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',9,'Toggles the state of the Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG ON	Enables Auto Command Prompting'
+	db	'  AUTOTOG ON',9,'Enables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG OFF	Disables Auto Command Prompting'
+	db	'  AUTOTOG OFF',9,'Disables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG //	Displays a brief help message'
+	db	'  AUTOTOG //',9,'Displays a brief help message'
 	db	'$'
 ONmsg:
 	db	'ZPM3 Auto Command Prompting is now enabled. Toggle with ^Q.'
@@ -128,4 +128,4 @@ ACPaddr:	; Save the address of the ACP bit here too.
 	db	03bh
 	db	0		; Get operation
 
-
\ No newline at end of file
+
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/Source/ZSDOS/.gitignore b/Source/ZSDOS/.gitignore
new file mode 100644
index 00000000..9823a537
--- /dev/null
+++ b/Source/ZSDOS/.gitignore
@@ -0,0 +1,4 @@
+*.bin
+*.rel
+*.prn
+*.sym
diff --git a/Tools/unix/cpmtools/.gitignore b/Tools/unix/cpmtools/.gitignore
new file mode 100644
index 00000000..ccf80731
--- /dev/null
+++ b/Tools/unix/cpmtools/.gitignore
@@ -0,0 +1,8 @@
+cpmchattr
+cpmchmod
+cpmcp
+cpmls
+cpmrm
+fsck.cpm
+mkfs.cpm
+*.o
diff --git a/Tools/unix/uz80as/.gitignore b/Tools/unix/uz80as/.gitignore
new file mode 100644
index 00000000..853bc0e0
--- /dev/null
+++ b/Tools/unix/uz80as/.gitignore
@@ -0,0 +1,2 @@
+*.o
+uz80as
diff --git a/Tools/unix/zx/.gitignore b/Tools/unix/zx/.gitignore
new file mode 100644
index 00000000..7b10942e
--- /dev/null
+++ b/Tools/unix/zx/.gitignore
@@ -0,0 +1,3 @@
+*.o
+zx
+config.h