From 82a6e66269d0d3b0a623cf65674d0113f62807e1 Mon Sep 17 00:00:00 2001 From: Dean Netherton Date: Sun, 1 Mar 2020 12:44:52 +1100 Subject: [PATCH 1/6] Added an gitignore files to exclude generated files --- .gitignore | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e54c32e9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,81 @@ +# Not sure what patterns to apply +# So ignoring all generated files explicitly + +**/*.[Bb][Ii][Nn] +**/*.[Cc][Oo][Mm] +**/*.[Rr][Oo][Mm] +**/*.com +**/*.eeprom +**/*.hex +**/*.img +**/*.lib +**/*.lst +**/*.o +**/*.prn +**/*.rel +**/*.sym +**/*.sys +**/*.tmp +**/*/font*.asm + +Binary/**/*.mym +Binary/**/*.pt3 + +Source/**/eeprom +Source/Apps/Assign.com +Source/Apps/FDU/FDU.COM +Source/Apps/Format.com +Source/Apps/IntTest.com +Source/Apps/Mode.com +Source/Apps/OSLdr.com +Source/Apps/RTC.com +Source/Apps/SysCopy.com +Source/Apps/SysGen.com +Source/Apps/Talk.com +Source/Apps/Timer.com +Source/Apps/Tune/Tune.com +Source/BPBIOS/bpsys.bak +Source/BPBIOS/bpsys.dat +Source/BPBIOS/def-ww.lib +Source/CPM3/bios3.spr +Source/CPM3/bnkbios3.spr +Source/CPM3/gencpm.dat +Source/CPM3/options.lib +Source/CPM3/zpmbios3.spr +Source/HBIOS/Blank512KB.dat +Source/HBIOS/build.inc +Source/Images/blank144 +Source/Images/blankhd +Source/Prop/Spin/ParPortProp.list +Source/Prop/Spin/PropIO.list +Source/Prop/Spin/PropIO2.list +Source/ZPM3/bnkbios3.spr +Source/ZPM3/gencpm.com +Source/ZPM3/gencpm.com +Source/ZPM3/gencpm.dat + +Tools/Linux +Tools/unix + +!Source/Apps/FAT/FAT.COM +!Source/BPBIOS/bpbuild.com +!Source/BPBIOS/movp112.com +!Source/BPBIOS/Z34RCP11/cledinst.com +!Source/BPBIOS/Z34RCP11/cledsave.com +!Source/Fonts +!Source/Images/**/*.[Cc][Oo][Mm] +!Source/RomDsk/**/*.[Cc][Oo][Mm] +!Source/UBIOS/FSFAT.BIN +!Source/UBIOS/UNA-BIOS.BIN +!Source/ZCCP/*.[Cc][Oo][Mm] +!Source/ZCPR-DJ/*.[Cc][Oo][Mm] +!Source/ZPM3/*.[Cc][Oo][Mm] +!Source/ZSDOS/*.[Cc][Oo][Mm] +!Tools/cpm/bin +!Tools/unix/zx +!Tools/zx + +Source/ZPM3/gencpm.com +Source/ZPM3/startzpm.com +Source/ZPM3/zccp.com +Source/ZPM3/zpmldr.com From 462f786c182bd04808c6fd431fcf4583e1f966e5 Mon Sep 17 00:00:00 2001 From: Dean Netherton Date: Wed, 26 Feb 2020 07:01:47 +1100 Subject: [PATCH 2/6] Removed Tunes/clean.cmd and Tunes/ReadMe.txt - as make clean removes them --- Binary/Apps/Tunes/ReadMe.txt | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Binary/Apps/Tunes/ReadMe.txt diff --git a/Binary/Apps/Tunes/ReadMe.txt b/Binary/Apps/Tunes/ReadMe.txt deleted file mode 100644 index 366efefe..00000000 --- a/Binary/Apps/Tunes/ReadMe.txt +++ /dev/null @@ -1,10 +0,0 @@ -*********************************************************************** -*** *** -*** R o m W B W *** -*** *** -*** Z80/Z180 System Software *** -*** *** -*********************************************************************** - -This directory contains some sample ProTracker and MYM sound -files that can be played by the TUNE application. \ No newline at end of file From 81c4913c72628fd7a4a56fc33d82eb2f33d87243 Mon Sep 17 00:00:00 2001 From: Dean Netherton Date: Wed, 26 Feb 2020 07:10:24 +1100 Subject: [PATCH 3/6] Build.sh: marked as executable chmod +x Build.sh --- Source/HBIOS/Build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index 32fb786f..d727319e 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -81,7 +81,7 @@ EOF echo "checking prerequisites" for need in ../CPM22/cpm_$BIOS.bin ../ZSDOS/zsys_$BIOS.bin \ ../Forth/camel80.bin font8x11c.asm font8x11u.asm font8x16c.asm \ - font8x16u.asm font8x8c.asm font8x8u.asm ; do + font8x16u.asm font8x8c.asm font8x8u.asm ; do if [ ! -f $need ] ; then echo $need missing exit 2 From d211f0977dd24bc3e1e85e7f6ebcc1f58c8c500c Mon Sep 17 00:00:00 2001 From: Dean Netherton Date: Wed, 26 Feb 2020 16:03:47 +1100 Subject: [PATCH 4/6] Fix to HBIOS/build.sh When adding files to rom disk, if files were missing, it would error out. It appears the intent is to skip non-existing files. Updated to log out correctly for missing files - and continue operation. --- Source/HBIOS/Build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/HBIOS/Build.sh b/Source/HBIOS/Build.sh index d727319e..697354dd 100755 --- a/Source/HBIOS/Build.sh +++ b/Source/HBIOS/Build.sh @@ -124,8 +124,10 @@ if [ -d ../RomDsk/$platform ] ; then fi echo "adding apps to $romdiskfile" -for i in assign fdu format mode osldr rtc survey syscopy sysgen talk timer xm inttest ; do +for i in $Apps ; do + set +e f=$(../../Tools/unix/casefn.sh ../../Binary/Apps/$i.com) + set -e if [ -z "$f" ] ; then echo " " $i "not found" else From a85f962a47e16ad495b3e7eb2a0c9108239e0f46 Mon Sep 17 00:00:00 2001 From: Dean Netherton Date: Sun, 1 Mar 2020 14:07:49 +1100 Subject: [PATCH 5/6] Fix issue with Apps/Tune not making If dest directory does not exist, fails to make Apps --- Source/Apps/Tune/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Apps/Tune/Makefile b/Source/Apps/Tune/Makefile index 3c4d8dcd..3aa5c338 100644 --- a/Source/Apps/Tune/Makefile +++ b/Source/Apps/Tune/Makefile @@ -6,6 +6,7 @@ include $(TOOLS)/Makefile.inc Tune.com: Tune.asm $(TASM) Tune.asm Tune.com - -all:: - cp Tunes/* $(DEST)/Tunes + +all:: + mkdir -p $(DEST)/Tunes + cp Tunes/* $(DEST)/Tunes From 2bce5224f65144f8ced7b4224aeb3f8cfe12432e Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sat, 29 Feb 2020 20:47:44 -0800 Subject: [PATCH 6/6] Create ReadMe.txt --- Binary/Apps/Tunes/ReadMe.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Binary/Apps/Tunes/ReadMe.txt diff --git a/Binary/Apps/Tunes/ReadMe.txt b/Binary/Apps/Tunes/ReadMe.txt new file mode 100644 index 00000000..366efefe --- /dev/null +++ b/Binary/Apps/Tunes/ReadMe.txt @@ -0,0 +1,10 @@ +*********************************************************************** +*** *** +*** R o m W B W *** +*** *** +*** Z80/Z180 System Software *** +*** *** +*********************************************************************** + +This directory contains some sample ProTracker and MYM sound +files that can be played by the TUNE application. \ No newline at end of file