Revamp directory structure

Output/Clean.cmd → Binary/Clean.cmd

@@ -3,4 +3,6 @@ if exist *.bin del *.bin
 if exist *.com del *.com
 if exist *.img del *.img
 if exist *.rom del *.rom
-if exist *.pdf del *.pdf
+if exist *.pdf del *.pdf
+if exist *.log del *.log
+if exist *.eeprom del *.eeprom

Build.cmd

@@ -1,4 +0,0 @@
-@echo off
-setlocal
-
-setlocal & pushd Source && call Build %* & endlocal

BuildCommon.cmd

@@ -1,5 +0,0 @@
-@echo off
-setlocal
-
-setlocal & pushd Source && call BuildCommon & endlocal
-setlocal & pushd Hardware && call Build & endlocal

BuildDoc.cmd

@@ -1,4 +0,0 @@
-@echo off
-setlocal
-
-setlocal & pushd Source\Doc && call Build & endlocal

BuildImages.cmd

@@ -1,4 +0,0 @@
-@echo off
-setlocal
-
-setlocal & pushd Images && Build & endlocal

Clean.cmd

@@ -1,11 +0,0 @@
-@echo off
-
-setlocal
-
-setlocal & pushd Source && call Clean & endlocal
-setlocal & pushd Images && call Clean & endlocal
-setlocal & pushd Hardware && call Clean & endlocal
-setlocal & pushd Output && call Clean & endlocal
-
-if exist *.img del *.img
-if exist *.log del *.log

Hardware/Build.cmd

@@ -1,4 +0,0 @@
-@echo off
-setlocal
-
-setlocal & pushd Prop && call Build & endlocal

Hardware/Clean.cmd

@@ -1,5 +0,0 @@
-@echo off
-
-setlocal
-
-setlocal & pushd Prop && call Clean & endlocal

Hardware/Prop/Build.cmd

@@ -1,18 +0,0 @@
-@echo off
-setlocal
-
-set TOOLS=../../Tools
-
-set PATH=%TOOLS%\bst;%PATH%
-
-call :bstc PropIO || goto :eof
-call :bstc PropIO2 || goto :eof
-call :bstc ParPortProp || goto :eof
-
-goto :eof
-
-:bstc
-echo.
-echo Building %1...
-bstc Spin\%1 -e -l
-goto :eof

Images/Clean.cmd

@@ -1,2 +0,0 @@
-@echo off
-if exist *.tmp del *.tmp

Source/Apps/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.bin del *.bin
 if exist *.com del *.com
 if exist *.lst del *.lst

Source/BPBIOS/Build.cmd

@@ -27,22 +27,22 @@ call :makebp 41nbnk
 
 pause
 
-cpmrm.exe -f wbw_hd0 ../../Output/hd0.img 0:ws*.*
+cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:ws*.*
 
-cpmrm.exe -f wbw_hd0 ../../Output/hd0.img 0:*.img
-cpmcp.exe -f wbw_hd0 ../../Output/hd0.img *.img 0:
+cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.img
+cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.img 0:
 
-cpmrm.exe -f wbw_hd0 ../../Output/hd0.img 0:*.rel
-cpmcp.exe -f wbw_hd0 ../../Output/hd0.img *.rel 0:
+cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.rel
+cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.rel 0:
 
-rem cpmrm.exe -f wbw_hd0 ../../Output/hd0.img 0:*.dat
-rem cpmcp.exe -f wbw_hd0 ../../Output/hd0.img *.dat 0:
+rem cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.dat
+rem cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.dat 0:
 
-cpmrm.exe -f wbw_hd0 ../../Output/hd0.img 0:*.zex
-cpmcp.exe -f wbw_hd0 ../../Output/hd0.img *.zex 0:
+cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:*.zex
+cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img *.zex 0:
 
