Merge pull request #20 from wwarthen/dev

Minor Tweaks to Build Process

Source/HBIOS/Build.cmd

@@ -36,7 +36,7 @@ call build_env.cmd
 ::
 :: Create a small app that is used to export key build variables of the build.
 :: Then run the app to output a file with the variables.  Finally, read the
-:: variables into variables usable in this batch file.
+:: file into variables usable in this batch file.
 ::
 
 tasm -t80 -g3 -dCMD hbios_env.asm hbios_env.com hbios_env.lst || exit /b

Source/HBIOS/Build.ps1

@@ -90,7 +90,7 @@ while ($ROMName -eq "")
 }
 
 # Current date/time is queried here to be subsequently imbedded in image
-$TimeStamp = '"' + (Get-Date -Format 'yyyy-MM-dd') + '"'
+$TimeStamp = (Get-Date -Format 'yyyy-MM-dd')
 
 #
 # Since TASM has no mechanism to include files dynamically based on variables, a file
@@ -102,7 +102,8 @@ $TimeStamp = '"' + (Get-Date -Format 'yyyy-MM-dd') + '"'
 @"
 ; RomWBW Configured for ${Platform} ${Config}, $(Get-Date -Format "s")
 ;
-#DEFINE		TIMESTAMP	${TimeStamp}
+#DEFINE		TIMESTAMP	"${TimeStamp}"
+#DEFINE		CONFIG		"${Platform}_${Config}"
 ;
 #INCLUDE "${ConfigFile}"
 ;

Source/HBIOS/Build.sh

@@ -83,6 +83,7 @@ cat <<- EOF > build.inc
 ; RomWBW Configured for ${ROM_PLATFORM} ${ROM_CONFIG} ${TIMESTAMP}
 ;
 #DEFINE	TIMESTAMP	"${TIMESTAMP}"
+#DEFINE CONFIG		"${ROM_PLATFORM}_${ROM_CONFIG}"
 ;
 #INCLUDE "${CONFIGFILE}"
 ;
@@ -91,8 +92,6 @@ EOF
 make hbios_env.sh
 source hbios_env.sh
 
-cat hbios_env.sh
-
 export OBJECTS
 OBJECTS="${ROMNAME}.rom"
 if [ "${ROM_PLATFORM}" != "UNA" ] ; then

Source/HBIOS/Config/EZZ80_tz80.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE PLATFORM_NAME "TINYZ80"
-;
 #include "cfg_ezz80.asm"
 ;
 CRTACT		.SET	FALSE		; ACTIVATE CRT (VDU,CVDU,PROPIO,ETC) AT STARTUP

Source/HBIOS/Config/MBC_std.asm

@@ -22,7 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE PLATFORM_NAME "Multi Board Computer"
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_mbc.asm"

Source/HBIOS/Config/RCZ280_nat_zz.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"ZZ80MB"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "Config/RCZ280_nat.asm"

Source/HBIOS/Config/RCZ280_nat_zzr.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"ZZRCC"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "Config/RCZ280_nat.asm"

Source/HBIOS/Config/RCZ80_duart.asm

@@ -24,8 +24,6 @@
 ;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
-#DEFINE	PLATFORM_NAME	"RC2014 (DUART)"
-;
 #include "Config/RCZ80_std.asm"
 ;
 CRTACT		.SET	FALSE		; ACTIVATE CRT (VDU,CVDU,PROPIO,ETC) AT STARTUP

Source/HBIOS/Config/RCZ80_kio.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"RC2014 (KIO)"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "Config/RCZ80_std.asm"

Source/HBIOS/Config/RCZ80_mt.asm

@@ -24,8 +24,6 @@
 ;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
-#DEFINE	PLATFORM_NAME	"RC2014 (MT)"
-;
 #include "Config/RCZ80_std.asm"
 ;
 CRTACT		.SET	FALSE		; ACTIVATE CRT (VDU,CVDU,PROPIO,ETC) AT STARTUP

