From 8586202ae2d45add285ca0e8cffa57958b06ab79 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Tue, 6 Nov 2018 19:51:20 -0800 Subject: [PATCH] Minor Cleanup --- Source/BuildShared.cmd | 1 + Source/Clean.cmd | 1 + Source/{HBIOS => }/Forth/Build.cmd | 6 +----- Source/{HBIOS => }/Forth/Clean.cmd | 0 Source/{HBIOS => }/Forth/camel80.azm | 0 Source/{HBIOS => }/Forth/camel80d.azm | 0 Source/{HBIOS => }/Forth/camel80h.azm | 0 Source/{HBIOS => }/Forth/cameltst.azm | 0 Source/{HBIOS => }/Forth/camldump.azm | 0 Source/{HBIOS => }/Forth/copying | 0 Source/{HBIOS => }/Forth/glosshi.txt | 0 Source/{HBIOS => }/Forth/glosslo.txt | 0 Source/{HBIOS => }/Forth/readme.z80 | 0 Source/HBIOS/Build.cmd | 4 ---- Source/HBIOS/Build.ps1 | 11 +++++++---- 15 files changed, 10 insertions(+), 13 deletions(-) rename Source/{HBIOS => }/Forth/Build.cmd (75%) rename Source/{HBIOS => }/Forth/Clean.cmd (100%) rename Source/{HBIOS => }/Forth/camel80.azm (100%) rename Source/{HBIOS => }/Forth/camel80d.azm (100%) rename Source/{HBIOS => }/Forth/camel80h.azm (100%) rename Source/{HBIOS => }/Forth/cameltst.azm (100%) rename Source/{HBIOS => }/Forth/camldump.azm (100%) rename Source/{HBIOS => }/Forth/copying (100%) rename Source/{HBIOS => }/Forth/glosshi.txt (100%) rename Source/{HBIOS => }/Forth/glosslo.txt (100%) rename Source/{HBIOS => }/Forth/readme.z80 (100%) diff --git a/Source/BuildShared.cmd b/Source/BuildShared.cmd index c4faec22..c2852206 100644 --- a/Source/BuildShared.cmd +++ b/Source/BuildShared.cmd @@ -7,3 +7,4 @@ setlocal & cd ZCPR && call Build || exit /b 1 & endlocal setlocal & cd ZCPR-DJ && call Build || exit /b 1 & endlocal setlocal & cd ZSDOS && call Build || exit /b 1 & endlocal setlocal & cd CBIOS && call Build || exit /b 1 & endlocal +setlocal & cd Forth && call Build || exit /b 1 & endlocal diff --git a/Source/Clean.cmd b/Source/Clean.cmd index 5ebd6162..63f011c0 100644 --- a/Source/Clean.cmd +++ b/Source/Clean.cmd @@ -7,6 +7,7 @@ setlocal & cd ZCPR && call Clean.cmd & endlocal setlocal & cd ZCPR-DJ && call Clean.cmd & endlocal setlocal & cd ZSDOS && call Clean.cmd & endlocal setlocal & cd CBIOS && call Clean.cmd & endlocal +setlocal & cd Forth && call Clean.cmd & endlocal setlocal & cd BPBIOS && call Clean.cmd & endlocal setlocal & cd HBIOS && call Clean.cmd & endlocal setlocal & cd Doc && call Clean.cmd & endlocal diff --git a/Source/HBIOS/Forth/Build.cmd b/Source/Forth/Build.cmd similarity index 75% rename from Source/HBIOS/Forth/Build.cmd rename to Source/Forth/Build.cmd index 1833c745..d7ce3630 100644 --- a/Source/HBIOS/Forth/Build.cmd +++ b/Source/Forth/Build.cmd @@ -1,7 +1,7 @@ @echo off setlocal -set TOOLS=../../../Tools +set TOOLS=../../Tools set PATH=%TOOLS%\tasm32;%TOOLS%\zx;%PATH% @@ -13,7 +13,3 @@ set ZXINCDIR=%TOOLS%/cpm/include/ zx z80mr camel80 zx MLOAD25 -camel80.bin=camel80.hex - -copy camel80.bin ..\ - -goto :eof diff --git a/Source/HBIOS/Forth/Clean.cmd b/Source/Forth/Clean.cmd similarity index 100% rename from Source/HBIOS/Forth/Clean.cmd rename to Source/Forth/Clean.cmd diff --git a/Source/HBIOS/Forth/camel80.azm b/Source/Forth/camel80.azm similarity index 100% rename from Source/HBIOS/Forth/camel80.azm rename to Source/Forth/camel80.azm diff --git a/Source/HBIOS/Forth/camel80d.azm b/Source/Forth/camel80d.azm similarity index 100% rename from Source/HBIOS/Forth/camel80d.azm rename to Source/Forth/camel80d.azm diff --git a/Source/HBIOS/Forth/camel80h.azm b/Source/Forth/camel80h.azm similarity index 100% rename from Source/HBIOS/Forth/camel80h.azm rename to Source/Forth/camel80h.azm diff --git a/Source/HBIOS/Forth/cameltst.azm b/Source/Forth/cameltst.azm similarity index 100% rename from Source/HBIOS/Forth/cameltst.azm rename to Source/Forth/cameltst.azm diff --git a/Source/HBIOS/Forth/camldump.azm b/Source/Forth/camldump.azm similarity index 100% rename from Source/HBIOS/Forth/camldump.azm rename to Source/Forth/camldump.azm diff --git a/Source/HBIOS/Forth/copying b/Source/Forth/copying similarity index 100% rename from Source/HBIOS/Forth/copying rename to Source/Forth/copying diff --git a/Source/HBIOS/Forth/glosshi.txt b/Source/Forth/glosshi.txt similarity index 100% rename from Source/HBIOS/Forth/glosshi.txt rename to Source/Forth/glosshi.txt diff --git a/Source/HBIOS/Forth/glosslo.txt b/Source/Forth/glosslo.txt similarity index 100% rename from Source/HBIOS/Forth/glosslo.txt rename to Source/Forth/glosslo.txt diff --git a/Source/HBIOS/Forth/readme.z80 b/Source/Forth/readme.z80 similarity index 100% rename from Source/HBIOS/Forth/readme.z80 rename to Source/Forth/readme.z80 diff --git a/Source/HBIOS/Build.cmd b/Source/HBIOS/Build.cmd index d315afa8..d0e084a1 100644 --- a/Source/HBIOS/Build.cmd +++ b/Source/HBIOS/Build.cmd @@ -2,8 +2,4 @@ set TOOLS=../../Tools -setlocal & cd .\Forth && call Build || exit /b 1 & endlocal - -setlocal - PowerShell .\Build.ps1 %* diff --git a/Source/HBIOS/Build.ps1 b/Source/HBIOS/Build.ps1 index 23f3fe2a..149b05d0 100644 --- a/Source/HBIOS/Build.ps1 +++ b/Source/HBIOS/Build.ps1 @@ -151,22 +151,25 @@ ROMSIZE .EQU ${ROMSize} ; SIZE OF ROM IN KB ; "@ | Out-File "build.inc" -Encoding ASCII -# Create a local copy of the CP/M CCP and BDOS images for later use. +# Bring over previously assembled binary copy of the CP/M CCP and BDOS images for later use. Copy-Item '..\cpm22\os2ccp.bin' 'ccp.bin' Copy-Item '..\cpm22\os3bdos.bin' 'bdos.bin' -# Create a local copy of the ZSystem CCP and BDOS images for later use. +# Bring over previously assembled binary copy of the ZSystem CCP and BDOS images for later use. Copy-Item '..\zcpr-dj\zcpr.bin' 'zcpr.bin' Copy-Item '..\zsdos\zsdos.bin' 'zsdos.bin' +# Bring over previously assembled binary copy of Forth for later use. +Copy-Item '..\Forth\camel80.bin' 'camel80.bin' + # Assemble individual components. Note in the case of UNA, there is less to build. Asm 'dbgmon' Asm 'prefix' Asm 'romldr' -Asm 'eastaegg' +Asm 'eastaegg' Asm 'nascom' Asm 'tastybasic' -Asm 'imgpad' +Asm 'imgpad' Asm 'imgpad0' if ($Platform -ne "UNA") {