-cpmrm.exe -f wbw_hd0 ../../Output/hd0.img 0:myterm.z3t
-cpmcp.exe -f wbw_hd0 ../../Output/hd0.img myterm.z3t 0:myterm.z3t
+cpmrm.exe -f wbw_hd0 ../../Binary/hd0.img 0:myterm.z3t
+cpmcp.exe -f wbw_hd0 ../../Binary/hd0.img myterm.z3t 0:myterm.z3t
 
 goto :eof
 

Source/BPBIOS/Clean.cmd

@@ -1,8 +1,10 @@
 @echo off
+setlocal
+
 if exist *.prn del *.prn
 if exist *.err del *.err
 if exist *.img del *.img
 if exist bp*.rel del bp*.rel
 if exist *.bak del *.bak
 
-setlocal & pushd ZCPR33 && call Clean.cmd & endlocal
+setlocal & cd ZCPR33 && call Clean.cmd & endlocal

Source/BPBIOS/ZCPR33/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.prn del *.prn
 if exist *.err del *.err
 if exist *.rel del *.rel

Source/Build.cmd

@@ -1,4 +1,8 @@
 @echo off
 setlocal
 
-setlocal & pushd HBIOS && Powershell .\Build.ps1 %* & endlocal
+setlocal & call BuildDoc || exit /b 1 & endlocal
+setlocal & call BuildHardware || exit /b 1 & endlocal
+setlocal & call BuildImages || exit /b 1 & endlocal
+setlocal & call BuildShared || exit /b 1 & endlocal
+setlocal & call BuildROM %* || exit /b 1 & endlocal

Source/BuildCommon.cmd

@@ -1,9 +0,0 @@
-@echo off
-setlocal
-
-setlocal & pushd Apps && call Build & endlocal
-setlocal & pushd CPM22 && call Build & endlocal
-setlocal & pushd ZCPR && call Build & endlocal
-setlocal & pushd ZCPR-DJ && call Build & endlocal
-setlocal & pushd ZSDOS && call Build & endlocal
-setlocal & pushd CBIOS && call Build & endlocal

Source/BuildDoc.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+setlocal & cd Doc && call Build || exit /b 1 & endlocal

Source/BuildHardware.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+setlocal & cd Hardware && call Build || exit /b 1 & endlocal

Source/BuildImages.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+setlocal & cd Images && call Build || exit /b 1 & endlocal

Source/BuildROM.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+setlocal & cd HBIOS && Powershell .\Build.ps1 %* || exit /b 1 & endlocal

Source/BuildShared.cmd

@@ -0,0 +1,9 @@
+@echo off
+setlocal
+
+setlocal & cd Apps && call Build || exit /b 1 & endlocal
+setlocal & cd CPM22 && call Build || exit /b 1 & endlocal
+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

Source/CBIOS/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.bin del *.bin
 if exist *.lst del *.lst
 if exist *.prn del *.prn

Source/CPM22/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.bin del *.bin
 if exist *.lst del *.lst
 if exist *.prn del *.prn

Source/Clean.cmd

@@ -1,15 +1,19 @@
 @echo off
 setlocal
 
-setlocal & pushd Apps && call Clean.cmd & endlocal
-setlocal & pushd CPM22 && call Clean.cmd & endlocal
-setlocal & pushd ZCPR && call Clean.cmd & endlocal
-setlocal & pushd ZCPR-DJ && call Clean.cmd & endlocal
-setlocal & pushd ZSDOS && call Clean.cmd & endlocal
-setlocal & pushd CBIOS && call Clean.cmd & endlocal
+setlocal & cd Apps && call Clean.cmd & endlocal
+setlocal & cd CPM22 && call Clean.cmd & endlocal
+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 & pushd BPBIOS && call Clean.cmd & endlocal
+setlocal & cd BPBIOS && call Clean.cmd & endlocal
 
-setlocal & pushd HBIOS && call Clean.cmd & endlocal
+setlocal & cd HBIOS && call Clean.cmd & endlocal
 
