Test Apps Linux Build

- Complete the reorganization of the test apps by implementing Makefile changes.

Source/Apps/Build.cmd

@@ -30,8 +30,7 @@ pushd XM && call Build || exit /b & popd
 pushd FDU && call Build || exit /b & popd
 pushd Tune && call Build || exit /b & popd
 pushd FAT && call Build || exit /b & popd
-pushd I2C && call Build || exit /b & popd
-pushd TEST && call Build || exit /b & popd
+pushd Test && call Build || exit /b & popd
 pushd ZMP && call Build || exit /b & popd
 
 copy *.com %APPBIN%\ || exit /b

Source/Apps/Clean.cmd

@@ -11,6 +11,5 @@ pushd XM && call Clean || exit /b 1 & popd
 pushd FDU && call Clean || exit /b 1 & popd
 pushd Tune && call Clean || exit /b 1 & popd
 pushd FAT && call Clean || exit /b 1 & popd
-pushd I2C && call Clean || exit /b 1 & popd
-pushd TEST && call Clean || exit /b 1 & popd
+pushd Test && call Clean || exit /b 1 & popd
 pushd ZMP && call Clean || exit /b 1 & popd

Source/Apps/Makefile

@@ -1,7 +1,7 @@
 OBJECTS = sysgen.com survey.com \
 	syscopy.com assign.com format.com talk.com mode.com rtc.com \
 	timer.com rtchb.com
-SUBDIRS = XM FDU FAT Tune I2C TEST ZMP
+SUBDIRS = XM FDU FAT Tune Test ZMP
 DEST = ../../Binary/Apps
 TOOLS =../../Tools
 

Source/Apps/Test/Build.cmd

@@ -13,10 +13,11 @@ set ZXLIBDIR=%TOOLS%/cpm/lib/
 set ZXINCDIR=%TOOLS%/cpm/include/
 
 pushd DMAmon && call Build || exit /b & popd
-pushd dskyng && call Build || exit /b & popd
-pushd inttst && call Build || exit /b & popd
+pushd tstdskng && call Build || exit /b & popd
+pushd inttest && call Build || exit /b & popd
 pushd ppidetst && call Build || exit /b & popd
 pushd ramtest && call Build || exit /b & popd
+pushd I2C && call Build || exit /b & popd
 
 goto :eof
 

Source/Apps/Test/Clean.cmd

@@ -8,7 +8,8 @@ if exist *.hex del *.hex
 if exist *.prn del *.prn
 
 pushd DMAmon && call Clean || exit /b 1 & popd
-pushd dskyng && call Clean || exit /b 1 & popd
-pushd inttst && call Clean || exit /b 1 & popd
+pushd tstdskng && call Clean || exit /b 1 & popd
+pushd inttest && call Clean || exit /b 1 & popd
 pushd ppidetst && call Clean || exit /b 1 & popd
 pushd ramtest && call Clean || exit /b 1 & popd
+pushd I2C && call Clean || exit /b 1 & popd

Source/Apps/Test/DMAmon/Build.cmd

@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF dmamon.asm dmamon.com dmamon.lst || exit /b
 
-copy /Y dmamon.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y dmamon.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/DMAmon/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = dmamon.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/Test/DMAmon/dmamon.asm

@@ -95,7 +95,7 @@ DMATST_D:
 ;
 DMATST_Y:
 	call	PRTSTRD
-	.db	"\n\r\Y READY\n\r$"
+	.db	"\n\rY READY\n\r$"
 ;	CALL	
 	JP	MENULP
 ;

Source/Apps/Test/I2C/Build.cmd

@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-set TOOLS=../../../Tools
+set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
@@ -9,5 +9,5 @@ tasm -t180 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst || exit /b
 tasm -t180 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst || exit /b
 tasm -t180 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst || exit /b
 
-copy /Y i2c*.com ..\..\..\Binary\Apps\ || exit /b
-copy /Y rtcds7*.com ..\..\..\Binary\Apps\ || exit /b
+copy /Y i2c*.com ..\..\..\..\Binary\Apps\Test\ || exit /b
+copy /Y rtcds7*.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Test/I2C/Makefile

@@ -1,6 +1,6 @@
 OBJECTS = i2cscan.com rtcds7.com i2clcd.com
-DEST = ../../../Binary/Apps
-TOOLS = ../../../Tools
+DEST = ../../../../Binary/Apps/Test/
+TOOLS = ../../../../Tools
 
 USETASM=1
 TASMFLAGS=-dWBW

Source/Apps/Test/Makefile

