Merge pull request #444 from kiwisincebirth/map/image-file-defs

Fixes to Imgae file Defs, and move test files, and readme files

Source/Images/d_cpm22/ReadMe.txt

@@ -134,7 +134,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR

Source/Images/d_nzcom/ReadMe.txt

@@ -302,7 +302,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR

Source/Images/d_qpm/ReadMe.txt

@@ -175,7 +175,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR

Source/Images/d_z80asm/Readme.txt

@@ -6,7 +6,7 @@ and stores the output in either a core-image, Intel hex format, or relocatable
 object file. The mnemonics recognized are those of Zilog/Mostek. The optional
 listing output may be sent to a disk file, the console and/or the printer, in
 any combination. Output files may also be generated containing cross-reference
-information on each symbol used.
+information on each symbol used.
 
 The manual is available in the Doc/Language directory,
 z80asm (SLR Systems).pdf

Source/Images/d_zsdos/ReadMe.txt

@@ -275,7 +275,7 @@ LBREXT.COM - Extract file from .LBR libraries
 LBREXT36.CFG - ZCNFG configuration file for LBREXT
 ZXD.COM - Enhanced directory lister w/ date/time stamp support
 ZXD.CFG - ZCNFG configuration file for ZXD
-BBCBASIC.COM - BBC BASIC CP/M Version 3.00 by R.T.Russell
+BBCBASIC.COM - BBC BASIC CP/M Version by R.T.Russell
 BBCBASIC.TXT - Help file for BBC BASIC
 GENHEX.COM - Generates an Intel Hex file from the input file
 LS.COM - An alternative file listing to DIR

Source/Images/fd_bp.txt

@@ -37,12 +37,6 @@
 ../../Binary/Apps/zmconfig.ovr 15:
 ../../Binary/Apps/zmd.com 15:
 ../../Binary/Apps/vgmplay.com 15:
