From a56007da8f19ad73b943130ba52509b376e74451 Mon Sep 17 00:00:00 2001
From: Curtis F Kaylor <revcurtis@gmail.com>
Date: Mon, 18 Nov 2019 01:38:23 -0500
Subject: [PATCH] Changed Batch Files in test/ to use a02.exe

---
 test/a02.bat  | 14 ++++++++++++++
 test/c02.bat  | 10 ++++++++++
 test/c64.bat  | 14 ++++++++------
 test/orao.bat | 35 +++++++++++++++++++++++++++++++++++
 test/v8k.bat  |  4 ++--
 test/x16.bat  |  5 -----
 6 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 test/a02.bat
 create mode 100644 test/c02.bat
 create mode 100644 test/orao.bat

diff --git a/test/a02.bat b/test/a02.bat
new file mode 100644
index 0000000..fe0619e
--- /dev/null
+++ b/test/a02.bat
@@ -0,0 +1,14 @@
+@ECHO OFF
+IF "%1" == "" (
+  ECHO Usage: %0 a02file
+  GOTO :EXIT
+) 
+SET ASMEXT=""
+IF EXIST %1.a02 SET ASMEXT=a02
+IF EXIST %1.asm SET ASMEXT=asm
+IF "%ASMEXT%" == "" (
+  ECHO Assembly File %1 Not Found
+  GOTO :EXIT
+) 
+ECHO Assembling File %1.%ASMEXT%
+..\a02.exe %1.%ASMEXT% %1.bin %1.lst >%1.out
diff --git a/test/c02.bat b/test/c02.bat
new file mode 100644
index 0000000..6a515da
--- /dev/null
+++ b/test/c02.bat
@@ -0,0 +1,10 @@
+@ECHO OFF
+IF EXIST %1.c02 GOTO COMPILE
+    ECHO File %1.c02 not found
+    GOTO EOF
+
+:COMPILE
+ECHO Compiling File %1.c02
+..\c02.exe -h header %1 >%1.dbg
+
+:EOF
\ No newline at end of file
diff --git a/test/c64.bat b/test/c64.bat
index e76e61a..32f9d2c 100644
--- a/test/c64.bat
+++ b/test/c64.bat
@@ -1,18 +1,20 @@
+@REM Compile and Run C02 Program for C64
 @ECHO OFF
+
 IF EXIST %1.c02 GOTO COMPILE
-    ECHO File %1.c02 not found
-    GOTO EOF
+ECHO File %1.c02 not found
+GOTO EOF
 
 :COMPILE
 ECHO Compiling File %1.c02 for Commodore 64
-..\c02.exe -h c64 -s c64 -s cbm %1 >%1.dbg
+..\c02.exe -d -h c64 -s c64 -s cbm %1 >%1.dbg
 IF %ERRORLEVEL% NEQ 0 GOTO EOF
-ECHO Assembling File %1.asm
-C:\Programs\dasm %1.asm -f1 -o%1.prg -l%1.lst -s%1.sym
 
+ECHO Assembling File %1.asm
+..\a02.exe -p %1.asm %1.prg %1.lst >%1.out
 IF %ERRORLEVEL% NEQ 0 GOTO EOF
 
 ECHO Starting Emulator
-@start C:\Programs\WinVICE\x64.exe -config x64.ini %1.prg
+start C:\Programs\WinVICE\x64.exe -config x64.ini %1.prg
 
 :EOF
diff --git a/test/orao.bat b/test/orao.bat
new file mode 100644
index 0000000..80157c6
--- /dev/null
+++ b/test/orao.bat
@@ -0,0 +1,35 @@
+@REM Compile and Assemble Program for Orao
+@ECHO OFF
+
+SET ORAOBIN=C:\Programs\OraoEmulator\bin
+SET ORAOTAP=C:\Programs\OraoEmulator\tap
+SET ORAOWAV=C:\Programs\OraoPy\wav
+SET ORAOTOOLS=C:\Programs\OraoEmulator\tools
+
+IF EXIST %1.c02 GOTO COMPILE
+    ECHO File %1.c02 not found
+    EXIT /B
+
+:COMPILE
+ECHO Compiling File %1.c02
+..\c02.exe -h orao -s orao %1 >%1.dbg
+IF ERRORLEVEL 1 EXIT /B
+
+ECHO Assembling File %1.asm
+dasm %1.asm -f1 -o%1.obj -l%1.lst -s%1.sym
+IF ERRORLEVEL 1 EXIT /B
+
+ECHO Creating Binary File
+%ORAOTOOLS%\obj2bin %1.obj %ORAOBIN%\%1.bin
+IF ERRORLEVEL 1 EXIT /B
+
+ECHO Building Tape Image
+%ORAOTOOLS%\maketap %ORAOTAP%\%1.tap %ORAOBIN%\%1.bin
+IF ERRORLEVEL 1 EXIT /B
+
+ECHO Building WAV File
+%ORAOTOOLS%\orao2wav %ORAOBIN%\%1.bin
+IF ERRORLEVEL 1 EXIT /B
+MOVE %ORAOBIN%\%1.wav %ORAOWAV%
+
+DEL %1.obj
diff --git a/test/v8k.bat b/test/v8k.bat
index 1680e0a..14530ae 100644
--- a/test/v8k.bat
+++ b/test/v8k.bat
@@ -8,8 +8,8 @@ ECHO Compiling File %1.c02 for VIC 20 +8k
 ..\c02.exe -h vic8k -s vic -s cbm %1 >%1.dbg
 IF %ERRORLEVEL% NEQ 0 GOTO EOF
 ECHO Assembling File %1.asm
-C:\Programs\dasm %1.asm -f1 -o%1.prg -l%1.lst -s%1.sym
-
+..\a02.exe -p %1.asm %1.prg %1.lst >%1.out
+REM C:\Programs\dasm %1.asm -f1 -o%1.prg -l%1.lst -s%1.sym
 IF %ERRORLEVEL% NEQ 0 GOTO EOF
 
 ECHO Starting Emulator
diff --git a/test/x16.bat b/test/x16.bat
index 99d8a30..bec90d6 100644
--- a/test/x16.bat
+++ b/test/x16.bat
@@ -15,10 +15,5 @@ REM C:\Programs\dasm %1.asm -f1 -o%1.prg -l%1.lst -s%1.sym
 IF %ERRORLEVEL% NEQ 0 GOTO EOF
 
 ECHO Starting Emulator in Debug Mode
-REM SET X16DIR=C:\Programs\x16emu
-REM SET X16EXE=%X16DIR%\x16emu.exe
-REM SET X16ROM=%X16DIR%\rom.bin
-REM SET X16CHR=%X16DIR%\chargen.bin
-REM %X16EXE% -rom %X16ROM% -char %X16CHR% -prg %1.prg -run -debug
 C:\Programs\x16emu\x16emu  -prg %1.prg -run -debug -echo raw >%1.out
 :EOF