From bce36b241d89d3efafef3e5c5373a07006dc6933 Mon Sep 17 00:00:00 2001 From: Abe Kornelis Date: Tue, 26 Nov 2024 20:21:57 +0100 Subject: [PATCH] Add help to fparts.bat and change .mlc to uppercase in various .bat files --- bat/ASM.BAT | 8 ++++---- bat/ASML.BAT | 10 +++++----- bat/ASMLG.BAT | 10 +++++----- bat/ASSIST.BAT | 8 ++++---- bat/FPARTS.BAT | 2 ++ bat/MAC.BAT | 10 +++++----- bat/RUNZSTRMACTEST.BAT | 2 +- bat/ZC390.BAT | 4 ++-- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/bat/ASM.BAT b/bat/ASM.BAT index af539438f..edaf9dde4 100644 --- a/bat/ASM.BAT +++ b/bat/ASM.BAT @@ -1,5 +1,5 @@ @if /I "%1" == "tron" (echo on) else (echo off) -rem asm run macro assembly to generate relocatable obj from mlc source +rem asm run macro assembly to generate relocatable obj from MLC source setlocal if /I "%1" == "tron" (set z_TraceMode=tron @@ -11,7 +11,7 @@ if /I "%1" == "tron" (set z_TraceMode=tron set /A z_NestLevel=%z_NestLevel%+1 rem ----- Lvl(%z_NestLevel%) Start %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 -if /I %1. == . (set /P z_file=Hit Enter for help or supply name of mlc file to assemble: +if /I %1. == . (set /P z_file=Hit Enter for help or supply name of MLC file to assemble: ) else (set z_file=%1) if /I %z_file%. == . goto help :chkfile @@ -22,8 +22,8 @@ set z_file=%z_fdrv%%z_fpath%%z_fname% if exist %z_file%%z_fext% goto file_ok rem if extension specified: error because no default applies if /I %z_fext%. NEQ . goto notfound -rem try with default extension of mlc -set z_fext=.mlc +rem try with default extension of MLC +set z_fext=.MLC if exist %z_file%%z_fext% goto file_ok :notfound echo Error: Source file %z_file%%z_fext% does not exist diff --git a/bat/ASML.BAT b/bat/ASML.BAT index a89d56b83..912088baf 100644 --- a/bat/ASML.BAT +++ b/bat/ASML.BAT @@ -1,5 +1,5 @@ @if /I "%1" == "tron" (echo on) else (echo off) -rem asml assemble and link to generate load module 390 from mlc +rem asml assemble and link to generate load module 390 from MLC setlocal if /I "%1" == "tron" (set z_TraceMode=tron @@ -11,7 +11,7 @@ if /I "%1" == "tron" (set z_TraceMode=tron set /A z_NestLevel=%z_NestLevel%+1 rem ----- Lvl(%z_NestLevel%) Start %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 -if /I %1. == . (set /P z_file=Hit Enter for help or supply name of mlc file to assemble and link: +if /I %1. == . (set /P z_file=Hit Enter for help or supply name of MLC file to assemble and link: ) else (set z_file=%1) if /I %z_file%. == . goto help :chkfile @@ -22,8 +22,8 @@ set z_file=%z_fdrv%%z_fpath%%z_fname% if exist %z_file%%z_fext% goto file_ok rem if extension specified: error because no default applies if /I %z_fext%. NEQ . goto notfound -rem try with default extension of mlc -set z_fext=.mlc +rem try with default extension of MLC +set z_fext=.MLC if exist %z_file%%z_fext% goto file_ok :notfound echo Error: Source file %z_file%%z_fext% does not exist @@ -66,7 +66,7 @@ echo the ASML.BAT procedure is intended to assemble and link a single assembler echo . :retry set z_file= -set /P z_file=Hit Enter for more help or supply name of mlc file to assemble and link: +set /P z_file=Hit Enter for more help or supply name of MLC file to assemble and link: if /I %z_file%. NEQ . goto chkfile call %~dps0help %z_TraceMode% diff --git a/bat/ASMLG.BAT b/bat/ASMLG.BAT index ed03a2c0a..09d760f9f 100644 --- a/bat/ASMLG.BAT +++ b/bat/ASMLG.BAT @@ -1,5 +1,5 @@ @if /I "%1" == "tron" (echo on) else (echo off) -rem asmlg assemble, link, and go from mlc to 390 execution +rem asmlg assemble, link, and go from MLC to 390 execution setlocal if /I "%1" == "tron" (set z_TraceMode=tron @@ -11,7 +11,7 @@ if /I "%1" == "tron" (set z_TraceMode=tron set /A z_NestLevel=%z_NestLevel%+1 rem ----- Lvl(%z_NestLevel%) Start %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 -if /I %1. == . (set /P z_file=Hit Enter for help or supply name of mlc file to assemble, link, and execute: +if /I %1. == . (set /P z_file=Hit Enter for help or supply name of MLC file to assemble, link, and execute: ) else (set z_file=%1) if /I %z_file%. == . goto help :chkfile @@ -22,8 +22,8 @@ set z_file=%z_fdrv%%z_fpath%%z_fname% if exist %z_file%%z_fext% goto file_ok rem if extension specified: error because no default applies if /I %z_fext%. NEQ . goto notfound -rem try with default extension of mlc -set z_fext=.mlc +rem try with default extension of MLC +set z_fext=.MLC if exist %z_file%%z_fext% goto file_ok :notfound echo Error: Source file %z_file%%z_fext% does not exist @@ -70,7 +70,7 @@ echo the ASMLG.BAT procedure is intended to assemble, link, and execute a single echo . :retry set z_file= -set /P z_file=Hit Enter for more help or supply name of mlc file to assemble, link, and execute: +set /P z_file=Hit Enter for more help or supply name of MLC file to assemble, link, and execute: if /I %z_file%. NEQ . goto chkfile call %~dps0help %z_TraceMode% diff --git a/bat/ASSIST.BAT b/bat/ASSIST.BAT index b538343e7..55ce1a528 100644 --- a/bat/ASSIST.BAT +++ b/bat/ASSIST.BAT @@ -11,7 +11,7 @@ if /I "%1" == "tron" (set z_TraceMode=tron set /A z_NestLevel=%z_NestLevel%+1 rem ----- Lvl(%z_NestLevel%) Start %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 -if /I %1. == . (set /P z_file=Hit Enter for help or supply name of mlc file to assemble, link, and execute: +if /I %1. == . (set /P z_file=Hit Enter for help or supply name of MLC file to assemble, link, and execute: ) else (set z_file=%1) if /I %z_file%. == . goto help :chkfile @@ -22,8 +22,8 @@ set z_file=%z_fdrv%%z_fpath%%z_fname% if exist %z_file%%z_fext% goto file_ok rem if extension specified: error because no default applies if /I %z_fext%. NEQ . goto notfound -rem try with default extension of mlc -set z_fext=.mlc +rem try with default extension of MLC +set z_fext=.MLC if exist %z_file%%z_fext% goto file_ok :notfound echo Error: Source file %z_file%%z_fext% does not exist @@ -49,7 +49,7 @@ echo the ASSIST.BAT procedure is intended to assemble, link, and execute a singl echo . :retry set z_file= -set /P z_file=Hit Enter for more help or supply name of mlc file to assemble, link, and execute: +set /P z_file=Hit Enter for more help or supply name of MLC file to assemble, link, and execute: if /I %z_file%. NEQ . goto chkfile call %~dps0help %z_TraceMode% diff --git a/bat/FPARTS.BAT b/bat/FPARTS.BAT index ebaa007bb..ead476a39 100644 --- a/bat/FPARTS.BAT +++ b/bat/FPARTS.BAT @@ -12,6 +12,8 @@ set /A z_NestLevel=%z_NestLevel%+1 rem ----- Lvl(%z_NestLevel%) Start %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 set z_ReturnCode=0 +if "%1" == "/?" goto help +if "%1" == "?" goto help if not exist %1 set z_ReturnCode=8 set z_fdrv=%~d1 diff --git a/bat/MAC.BAT b/bat/MAC.BAT index a7d9df37e..f5b14160d 100644 --- a/bat/MAC.BAT +++ b/bat/MAC.BAT @@ -1,5 +1,5 @@ @if /I "%1" == "tron" (echo on) else (echo off) -rem mac run mz390 macro processor to expand mlc to bal with nomlc +rem mac run mz390 macro processor to expand MLC to BAL using option nomlc setlocal if /I "%1" == "tron" (set z_TraceMode=tron @@ -11,7 +11,7 @@ if /I "%1" == "tron" (set z_TraceMode=tron set /A z_NestLevel=%z_NestLevel%+1 rem ----- Lvl(%z_NestLevel%) Start %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 -if /I %1. == . (set /P z_file=Hit Enter for help or supply name of mlc file to expand: +if /I %1. == . (set /P z_file=Hit Enter for help or supply name of MLC file to expand: ) else (set z_file=%1) if /I %z_file%. == . goto help :chkfile @@ -22,8 +22,8 @@ set z_file=%z_fdrv%%z_fpath%%z_fname% if exist %z_file%%z_fext% goto file_ok rem if extension specified: error because no default applies if /I %z_fext%. NEQ . goto notfound -rem try with default extension of mlc -set z_fext=.mlc +rem try with default extension of MLC +set z_fext=.MLC if exist %z_file%%z_fext% goto file_ok :notfound echo Error: Source file %z_file%%z_fext% does not exist @@ -50,7 +50,7 @@ echo the MAC.BAT procedure is intended to expand a single assembler program by r echo . :retry set z_file= -set /P z_file=Hit Enter for more help or supply name of mlc file to expand: +set /P z_file=Hit Enter for more help or supply name of MLC file to expand: if /I %z_file%. NEQ . goto chkfile call %~dps0help %z_TraceMode% diff --git a/bat/RUNZSTRMACTEST.BAT b/bat/RUNZSTRMACTEST.BAT index 19f4e7c70..c60e14acf 100644 --- a/bat/RUNZSTRMACTEST.BAT +++ b/bat/RUNZSTRMACTEST.BAT @@ -43,7 +43,7 @@ if %z_ReturnCode% GTR 0 (set z_ReturnCode=8 goto return ) -echo Regen ZSTRMAC2 using mz390 support to ver zstrmac2.txt = mlc +echo Regen ZSTRMAC2 using mz390 support to ver ZSTRMAC2.TXT = MLC set SYSUT1=rt\test\ZSTRMAC2.ZSM set SYSUT2=rt\test\ZSTRMAC2.MLC call bat\MZ390 %z_TraceMode% rt\test\ZSTRMAC2.ZSM NOASM NOTIMING STATS || goto error diff --git a/bat/ZC390.BAT b/bat/ZC390.BAT index 4845fedaf..2a98ae1b2 100644 --- a/bat/ZC390.BAT +++ b/bat/ZC390.BAT @@ -25,11 +25,11 @@ java -classpath %~dps0..\z390.jar -Xrs zc390 %1 %2 %3 %4 %5 %6 %7 %8 %9 set z_ReturnCode=%ERRORLEVEL% if %z_ReturnCode% EQU 0 goto return -if %z_ReturnCode% EQU 4 (echo %0 WARNING: See warnings on zc390 generated mlc file and console +if %z_ReturnCode% EQU 4 (echo %0 WARNING: See warnings on zc390 generated MLC file and console goto return ) rem ErrorLevel 1 for Java issues or ErrorLevel 8 / 12 for assembly issues -echo %0 ERROR: See errors on zc390 generated mlc file and console +echo %0 ERROR: See errors on zc390 generated MLC file and console :return rem ----- Lvl(%z_NestLevel%) End %0 %1 %2 %3 %4 %5 %6 %7 %8 %9