From 8e1706710475d01b6843755b88aa19cbf649b6f0 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sat, 24 Jul 2021 11:24:48 -0700 Subject: [PATCH] Build Improvements Corrects some situations where build fails, but kept going. --- Binary/Clean.cmd | 6 +- Source/Apps/Build.cmd | 54 +++++------ Source/Apps/Clean.cmd | 12 +-- Source/Apps/FAT/Build.cmd | 2 +- Source/Apps/FDU/Build.cmd | 8 +- Source/Apps/I2C/Build.cmd | 12 ++- Source/Apps/Tune/Build.cmd | 12 ++- Source/Apps/XM/Build.cmd | 20 ++--- Source/Apps/ramtest/Build.cmd | 10 +-- Source/BPBIOS/Build.cmd | 38 ++++---- Source/BPBIOS/Clean.cmd | 6 +- Source/BPBIOS/NZFCP13/Build.cmd | 4 +- Source/BPBIOS/Z34RCP11/Build.cmd | 4 +- Source/BPBIOS/ZCPR33/Build.cmd | 16 ++-- Source/Build.cmd | 16 ++-- Source/BuildBP.cmd | 2 +- Source/BuildImages.cmd | 2 +- Source/BuildProp.cmd | 2 +- Source/BuildROM.cmd | 4 +- Source/BuildShared.cmd | 20 ++--- Source/BuildZRC.cmd | 2 +- Source/BuildZZR.cmd | 2 +- Source/CBIOS/Build.cmd | 4 +- Source/CPM22/Build.cmd | 36 ++++---- Source/CPM3/Build.cmd | 148 +++++++++++++++---------------- Source/Clean.cmd | 28 +++--- Source/Fonts/Build.cmd | 18 ++-- Source/Fonts/Clean.cmd | 1 - Source/Forth/Build.cmd | 4 +- Source/HBIOS/Build.cmd | 3 +- Source/HBIOS/Build.ps1 | 23 +++-- Source/Images/Build.cmd | 46 +++++----- Source/Images/BuildDisk.cmd | 5 +- Source/Prop/Build.cmd | 5 +- Source/ZCPR-DJ/Build.cmd | 4 +- Source/ZCPR/Build.cmd | 8 +- Source/ZPM3/Build.cmd | 76 ++++++++-------- Source/ZRC/Build.cmd | 4 +- Source/ZSDOS/Build.cmd | 14 +-- Source/ZSDOS/Clock/Build.cmd | 2 +- Source/ZZR/Build.cmd | 12 +-- 41 files changed, 350 insertions(+), 345 deletions(-) diff --git a/Binary/Clean.cmd b/Binary/Clean.cmd index b9ac0ac5..8116314a 100644 --- a/Binary/Clean.cmd +++ b/Binary/Clean.cmd @@ -11,6 +11,6 @@ if exist *.upd del *.upd if exist *.pdf del *.pdf if exist *.eeprom del *.eeprom -setlocal & cd Apps && call Clean || exit /b 1 & endlocal -setlocal & cd CPM3 && call Clean || exit /b 1 & endlocal -setlocal & cd ZPM3 && call Clean || exit /b 1 & endlocal +pushd Apps && call Clean || exit /b 1 & popd +pushd CPM3 && call Clean || exit /b 1 & popd +pushd ZPM3 && call Clean || exit /b 1 & popd diff --git a/Source/Apps/Build.cmd b/Source/Apps/Build.cmd index 95411144..48a858ae 100644 --- a/Source/Apps/Build.cmd +++ b/Source/Apps/Build.cmd @@ -12,42 +12,42 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -call :asm syscopy || goto :eof -call :asm assign || goto :eof -call :asm format || goto :eof -call :asm talk || goto :eof -call :asm mode || goto :eof -call :asm rtc || goto :eof -call :asm timer || goto :eof -call :asm180 inttest || goto :eof -call :asm rtchb || goto :eof -call :asm ppidetst || goto :eof -call :asm tstdskng || goto :eof - -zx Z80ASM -SYSGEN/F - -zx MAC SURVEY.ASM -$PO -zx MLOAD25 -SURVEY.COM=SURVEY.HEX - -setlocal & cd XM && call Build || exit /b 1 & endlocal -setlocal & cd FDU && call Build || exit /b 1 & endlocal -setlocal & cd Tune && call Build || exit /b 1 & endlocal -setlocal & cd FAT && call Build || exit /b 1 & endlocal -setlocal & cd I2C && call Build || exit /b 1 & endlocal -setlocal & cd ramtest && call Build || exit /b 1 & endlocal - -copy *.com %APPBIN%\ +call :asm syscopy || exit /b +call :asm assign || exit /b +call :asm format || exit /b +call :asm talk || exit /b +call :asm mode || exit /b +call :asm rtc || exit /b +call :asm timer || exit /b +call :asm180 inttest || exit /b +call :asm rtchb || exit /b +call :asm ppidetst || exit /b +call :asm tstdskng || exit /b + +zx Z80ASM -SYSGEN/F || exit /b + +zx MAC SURVEY.ASM -$PO || exit /b +zx MLOAD25 -SURVEY.COM=SURVEY.HEX || exit /b + +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 ramtest && call Build || exit /b & popd + +copy *.com %APPBIN%\ || exit /b goto :eof :asm echo. echo Building %1... -tasm -t80 -g3 -fFF %1.asm %1.com %1.lst +tasm -t80 -g3 -fFF %1.asm %1.com %1.lst || exit /b goto :eof :asm180 echo. echo Building %1... -tasm -t180 -g3 -fFF %1.asm %1.com %1.lst +tasm -t180 -g3 -fFF %1.asm %1.com %1.lst || exit /b goto :eof diff --git a/Source/Apps/Clean.cmd b/Source/Apps/Clean.cmd index 04a056ee..429b0c70 100644 --- a/Source/Apps/Clean.cmd +++ b/Source/Apps/Clean.cmd @@ -7,9 +7,9 @@ if exist *.lst del *.lst if exist *.hex del *.hex if exist *.prn del *.prn -setlocal & cd XM && call Clean || exit /b 1 & endlocal -setlocal & cd FDU && call Clean || exit /b 1 & endlocal -setlocal & cd Tune && call Clean || exit /b 1 & endlocal -setlocal & cd FAT && call Clean || exit /b 1 & endlocal -setlocal & cd I2C && call Clean || exit /b 1 & endlocal -setlocal & cd ramtest && call Clean || exit /b 1 & endlocal +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 ramtest && call Clean || exit /b 1 & popd diff --git a/Source/Apps/FAT/Build.cmd b/Source/Apps/FAT/Build.cmd index d4e7878d..235b1874 100644 --- a/Source/Apps/FAT/Build.cmd +++ b/Source/Apps/FAT/Build.cmd @@ -4,4 +4,4 @@ setlocal REM FAT.com is currently distributed as a binary application, so REM it is not built here. -copy /Y fat.com ..\..\..\Binary\Apps\ +copy /Y fat.com ..\..\..\Binary\Apps\ || exit /b diff --git a/Source/Apps/FDU/Build.cmd b/Source/Apps/FDU/Build.cmd index 414b1e49..7594c95c 100644 --- a/Source/Apps/FDU/Build.cmd +++ b/Source/Apps/FDU/Build.cmd @@ -5,9 +5,7 @@ set TOOLS=../../../Tools set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -t80 -b -fFF fdu.asm fdu.com fdu.lst +tasm -t80 -b -fFF fdu.asm fdu.com fdu.lst || exit /b -if errorlevel 1 goto :eof - -copy /Y fdu.com ..\..\..\Binary\Apps\ -copy /Y fdu.txt ..\..\..\Doc\ \ No newline at end of file +copy /Y fdu.com ..\..\..\Binary\Apps\ || exit /b +copy /Y fdu.txt ..\..\..\Doc\ || exit /b \ No newline at end of file diff --git a/Source/Apps/I2C/Build.cmd b/Source/Apps/I2C/Build.cmd index 60b6a312..8ac7bf8b 100644 --- a/Source/Apps/I2C/Build.cmd +++ b/Source/Apps/I2C/Build.cmd @@ -5,11 +5,9 @@ set TOOLS=../../../Tools set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -t180 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst -tasm -t180 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst -tasm -t180 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst +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 -if errorlevel 1 goto :eof - -copy /Y i2c*.com ..\..\..\Binary\Apps\ -copy /Y rtcds7*.com ..\..\..\Binary\Apps\ +copy /Y i2c*.com ..\..\..\Binary\Apps\ || exit /b +copy /Y rtcds7*.com ..\..\..\Binary\Apps\ || exit /b diff --git a/Source/Apps/Tune/Build.cmd b/Source/Apps/Tune/Build.cmd index 98901a70..6c601548 100644 --- a/Source/Apps/Tune/Build.cmd +++ b/Source/Apps/Tune/Build.cmd @@ -5,11 +5,9 @@ set TOOLS=../../../Tools set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -t180 -g3 -fFF -dWBW tune.asm tune.com tune.lst -tasm -t180 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst -tasm -t180 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst +tasm -t180 -g3 -fFF -dWBW tune.asm tune.com tune.lst || exit /b +tasm -t180 -g3 -fFF -dZX tune.asm tunezx.com tunezx.lst || exit /b +tasm -t180 -g3 -fFF -dMSX tune.asm tunemsx.com tunemsx.lst || exit /b -if errorlevel 1 goto :eof - -copy /Y tune*.com ..\..\..\Binary\Apps\ -copy /Y Tunes\*.* ..\..\..\Binary\Apps\Tunes\ \ No newline at end of file +copy /Y tune*.com ..\..\..\Binary\Apps\ || exit /b +copy /Y Tunes\*.* ..\..\..\Binary\Apps\Tunes\ || exit /b \ No newline at end of file diff --git a/Source/Apps/XM/Build.cmd b/Source/Apps/XM/Build.cmd index 6105dac4..fef70f92 100644 --- a/Source/Apps/XM/Build.cmd +++ b/Source/Apps/XM/Build.cmd @@ -9,22 +9,22 @@ set ZXBINDIR=%TOOLS%\cpm\bin\ set ZXLIBDIR=%TOOLS%\cpm\lib\ set ZXINCDIR=%TOOLS%\cpm\include\ -zx mac xmdm125.asm $PO +zx mac xmdm125.asm $PO || exit /b -zx slr180 -xmhb/HF -zx mload25 XM=xmdm125,xmhb +zx slr180 -xmhb/HF || exit /b +zx mload25 XM=xmdm125,xmhb || exit /b -rem zx slr180 -xmuf/HF -rem zx mload25 XMUF=xmdm125,xmuf +rem zx slr180 -xmuf/HF || exit /b +rem zx mload25 XMUF=xmdm125,xmuf || exit /b -zx slr180 -xmhb_old/HF -zx mload25 XMOLD=xmdm125,xmhb_old +zx slr180 -xmhb_old/HF || exit /b +zx mload25 XMOLD=xmdm125,xmhb_old || exit /b rem set PROMPT=[Build] %PROMPT% rem %comspec% -copy /Y XM.com ..\..\..\Binary\Apps\ -rem copy /Y XMUF.com ..\..\..\Binary\Apps\ -copy /Y XMOLD.com ..\..\..\Binary\Apps\ +copy /Y XM.com ..\..\..\Binary\Apps\ || exit /b +rem copy /Y XMUF.com ..\..\..\Binary\Apps\ || exit /b +copy /Y XMOLD.com ..\..\..\Binary\Apps\ || exit /b rem pause \ No newline at end of file diff --git a/Source/Apps/ramtest/Build.cmd b/Source/Apps/ramtest/Build.cmd index f62f9c6f..403734a5 100644 --- a/Source/Apps/ramtest/Build.cmd +++ b/Source/Apps/ramtest/Build.cmd @@ -5,11 +5,9 @@ set TOOLS=../../../Tools set PATH=%TOOLS%\tasm32;%PATH% set TASMTABS=%TOOLS%\tasm32 -tasm -t80 -b -fFF loader.asm loader.bin loader.lst -tasm -t80 -b -fFF dbgmon.asm dbgmon.bin dbgmon.lst +tasm -t80 -b -fFF loader.asm loader.bin loader.lst || exit /b +tasm -t80 -b -fFF dbgmon.asm dbgmon.bin dbgmon.lst || exit /b -copy /Y /b loader.bin+dbgmon.bin ramtest.com +copy /Y /b loader.bin+dbgmon.bin ramtest.com || exit /b -if errorlevel 1 goto :eof - -copy /Y ramtest.com ..\..\..\Binary\Apps\ +copy /Y ramtest.com ..\..\..\Binary\Apps\ || exit /b diff --git a/Source/BPBIOS/Build.cmd b/Source/BPBIOS/Build.cmd index 54186541..09d9edac 100644 --- a/Source/BPBIOS/Build.cmd +++ b/Source/BPBIOS/Build.cmd @@ -2,9 +2,9 @@ setlocal -setlocal & cd ZCPR33 && call Build || exit /b 1 & endlocal -setlocal & cd Z34RCP11 && call Build || exit /b 1 & endlocal -setlocal & cd NZFCP13 && call Build || exit /b 1 & endlocal +setlocal & cd ZCPR33 && call Build || exit /b & endlocal +setlocal & cd Z34RCP11 && call Build || exit /b & endlocal +setlocal & cd NZFCP13 && call Build || exit /b & endlocal set PATH=%PATH%;..\..\Tools\zx;..\..\Tools\cpmtools; @@ -54,13 +54,13 @@ echo. echo Building BPBIOS Variant "%VER%"... echo. -copy def-ww-z%VER%.lib def-ww.lib -rem if exist bpbio-ww.rel del bpbio-ww.rel -zx ZMAC -BPBIO-WW -/P -if exist bp%VER%.prn del bp%VER%.prn -ren bpbio-ww.prn bp%VER%.prn -ren bpbio-ww.err bp%VER%.err -copy bpbio-ww.rel bp%VER%.rel +copy def-ww-z%VER%.lib def-ww.lib || exit /b +rem if exist bpbio-ww.rel del bpbio-ww.rel || exit /b +zx ZMAC -BPBIO-WW -/P || exit /b +if exist bp%VER%.prn del bp%VER%.prn || exit /b +ren bpbio-ww.prn bp%VER%.prn || exit /b +ren bpbio-ww.err bp%VER%.err || exit /b +copy bpbio-ww.rel bp%VER%.rel || exit /b rem pause @@ -69,17 +69,17 @@ rem while is is still open. Real CP/M does not care, rem but zx fails due to host OS. Below, a temp file rem is used to avoid the problematic rename. -if exist bpsys.img del bpsys.img -if exist bpsys.tmp del bpsys.tmp -copy bp%VER%.dat bpsys.tmp +if exist bpsys.img del bpsys.img || exit /b +if exist bpsys.tmp del bpsys.tmp || exit /b +copy bp%VER%.dat bpsys.tmp || exit /b rem bpsys.tmp -> bpsys.img -zx bpbuild -bpsys.tmp bpsys.img -zx bpbuild -bpsys.tmp font8x8u.asm -fonttool font8x11u.bin > font8x11u.asm -fonttool font8x16u.bin > font8x16u.asm -fonttool font8x8c.bin > font8x8c.asm -fonttool font8x11c.bin > font8x11c.asm -fonttool font8x16c.bin > font8x16c.asm +fonttool font8x8u.bin > font8x8u.asm || exit /b +fonttool font8x11u.bin > font8x11u.asm || exit /b +fonttool font8x16u.bin > font8x16u.asm || exit /b +fonttool font8x8c.bin > font8x8c.asm || exit /b +fonttool font8x11c.bin > font8x11c.asm || exit /b +fonttool font8x16c.bin > font8x16c.asm || exit /b diff --git a/Source/Fonts/Clean.cmd b/Source/Fonts/Clean.cmd index 8712ec61..006ab5e7 100644 --- a/Source/Fonts/Clean.cmd +++ b/Source/Fonts/Clean.cmd @@ -1,6 +1,5 @@ @echo off setlocal - if exist *.asm del *.asm if exist *c.bin del *c.bin diff --git a/Source/Forth/Build.cmd b/Source/Forth/Build.cmd index fa958516..1d93e79f 100644 --- a/Source/Forth/Build.cmd +++ b/Source/Forth/Build.cmd @@ -11,7 +11,7 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -zx zsm =camel80.azm -/l -zx link -CAMEL80.BIN[L200]=CAMEL80 +zx zsm =camel80.azm -/l || exit /b +zx link -CAMEL80.BIN[L200]=CAMEL80 || exit /b diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd index d0e084a1..b0b568af 100644 --- a/Source/HBIOS/Build.cmd +++ b/Source/HBIOS/Build.cmd @@ -1,5 +1,6 @@ @echo off +setlocal set TOOLS=../../Tools -PowerShell .\Build.ps1 %* +PowerShell -ExecutionPolicy Unrestricted .\Build.ps1 %* || exit /b diff --git a/Source/HBIOS/Build.ps1 b/Source/HBIOS/Build.ps1 index 42f36900..afec56a6 100644 --- a/Source/HBIOS/Build.ps1 +++ b/Source/HBIOS/Build.ps1 @@ -127,13 +127,22 @@ if ($RomSize -gt "256") # Current date/time is queried here to be subsequently imbedded in image $TimeStamp = '"' + (Get-Date -Format 'yyyy-MM-dd') + '"' +# Function to run an arbitrary command line, check the result, and throw an exception if an error occurs +Function RunCmd($Cmd) +{ + $Cmd | write-host + Invoke-Expression $Cmd | write-host + if ($LASTEXITCODE -gt 0) {throw "Application Error $LastExitCode"} +} + + # Function to run TASM and throw an exception if an error occurs. Function Asm($Component, $Opt, $Architecture=$CPUType, $Output="${Component}.bin", $List="${Component}.lst") { $Cmd = "tasm -t${Architecture} -g3 -e ${Opt} ${Component}.asm ${Output} ${List}" $Cmd | write-host Invoke-Expression $Cmd | write-host - if ($LASTEXITCODE -gt 0) {throw "TASM returned exit code $LASTEXITCODE"} + if ($LASTEXITCODE -gt 0) {throw "TASM returned exit code $LastExitCode"} } # Function to concatenate two binary files. @@ -220,26 +229,26 @@ Set-Content -Value ([byte[]](0xE5) * (([int]${RomSize} * 1KB) - 128KB)) -Encodin if ($RomSize -gt 128) { # Copy all files from the appropriate directory to the working ROM disk image - cpmcp -f $RomFmt $RomDiskFile ../RomDsk/ROM_${RomSize}KB/*.* 0: + RunCmd "cpmcp -f $RomFmt $RomDiskFile ../RomDsk/ROM_${RomSize}KB/*.* 0:" # Add any platform specific files to the working ROM disk image if (Test-Path "../RomDsk/${Platform}/*.*") { - cpmcp -f $RomFmt $RomDiskFile ../RomDsk/${Platform}/*.* 0: + RunCmd "cpmcp -f $RomFmt $RomDiskFile ../RomDsk/${Platform}/*.* 0:" } # Add the proprietary RomWBW applications to the working ROM disk image foreach ($App in $RomApps) { - cpmcp -f $RomFmt $RomDiskFile ../../Binary/Apps/$App.com 0: + RunCmd "cpmcp -f $RomFmt $RomDiskFile ../../Binary/Apps/$App.com 0:" } # Add the CP/M and ZSystem system images to the ROM disk (used by SYSCOPY) - cpmcp -f $RomFmt $RomDiskFile ..\cpm22\cpm_${Bios}.sys 0:cpm.sys - cpmcp -f $RomFmt $RomDiskFile ..\zsdos\zsys_${Bios}.sys 0:zsys.sys + RunCmd "cpmcp -f $RomFmt $RomDiskFile ..\cpm22\cpm_${Bios}.sys 0:cpm.sys" + RunCmd "cpmcp -f $RomFmt $RomDiskFile ..\zsdos\zsys_${Bios}.sys 0:zsys.sys" # Set all the files in the ROM disk image to read only for extra protection under flash file system. - cpmchattr -f $RomFmt $RomDiskFile r 0:*.* + RunCmd "cpmchattr -f $RomFmt $RomDiskFile r 0:*.*" } # diff --git a/Source/Images/Build.cmd b/Source/Images/Build.cmd index 78efeccd..22393bbb 100644 --- a/Source/Images/Build.cmd +++ b/Source/Images/Build.cmd @@ -4,43 +4,43 @@ setlocal echo. echo Building Floppy Disk Images... echo. -call BuildDisk.cmd cpm22 wbw_fd144 ..\cpm22\cpm_wbw.sys -call BuildDisk.cmd zsdos wbw_fd144 ..\zsdos\zsys_wbw.sys -call BuildDisk.cmd nzcom wbw_fd144 ..\zsdos\zsys_wbw.sys -call BuildDisk.cmd cpm3 wbw_fd144 ..\cpm3\cpmldr.sys -call BuildDisk.cmd zpm3 wbw_fd144 ..\cpm3\cpmldr.sys -call BuildDisk.cmd ws4 wbw_fd144 +call BuildDisk.cmd cpm22 wbw_fd144 ..\cpm22\cpm_wbw.sys || exit /b +call BuildDisk.cmd zsdos wbw_fd144 ..\zsdos\zsys_wbw.sys || exit /b +call BuildDisk.cmd nzcom wbw_fd144 ..\zsdos\zsys_wbw.sys || exit /b +call BuildDisk.cmd cpm3 wbw_fd144 ..\cpm3\cpmldr.sys || exit /b +call BuildDisk.cmd zpm3 wbw_fd144 ..\cpm3\cpmldr.sys || exit /b +call BuildDisk.cmd ws4 wbw_fd144 || exit /b echo. echo Building Hard Disk Images (512 directory entry format)... echo. -call BuildDisk.cmd cpm22 wbw_hd512 ..\cpm22\cpm_wbw.sys -call BuildDisk.cmd zsdos wbw_hd512 ..\zsdos\zsys_wbw.sys -call BuildDisk.cmd nzcom wbw_hd512 ..\zsdos\zsys_wbw.sys -call BuildDisk.cmd cpm3 wbw_hd512 ..\cpm3\cpmldr.sys -call BuildDisk.cmd zpm3 wbw_hd512 ..\cpm3\cpmldr.sys -call BuildDisk.cmd ws4 wbw_hd512 +call BuildDisk.cmd cpm22 wbw_hd512 ..\cpm22\cpm_wbw.sys || exit /b +call BuildDisk.cmd zsdos wbw_hd512 ..\zsdos\zsys_wbw.sys || exit /b +call BuildDisk.cmd nzcom wbw_hd512 ..\zsdos\zsys_wbw.sys || exit /b +call BuildDisk.cmd cpm3 wbw_hd512 ..\cpm3\cpmldr.sys || exit /b +call BuildDisk.cmd zpm3 wbw_hd512 ..\cpm3\cpmldr.sys || exit /b +call BuildDisk.cmd ws4 wbw_hd512 || exit /b -if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hd512 +if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hd512 || exit /b echo. echo Building Combo Disk (512 directory entry format) Image... -copy /b ..\..\Binary\hd512_cpm22.img + ..\..\Binary\hd512_zsdos.img + ..\..\Binary\hd512_nzcom.img + ..\..\Binary\hd512_cpm3.img + ..\..\Binary\hd512_zpm3.img + ..\..\Binary\hd512_ws4.img ..\..\Binary\hd512_combo.img +copy /b ..\..\Binary\hd512_cpm22.img + ..\..\Binary\hd512_zsdos.img + ..\..\Binary\hd512_nzcom.img + ..\..\Binary\hd512_cpm3.img + ..\..\Binary\hd512_zpm3.img + ..\..\Binary\hd512_ws4.img ..\..\Binary\hd512_combo.img || exit /b echo. echo Building Hard Disk Images (1024 directory entry format)... echo. -call BuildDisk.cmd cpm22 wbw_hd1024 ..\cpm22\cpm_wbw.sys -call BuildDisk.cmd zsdos wbw_hd1024 ..\zsdos\zsys_wbw.sys -call BuildDisk.cmd nzcom wbw_hd1024 ..\zsdos\zsys_wbw.sys -call BuildDisk.cmd cpm3 wbw_hd1024 ..\cpm3\cpmldr.sys -call BuildDisk.cmd zpm3 wbw_hd1024 ..\cpm3\cpmldr.sys -call BuildDisk.cmd ws4 wbw_hd1024 +call BuildDisk.cmd cpm22 wbw_hd1024 ..\cpm22\cpm_wbw.sys || exit /b +call BuildDisk.cmd zsdos wbw_hd1024 ..\zsdos\zsys_wbw.sys || exit /b +call BuildDisk.cmd nzcom wbw_hd1024 ..\zsdos\zsys_wbw.sys || exit /b +call BuildDisk.cmd cpm3 wbw_hd1024 ..\cpm3\cpmldr.sys || exit /b +call BuildDisk.cmd zpm3 wbw_hd1024 ..\cpm3\cpmldr.sys || exit /b +call BuildDisk.cmd ws4 wbw_hd1024 || exit /b -if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hd1024 +if exist ..\BPBIOS\bpbio-ww.rel call BuildDisk.cmd bp wbw_hd1024 || exit /b -copy hd1024_prefix.dat ..\..\Binary\ +copy hd1024_prefix.dat ..\..\Binary\ || exit /b echo. echo Building Combo Disk (1024 directory entry format) Image... -copy /b hd1024_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_combo.img +copy /b hd1024_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_combo.img || exit /b diff --git a/Source/Images/BuildDisk.cmd b/Source/Images/BuildDisk.cmd index d280c1fd..4f865ae8 100644 --- a/Source/Images/BuildDisk.cmd +++ b/Source/Images/BuildDisk.cmd @@ -1 +1,4 @@ -@PowerShell -ExecutionPolicy Unrestricted .\BuildDisk.ps1 %* \ No newline at end of file +@echo off +setlocal + +PowerShell -ExecutionPolicy Unrestricted .\BuildDisk.ps1 %* || exit /b \ No newline at end of file diff --git a/Source/Prop/Build.cmd b/Source/Prop/Build.cmd index d46a4655..5cad6196 100644 --- a/Source/Prop/Build.cmd +++ b/Source/Prop/Build.cmd @@ -14,7 +14,6 @@ goto :eof :bstc echo. echo Building %1... -bstc Spin\%1 -e -l -if errorlevel 1 goto :eof -move /Y %1.eeprom "..\..\Binary" +bstc Spin\%1 -e -l || exit /b +move /Y %1.eeprom "..\..\Binary" || exit /b goto :eof diff --git a/Source/ZCPR-DJ/Build.cmd b/Source/ZCPR-DJ/Build.cmd index b07546ee..403a01e1 100644 --- a/Source/ZCPR-DJ/Build.cmd +++ b/Source/ZCPR-DJ/Build.cmd @@ -11,5 +11,5 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -zx M80 -=zcpr/l -zx L80 -zcpr,zcpr.bin/n/e \ No newline at end of file +zx M80 -=zcpr/l || exit /b +zx L80 -zcpr,zcpr.bin/n/e || exit /b \ No newline at end of file diff --git a/Source/ZCPR/Build.cmd b/Source/ZCPR/Build.cmd index 55b3113c..b6b9d764 100644 --- a/Source/ZCPR/Build.cmd +++ b/Source/ZCPR/Build.cmd @@ -11,8 +11,8 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -zx MAC -ZCPR.ASM -$PO -zx MLOAD25 -ZCPR.BIN=ZCPR.HEX +zx MAC -ZCPR.ASM -$PO || exit /b +zx MLOAD25 -ZCPR.BIN=ZCPR.HEX || exit /b -zx MAC -BDLOC.ASM -$PO -zx MLOAD25 -BDLOC.COM=BDLOC.HEX +zx MAC -BDLOC.ASM -$PO || exit /b +zx MLOAD25 -BDLOC.COM=BDLOC.HEX || exit /b diff --git a/Source/ZPM3/Build.cmd b/Source/ZPM3/Build.cmd index 5430167b..e9ef50ca 100644 --- a/Source/ZPM3/Build.cmd +++ b/Source/ZPM3/Build.cmd @@ -11,27 +11,27 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -copy ..\ZCCP\ccp.com zccp.com -copy ..\ZCCP\zinstal.zpm . -copy ..\ZCCP\startzpm.com . -copy ..\CPM3\genbnk.dat . -copy ..\CPM3\zpmbios3.spr bnkbios3.spr -copy ..\CPM3\gencpm.com . -copy ..\CPM3\util.rel . -copy ..\CPM3\biosldrd.rel . -copy ..\CPM3\biosldrc.rel . -copy ..\CPM3\cpmldr.com . -copy ..\CPM3\cpmldr.sys . +copy ..\ZCCP\ccp.com zccp.com || exit /b +copy ..\ZCCP\zinstal.zpm . || exit /b +copy ..\ZCCP\startzpm.com . || exit /b +copy ..\CPM3\genbnk.dat . || exit /b +copy ..\CPM3\zpmbios3.spr bnkbios3.spr || exit /b +copy ..\CPM3\gencpm.com . || exit /b +copy ..\CPM3\util.rel . || exit /b +copy ..\CPM3\biosldrd.rel . || exit /b +copy ..\CPM3\biosldrc.rel . || exit /b +copy ..\CPM3\cpmldr.com . || exit /b +copy ..\CPM3\cpmldr.sys . || exit /b rem ZPM Loader echo. echo. echo *** ZPM Loader *** echo. -zx LINK -ZPMLDRD[L100]=ZPM3LDR,BIOSLDRD,UTIL -move /Y zpmldrd.com zpmldr.bin -zx LINK -ZPMLDRC[L100]=ZPM3LDR,BIOSLDRC,UTIL -move /Y zpmldrc.com zpmldr.com +zx LINK -ZPMLDRD[L100]=ZPM3LDR,BIOSLDRD,UTIL || exit /b +move /Y zpmldrd.com zpmldr.bin || exit /b +zx LINK -ZPMLDRC[L100]=ZPM3LDR,BIOSLDRC,UTIL || exit /b +move /Y zpmldrc.com zpmldr.com || exit /b rem pause rem Banked ZPM3 @@ -39,36 +39,36 @@ echo. echo. echo *** Banked ZPM3 *** echo. -copy genbnk.dat gencpm.dat -zx gencpm -auto -display +copy genbnk.dat gencpm.dat || exit /b +zx gencpm -auto -display || exit /b rem pause rem ZPM3 Tools -zx Z80ASM -clrhist/F -zx Z80ASM -setz3/F -zx Z80ASM -autotog/F +zx Z80ASM -clrhist/F || exit /b +zx Z80ASM -setz3/F || exit /b +zx Z80ASM -autotog/F || exit /b rem Loader -tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst +tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst || exit /b -copy /b loader.bin + zpmldr.bin zpmldr.sys +copy /b loader.bin + zpmldr.bin zpmldr.sys || exit /b rem Copy OS files to Binary directory -copy zpmldr.com ..\..\Binary\ZPM3 -copy zpmldr.sys ..\..\Binary\ZPM3 -copy cpmldr.com ..\..\Binary\ZPM3 -copy cpmldr.sys ..\..\Binary\ZPM3 -copy autotog.com ..\..\Binary\ZPM3 -copy clrhist.com ..\..\Binary\ZPM3 -copy setz3.com ..\..\Binary\ZPM3 -copy cpm3.sys ..\..\Binary\ZPM3 -copy zccp.com ..\..\Binary\ZPM3 -copy zinstal.zpm ..\..\Binary\ZPM3 -copy startzpm.com ..\..\Binary\ZPM3 -copy makedos.com ..\..\Binary\ZPM3 -copy gencpm.dat ..\..\Binary\ZPM3 -copy bnkbios3.spr ..\..\Binary\ZPM3 -copy bnkbdos3.spr ..\..\Binary\ZPM3 -copy resbdos3.spr ..\..\Binary\ZPM3 +copy zpmldr.com ..\..\Binary\ZPM3 || exit /b +copy zpmldr.sys ..\..\Binary\ZPM3 || exit /b +copy cpmldr.com ..\..\Binary\ZPM3 || exit /b +copy cpmldr.sys ..\..\Binary\ZPM3 || exit /b +copy autotog.com ..\..\Binary\ZPM3 || exit /b +copy clrhist.com ..\..\Binary\ZPM3 || exit /b +copy setz3.com ..\..\Binary\ZPM3 || exit /b +copy cpm3.sys ..\..\Binary\ZPM3 || exit /b +copy zccp.com ..\..\Binary\ZPM3 || exit /b +copy zinstal.zpm ..\..\Binary\ZPM3 || exit /b +copy startzpm.com ..\..\Binary\ZPM3 || exit /b +copy makedos.com ..\..\Binary\ZPM3 || exit /b +copy gencpm.dat ..\..\Binary\ZPM3 || exit /b +copy bnkbios3.spr ..\..\Binary\ZPM3 || exit /b +copy bnkbdos3.spr ..\..\Binary\ZPM3 || exit /b +copy resbdos3.spr ..\..\Binary\ZPM3 || exit /b diff --git a/Source/ZRC/Build.cmd b/Source/ZRC/Build.cmd index 5286a107..d303209d 100644 --- a/Source/ZRC/Build.cmd +++ b/Source/ZRC/Build.cmd @@ -3,6 +3,6 @@ setlocal if not exist ..\..\Binary\RCZ80_zrc.rom goto :eof -copy /b zrc_cfldr.bin + zrc_ptbl.bin + zrc_fill_1.bin + zrc_mon.bin + zrc_fill_2.bin + ..\..\Binary\RCZ80_zrc.rom + zrc_fill_3.bin ..\..\Binary\hd1024_zrc_prefix.dat +copy /b zrc_cfldr.bin + zrc_ptbl.bin + zrc_fill_1.bin + zrc_mon.bin + zrc_fill_2.bin + ..\..\Binary\RCZ80_zrc.rom + zrc_fill_3.bin ..\..\Binary\hd1024_zrc_prefix.dat || exit /b -copy /b ..\..\Binary\hd1024_zrc_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_combo.img \ No newline at end of file +copy /b ..\..\Binary\hd1024_zrc_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zrc_combo.img || exit /b \ No newline at end of file diff --git a/Source/ZSDOS/Build.cmd b/Source/ZSDOS/Build.cmd index 984b376a..fd4cf213 100644 --- a/Source/ZSDOS/Build.cmd +++ b/Source/ZSDOS/Build.cmd @@ -11,13 +11,13 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -zx ZMAC -ZSDOS -/P -zx LINK -ZSDOS.BIN=ZSDOS[LD800] +zx ZMAC -ZSDOS -/P || exit /b +zx LINK -ZSDOS.BIN=ZSDOS[LD800] || exit /b -tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst +tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst || exit /b -copy /b ..\zcpr-dj\zcpr.bin + zsdos.bin + ..\cbios\cbios_wbw.bin zsys_wbw.bin -copy /b ..\zcpr-dj\zcpr.bin + zsdos.bin + ..\cbios\cbios_una.bin zsys_una.bin +copy /b ..\zcpr-dj\zcpr.bin + zsdos.bin + ..\cbios\cbios_wbw.bin zsys_wbw.bin || exit /b +copy /b ..\zcpr-dj\zcpr.bin + zsdos.bin + ..\cbios\cbios_una.bin zsys_una.bin || exit /b -copy /b loader.bin + zsys_wbw.bin zsys_wbw.sys -copy /b loader.bin + zsys_una.bin zsys_una.sys +copy /b loader.bin + zsys_wbw.bin zsys_wbw.sys || exit /b +copy /b loader.bin + zsys_una.bin zsys_una.sys || exit /b diff --git a/Source/ZSDOS/Clock/Build.cmd b/Source/ZSDOS/Clock/Build.cmd index 8b14f5c5..d676aae2 100644 --- a/Source/ZSDOS/Clock/Build.cmd +++ b/Source/ZSDOS/Clock/Build.cmd @@ -11,4 +11,4 @@ set ZXBINDIR=%TOOLS%/cpm/bin/ set ZXLIBDIR=%TOOLS%/cpm/lib/ set ZXINCDIR=%TOOLS%/cpm/include/ -zx ZMAC -WBWCLK -/P +zx ZMAC -WBWCLK -/P || exit /b diff --git a/Source/ZZR/Build.cmd b/Source/ZZR/Build.cmd index 6bb4b25e..3d6b0872 100644 --- a/Source/ZZR/Build.cmd +++ b/Source/ZZR/Build.cmd @@ -3,14 +3,14 @@ setlocal if not exist ..\..\Binary\RCZ280_nat_zzr.rom goto :eof -rem ..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Exclude 0x5000 0x7000 zzr_romldr.hex -Intel -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel +rem ..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Exclude 0x5000 0x7000 zzr_romldr.hex -Intel -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel || exit /b -..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel +..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel || exit /b -rem ..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.hex -Intel -Output ..\..\Binary\RCZ280_nat_zzr_ldr.rom -Binary +rem ..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.hex -Intel -Output ..\..\Binary\RCZ280_nat_zzr_ldr.rom -Binary || exit /b -rem copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr_ldr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat +rem copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr_ldr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat || exit /b -copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat +copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat || exit /b -copy /b ..\..\Binary\hd1024_zzr_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zzr_combo.img \ No newline at end of file +copy /b ..\..\Binary\hd1024_zzr_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zzr_combo.img || exit /b \ No newline at end of file