-setlocal & pushd Doc && call Clean.cmd & endlocal
+setlocal & cd Doc && call Clean.cmd & endlocal
+
+setlocal & cd Images && call Clean & endlocal
+
+setlocal & cd Hardware && call Clean & endlocal

Source/Doc/Build.cmd

@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-setlocal & pushd "CPM 22 Manual" && call Build.cmd & endlocal
-setlocal & pushd "ZCPR Manual" && call Build.cmd & endlocal
-setlocal & pushd "RomWBW User Guide" && call Build.cmd & endlocal
-setlocal & pushd "RomWBW System Guide" && call Build.cmd & endlocal
+setlocal & cd "CPM 22 Manual" && call Build.cmd || exit /b 1 & endlocal
+setlocal & cd "ZCPR Manual" && call Build.cmd || exit /b 1 & endlocal
+setlocal & cd "RomWBW User Guide" && call Build.cmd || exit /b 1 & endlocal
+setlocal & cd "RomWBW System Guide" && call Build.cmd || exit /b 1 & endlocal

Source/Doc/CPM 22 Manual - Testing/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.prn del *.prn
 if exist *.ix del *.ix
 if exist *.log del *.log

Source/Doc/CPM 22 Manual/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.pdf del *.pdf
 if exist *.prn del *.prn
 if exist *.ix del *.ix

Source/Doc/Clean.cmd

@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-setlocal & pushd CPM 22 Manual && call Clean.cmd & endlocal
-setlocal & pushd ZCPR Manual && call Clean.cmd & endlocal
-setlocal & pushd RomWBW User Guide && call Clean.cmd & endlocal
-setlocal & pushd RomWBW System Guide && call Clean.cmd & endlocal
+setlocal & cd CPM 22 Manual && call Clean.cmd & endlocal
+setlocal & cd ZCPR Manual && call Clean.cmd & endlocal
+setlocal & cd RomWBW User Guide && call Clean.cmd & endlocal
+setlocal & cd RomWBW System Guide && call Clean.cmd & endlocal

Source/Doc/RomWBW System Guide/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.aux del *.aux
 if exist *.log del *.log
 if exist *.toc del *.toc

Source/Doc/RomWBW User Guide/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.aux del *.aux
 if exist *.log del *.log
 if exist *.toc del *.toc

Source/Doc/ZCPR Manual/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.pdf del *.pdf
 if exist *.prn del *.prn
 if exist *.ix del *.ix

Source/HBIOS/Build.ps1

@@ -42,7 +42,7 @@ $CpmToolsPath = '..\..\tools\cpmtools'
 $env:TASMTABS = $TasmPath
 $env:PATH = $TasmPath + ';' + $CpmToolsPath + ';' + $env:PATH
 
-$OutDir = "../../Output"
+$OutDir = "../../Binary"
 $RomFmt = "wbw_rom${RomSize}"
 $BlankROM = "Blank${RomSize}KB.dat"
 $RomDiskFile = "RomDisk.tmp"

Source/HBIOS/Clean.cmd

@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 if exist *.bin del *.bin
 if exist *.com del *.com
 if exist *.img del *.img

Source/Hardware/Build.cmd

@@ -0,0 +1,5 @@
+@echo off
+setlocal
+
+setlocal & pushd Prop && call Build & endlocal
+setlocal & pushd VDU && call Build & endlocal

Source/Hardware/Clean.cmd

@@ -0,0 +1,5 @@
+@echo off
+setlocal
+
+setlocal & cd Prop && call Clean & endlocal
+setlocal & cd VDU && call Clean & endlocal

Source/Hardware/Prop/Build.cmd

@@ -0,0 +1,20 @@
+@echo off
+setlocal
+
+set TOOLS=../../../Tools
+
+set PATH=%TOOLS%\bst;%PATH%
+
+call :bstc PropIO
+call :bstc PropIO2
+call :bstc ParPortProp
+
+goto :eof
+
+:bstc
+echo.
+echo Building %1...
+bstc Spin\%1 -e -l
+if errorlevel 1 goto :eof
+move /Y %1.eeprom "..\..\..\Binary"
+goto :eof