@@ -0,0 +1,6 @@
+OBJECTS = 
+SUBDIRS = DMAMon I2C inttest ppidetst ramtest tstdskng
+DEST = ../../../Binary/Apps/Test
+TOOLS =../../../Tools
+
+include $(TOOLS)/Makefile.inc

Source/Apps/Test/inttest/Build.cmd

@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF inttest.asm inttest.com inttest.lst || exit /b
 
-copy /Y inttest.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y inttest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/inttest/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = inttest.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/Test/ppidetst/Build.cmd

@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF ppidetst.asm ppidetst.com ppidetst.lst || exit /b
 
-copy /Y ppidetst.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y ppidetst.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/ppidetst/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = ppidetst.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Apps/Test/ramtest/Build.cmd

@@ -10,4 +10,4 @@ tasm -t80 -b -fFF dbgmon.asm dbgmon.bin dbgmon.lst || exit /b
 
 copy /Y /b loader.bin+dbgmon.bin ramtest.com || exit /b
 
-copy /Y ramtest.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y ramtest.com ..\..\..\..\Binary\Apps\Test\ || exit /b

Source/Apps/Test/ramtest/Makefile

@@ -1,7 +1,7 @@
 OBJECTS = ramtest.com
-DEST = ../../../Binary/Apps
-DOCDEST = ../../../Doc
-TOOLS = ../../../Tools
+DEST = ../../../../Binary/Apps/Test
+DOCDEST = ../../../../Doc
+TOOLS = ../../../../Tools
 OTHERS = loader.bin dbgmon.bin
 include $(TOOLS)/Makefile.inc
 

Source/Apps/Test/tstdskng/Build.cmd

@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF tstdskng.asm tstdskng.com tstdskng.lst || exit /b
 
-copy /Y tstdskng.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y tstdskng.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 

Source/Apps/Test/tstdskng/Makefile

@@ -0,0 +1,7 @@
+OBJECTS = tstdskng.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc

Source/Images/d_bp.txt

@@ -16,7 +16,6 @@
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/format.com 15:
-../../Binary/Apps/inttest.com 15:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
@@ -34,13 +33,15 @@
 ../../Binary/Apps/zminit.ovr 15:
 ../../Binary/Apps/zmconfig.ovr 15:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
+Test/*.* 2:
 #
 # Add Tune sample files
 #

Source/Images/d_cpm22.txt

@@ -10,7 +10,6 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -28,13 +27,14 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
 Test/*.* 2:
 #
 # Add Tune sample files

Source/Images/d_cpm3.txt

@@ -26,7 +26,6 @@
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -44,13 +43,15 @@
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
+Test/*.* 2:
 #
 # Add Tune sample files
 #

Source/Images/d_nzcom.txt

@@ -27,7 +27,6 @@ d_zsdos/u0/*.* 0:
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -45,13 +44,14 @@ d_zsdos/u0/*.* 0:
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
 Test/*.* 2:
 #
 # Add Tune sample files

Source/Images/d_zpm3.txt

@@ -25,7 +25,6 @@
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/format.com 15:
-../../Binary/Apps/inttest.com 15:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
@@ -43,13 +42,15 @@
 ../../Binary/Apps/zminit.ovr 15:
 ../../Binary/Apps/zmconfig.ovr 15:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
+Test/*.* 2:
 #
 # Add Tune sample files
 #

Source/Images/d_zsdos.txt

@@ -23,7 +23,6 @@ d_cpm22/u0/XSUB.COM 0:
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -41,13 +40,14 @@ d_cpm22/u0/XSUB.COM 0:
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
 Test/*.* 2:
 #
 # Add Tune sample files

Source/RomDsk/Build.cmd

@@ -12,7 +12,7 @@ set ZXLIBDIR=%TOOLS%/cpm/lib/
 set ZXINCDIR=%TOOLS%/cpm/include/
 
 set RomApps1=assign mode rtc syscopy xm
-set RomApps2=fdu format survey sysgen talk timer inttest
+set RomApps2=fdu format survey sysgen talk timer
 
 ::
 :: Make all variants of the ROM Disk contents image.  Three sizes are

Source/RomDsk/Makefile

@@ -7,7 +7,7 @@ include $(TOOLS)/Makefile.inc
 .SHELLFLAGS = -ce
 
 ROMAPPS1 := assign mode rtc syscopy xm
-ROMAPPS2 := fdu format survey sysgen talk timer inttest
+ROMAPPS2 := fdu format survey sysgen talk timer
 
 rom256_%.dat: ROMSIZ=256
 rom512_%.dat: ROMSIZ=512

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.120"
+#DEFINE BIOSVER	"3.1.1-pre.121"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.120"
+	db	"3.1.1-pre.121"
 	endm