Source/HBIOS/Config/RCZ80_skz.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"RC2014 (SKZ)"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "Config/RCZ80_std.asm"

Source/HBIOS/Config/SBC_simh.asm

@@ -24,8 +24,6 @@
 ;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
-#DEFINE		PLATFORM_NAME	"SBC (simh)"
-;
 #include "cfg_sbc.asm"
 ;
 INTMODE		.SET	1		; INTERRUPTS: 0=NONE, 1=MODE 1, 2=MODE 2

Source/HBIOS/Config/SCZ180_126.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"SC126"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_scz180.asm"

Source/HBIOS/Config/SCZ180_130.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"SC130"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_scz180.asm"

Source/HBIOS/Config/SCZ180_131.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE	PLATFORM_NAME	"SC131"
-;
 #DEFINE	BOOT_DEFAULT	"H"		; DEFAULT BOOT LOADER CMD ON <CR> OR AUTO BOOT
 ;
 #include "cfg_scz180.asm"

Source/HBIOS/Config/SCZ180_140.asm

@@ -22,8 +22,6 @@
 ; PLEASE REFER TO THE CUSTOM BUILD INSTRUCTIONS (README.TXT) IN THE SOURCE DIRECTORY (TWO
 ; DIRECTORIES ABOVE THIS ONE).
 ;
-#DEFINE		PLATFORM_NAME	"SC140"
-;
 #include "cfg_scz180.asm"
 ;
 CPUOSC		.SET	18432000	; CPU OSC FREQ IN MHZ

Source/HBIOS/cfg_dyno.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "DYNO"
+#DEFINE PLATFORM_NAME "Dyno", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_ezz80.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "EASYZ80"
+#DEFINE PLATFORM_NAME "Easy-Z80", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_master.asm

@@ -8,7 +8,7 @@
 ; USED ONLY AS A REFERENCE TO HELP MANAGE THE FULL SET OF POSSIBLE SETTINGS AND
 ; KEEP THINGS CONSISTENT.
 ;
-#DEFINE PLATFORM_NAME "ROMWBW"
+#DEFINE PLATFORM_NAME "RomWBW", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_mbc.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "Multi Board Computer"
+#DEFINE PLATFORM_NAME "Nhyodyne", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_mk4.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "MARK IV"
+#DEFINE PLATFORM_NAME "Mark IV", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_n8.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "N8"
+#DEFINE PLATFORM_NAME "N8", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_rcz180.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "RC2014"
+#DEFINE PLATFORM_NAME "RC2014", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_rcz280.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "RC2014"
+#DEFINE PLATFORM_NAME "RC2014", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_rcz80.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "RC2014"
+#DEFINE PLATFORM_NAME "RC2014", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_rph.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "RHYOPHYRE"
+#DEFINE PLATFORM_NAME "Rhyophyre", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_sbc.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "SBC"
+#DEFINE PLATFORM_NAME "Single Board Computer", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_scz180.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "SCZ180"
+#DEFINE PLATFORM_NAME "Small Computer", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_una.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "UNA"
+#DEFINE PLATFORM_NAME "UNA", " [", CONFIG, "]"
 ;
 #INCLUDE "../UBIOS/ubios.inc"
 ;

Source/HBIOS/cfg_zeta.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "ZETA"
+#DEFINE PLATFORM_NAME "Zeta", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/HBIOS/cfg_zeta2.asm

@@ -11,7 +11,7 @@
 ; THIS FILE CAN BE CONSIDERED A REFERENCE THAT LISTS ALL POSSIBLE CONFIGURATION SETTINGS
 ; FOR THE PLATFORM.
 ;
-#DEFINE PLATFORM_NAME "ZETA V2"
+#DEFINE PLATFORM_NAME "Zeta 2", " [", CONFIG, "]"
 ;
 #INCLUDE "hbios.inc"
 ;

Source/ver.inc

@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.180"
+#DEFINE BIOSVER	"3.1.1-pre.181"

Source/ver.lib

@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.180"
+	db	"3.1.1-pre.181"
 	endm