Hardware/Prop/Clean.cmd → Source/Hardware/Prop/Clean.cmd

@@ -1,5 +1,4 @@
 @echo off
-
 setlocal
 
 if exist *.eeprom del *.eeprom

Source/Hardware/VDU/Build.cmd

@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+copy /Y VDU.rom "..\..\..\Binary"

Source/Hardware/VDU/Clean.cmd

@@ -0,0 +1,2 @@
+@echo off
+setlocal

Images/BuildFD.ps1 → Source/Images/BuildFD.ps1

@@ -1,6 +1,6 @@
 $ErrorAction = 'Stop'
 
-$CpmToolsPath = '..\Tools\cpmtools'
+$CpmToolsPath = '../..\Tools\cpmtools'
 
 $env:PATH = $CpmToolsPath + ';' + $env:PATH
 
@@ -16,9 +16,9 @@ for ($Dsk=0; $Dsk -lt 2; $Dsk++)
 	copy Blank.tmp fd${Dsk}.img
 	for ($Usr=0; $Usr -lt 16; $Usr++)
 	{
-		if (Test-Path ("Source/fd${Dsk}/u${Usr}/*")) 
+		if (Test-Path ("fd${Dsk}/u${Usr}/*")) 
 		{
-			$Cmd = "cpmcp -f wbw_fd144 fd${Dsk}.img Source/fd${Dsk}/u${Usr}/*.* ${Usr}:"
+			$Cmd = "cpmcp -f wbw_fd144 fd${Dsk}.img fd${Dsk}/u${Usr}/*.* ${Usr}:"
 			$Cmd
 			Invoke-Expression $Cmd
 		}
@@ -26,7 +26,7 @@ for ($Dsk=0; $Dsk -lt 2; $Dsk++)
 }
 
 "Moving images into output directory..."
-&$env:COMSPEC /c move fd*.img ..\Output\
+&$env:COMSPEC /c move fd*.img ..\..\Binary\
 
 Remove-Item *.tmp
 

Images/BuildHD.ps1 → Source/Images/BuildHD.ps1

@@ -1,6 +1,6 @@
 $ErrorAction = 'Stop'
 
-$CpmToolsPath = '../Tools/cpmtools'
+$CpmToolsPath = '../../Tools/cpmtools'
 
 $env:PATH = $CpmToolsPath + ';' + $env:PATH
 
@@ -19,9 +19,9 @@ for ($Dsk=0; $Dsk -lt 2; $Dsk++)
 		copy Blank.tmp slice${Slice}.tmp
 		for ($Usr=0; $Usr -lt 16; $Usr++)
 		{
-			if (Test-Path ("Source/hd${Dsk}/s${Slice}/u${Usr}/*")) 
+			if (Test-Path ("hd${Dsk}/s${Slice}/u${Usr}/*")) 
 			{
-				$Cmd = "cpmcp -f wbw_hd0 slice${Slice}.tmp Source/hd${Dsk}/s${Slice}/u${Usr}/*.* ${Usr}:"
+				$Cmd = "cpmcp -f wbw_hd0 slice${Slice}.tmp hd${Dsk}/s${Slice}/u${Usr}/*.* ${Usr}:"
 				$Cmd
 				Invoke-Expression $Cmd
 			}
@@ -29,7 +29,7 @@ for ($Dsk=0; $Dsk -lt 2; $Dsk++)
 	}
 
 	"Combining slices into final disk image hd${Dsk}..."
-	&$env:COMSPEC /c copy /b slice*.tmp ..\Output\hd${Dsk}.img
+	&$env:COMSPEC /c copy /b slice*.tmp ..\..\Binary\hd${Dsk}.img
 	
 	Remove-Item slice*.tmp
 }

Source/Images/Clean.cmd

@@ -0,0 +1,5 @@
+@echo off
+setlocal
+
+if exist *.tmp del *.tmp
+if exist *.img del *.img