-
-# Add Tune sample files
-#
-../../Binary/Apps/Tunes/*.pt? 3:
-../../Binary/Apps/Tunes/*.mym 3:
-../../Binary/Apps/Tunes/*.vgm 3:
 #
 # Add Common Applications
 #

Source/Images/fd_cpm22.txt

@@ -34,12 +34,6 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/zmd.com 0:
 ../../Binary/Apps/vgmplay.com 0:
 #
-# Add Tune sample files
-#
-../../Binary/Apps/Tunes/*.pt? 3:
-../../Binary/Apps/Tunes/*.mym 3:
-../../Binary/Apps/Tunes/*.vgm 3:
-#
 # Add OS image
 #
 ../CPM22/cpm_wbw.sys 0:cpm.sys

Source/Images/fd_cpm3.txt

@@ -1,4 +1,8 @@
 #
+# Add the ReadMe document
+#
+d_cpm3/ReadMe.txt 0:
+#
 # Add files from CPM3 build
 #
 ../CPM3/cpmldr.com 0:

Source/Images/fd_qpm.txt

@@ -38,12 +38,6 @@ d_cpm22/u0/*.* 0:
 ../../Binary/Apps/zmd.com 0:
 ../../Binary/Apps/vgmplay.com 0:
 #
-# Add Tune sample files
-#
-../../Binary/Apps/Tunes/*.pt? 3:
-../../Binary/Apps/Tunes/*.mym 3:
-../../Binary/Apps/Tunes/*.vgm 3:
-#
 # Add OS image
 #
 ../QPM/qpm_wbw.sys 0:qpm.sys

Source/Images/fd_zpm3.txt

@@ -1,10 +1,15 @@
 #
+# Add the ReadMe document
+#
+d_zpm3/ReadMe.txt 0:
+#
 # Add files from ZPM3 build
 #
 ../ZPM3/zpmldr.com 0:
 ../ZPM3/zpmldr.sys 0:
-../CPM3/cpmldr.com 0:
-../CPM3/cpmldr.sys 0:
+# Failsafe CPM3 Loaders removed for now
+#../CPM3/cpmldr.com 0:
+#../CPM3/cpmldr.sys 0:
 ../ZPM3/autotog.com 15:
 ../ZPM3/clrhist.com 15:
 ../ZPM3/setz3.com 15:

Source/Images/fd_zsdos.txt

@@ -47,12 +47,6 @@ d_cpm22/u0/XSUB.COM 0:
 ../../Binary/Apps/zmd.com 0:
 ../../Binary/Apps/vgmplay.com 0:
 #
-# Add Tune sample files
-#
-../../Binary/Apps/Tunes/*.pt? 3:
-#../../Binary/Apps/Tunes/*.mym 3:
-../../Binary/Apps/Tunes/*.vgm 3:
-#
 # Add OS image
 #
 ../ZSDOS/zsys_wbw.sys 0:zsys.sys

Source/Images/hd_bp.txt

@@ -11,12 +11,12 @@
 #
 #../../Binary/Apps/*.com 15:
 ../../Binary/Apps/assign.com 15:
-../../Binary/Apps/bbcbasic.com 0:
-../../Binary/Apps/bbcbasic.txt 0:
+../../Binary/Apps/bbcbasic.com 15:
+../../Binary/Apps/bbcbasic.txt 15:
 ../../Binary/Apps/cpuspd.com 15:
 ../../Binary/Apps/reboot.com 15:
-../../Binary/Apps/copysl.com 0:
-../../Binary/Apps/copysl.doc 0:
+../../Binary/Apps/copysl.com 15:
+../../Binary/Apps/copysl.doc 15:
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/fdu.doc 15:
@@ -44,7 +44,7 @@
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -56,7 +56,6 @@ Test/*.* 2:
 #
 Common/All/*.* 15:
 Common/CPM22/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:

Source/Images/hd_cpm22.txt

@@ -40,7 +40,7 @@ d_cpm22/ReadMe.txt 0:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #

Source/Images/hd_cpm3.txt

@@ -1,4 +1,8 @@
 #
+# Add the ReadMe document
+#
+d_cpm3/ReadMe.txt 0:
+#
 # Add files from CPM3 build
 #
 ../CPM3/cpmldr.com 0:
@@ -56,7 +60,7 @@
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #

Source/Images/hd_nzcom.txt

@@ -34,8 +34,8 @@ d_zsdos/u0/*.DAT 15:
 ../../Binary/Apps/bbcbasic.txt 10:
 ../../Binary/Apps/cpuspd.com 15:
 ../../Binary/Apps/reboot.com 15:
-../../Binary/Apps/copysl.com 0:
-../../Binary/Apps/copysl.doc 0:
+../../Binary/Apps/copysl.com 15:
+../../Binary/Apps/copysl.doc 10:
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/fdu.doc 10:
@@ -63,7 +63,7 @@ d_zsdos/u0/*.DAT 15:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -79,7 +79,6 @@ Test/*.* 2:
 #
 Common/All/*.* 15:
 Common/CPM22/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:

Source/Images/hd_qpm.txt

@@ -44,7 +44,7 @@ d_cpm22/u0/*.* 0:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #

Source/Images/hd_zpm3.txt

@@ -1,10 +1,15 @@
 #
+# Add the ReadMe document
+#
+d_zpm3/ReadMe.txt 0:
+#
 # Add files from ZPM3 build
 #
 ../ZPM3/zpmldr.com 0:
 ../ZPM3/zpmldr.sys 0:
-../CPM3/cpmldr.com 0:
-../CPM3/cpmldr.sys 0:
+# Failsafe CPM3 Loaders removed for now
+#../CPM3/cpmldr.com 0:
+#../CPM3/cpmldr.sys 0:
 ../ZPM3/autotog.com 15:
 ../ZPM3/clrhist.com 15:
 ../ZPM3/setz3.com 15:
@@ -22,12 +27,12 @@
 #
 #../../Binary/Apps/*.com 15:
 ../../Binary/Apps/assign.com 15:
-../../Binary/Apps/bbcbasic.com 0:
-../../Binary/Apps/bbcbasic.txt 0:
+../../Binary/Apps/bbcbasic.com 15:
+../../Binary/Apps/bbcbasic.txt 15:
 ../../Binary/Apps/cpuspd.com 15:
 ../../Binary/Apps/reboot.com 15:
-../../Binary/Apps/copysl.com 0:
-../../Binary/Apps/copysl.doc 0:
+../../Binary/Apps/copysl.com 15:
+../../Binary/Apps/copysl.doc 15:
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/fdu.doc 15:
@@ -55,7 +60,7 @@
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -67,11 +72,10 @@ Test/*.* 2:
 #
 Common/All/*.* 15:
 Common/CPM3/*.* 15:
-#Common/Z/u10/*.* 10:
 Common/Z/u14/*.* 14:
 Common/Z/u15/*.* 15:
 Common/Z3/u10/*.* 10:
 Common/Z3/u14/*.* 14:
 Common/Z3/u15/*.* 15:
 Common/SIMH/*.* 13:
-Common/UTILS/*.* 0:
+Common/UTILS/*.* 15:

Source/Images/hd_zsdos.txt

@@ -53,7 +53,7 @@ d_cpm22/u0/XSUB.COM 0:
 #
 ../../Binary/Apps/Test/*.com 2:
 ../../Binary/Apps/Test/*.doc 2:
-Test/*.* 2:
+Common/Test/*.* 2:
 #
 # Add Tune sample files
 #
@@ -69,7 +69,6 @@ Test/*.* 2:
 #
 Common/All/*.* 0:
 Common/CPM22/*.* 0:
-#Common/Z/u10/*.* 0:
 Common/Z/u14/*.* 0:
 Common/Z/u15/*.* 0:
 Common/SIMH/*.* 13: