simplify version.inc and adjust copyright blobs

SvarDOS · Aug 1, 2024 · 35cbff1 · 35cbff1
1 parent 7b06b29
commit 35cbff1
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 43 deletions.
diff --git a/command/message.asm b/command/message.asm
@@ -20,7 +20,7 @@ _msg_ver111	db	NUL , NUL
 	public	msg_version
 msg_version	label	byte
 _msg_version	db	LF
-		db longsysname
+		db SYSNAME_STR
 		db LF, NUL
 	public	_msg_lbl
 	public	msg_lbl

diff --git a/drbio/biosinit.asm b/drbio/biosinit.asm
@@ -132,13 +132,9 @@ endif
 	extrn	setup_stacks:near
 	extrn	preload_done:near
 
-		db	'Copyright (c) 1983,1996 '
-		db	'Caldera, Inc. All Rights Reserved '
-		db	'XXXX-0000-987654321X '
-
-		db	'Patches to original OpenDOS source code '
-		db	'Copyright (c) 2002-2011 Udo Kuhnt'
-
+copyright:
+	include version.inc
+	db COPYRIGHT_STR, 0
 
 	Public	biosinit
 ;========

diff --git a/drbio/biosmsgs.asm b/drbio/biosmsgs.asm
@@ -26,16 +26,12 @@ _disk_msgB	db	": and", CR, LF, "   strike any key when ready", CR, LF, LF, NUL
 div_by_zero_msg	label	byte
 _div_by_zero_msg	db	CR, LF, "Divide Error", CR, LF, NUL
 
-	public	kernel_msg
-kernel_msg		label	byte
-db KERNELMSG
-db COPYRIGHT
-db NUL
-
-	public	_starting_dos_msg
-	public	starting_dos_msg
-starting_dos_msg	label	byte
-_starting_dos_msg	db	CR, LF, "Starting ", sysname, "...", CR, LF, NUL
+	public	kernel_ver_msg
+kernel_ver_msg db KERNEL_VER_STR, 0
+
+	public repository_msg
+repository_msg db REPOSITORY_STR, 0
+
 	public	_lba_supp_msg
 	public	lba_supp_msg
 lba_supp_msg		label	byte

diff --git a/drbio/biosmsgs.def b/drbio/biosmsgs.def
@@ -4,8 +4,7 @@
 	extrn	disk_msgB	: byte
 	extrn	_div_by_zero_msg	: byte
 	extrn	div_by_zero_msg	: byte
-	extrn	kernel_msg 		: byte
-	extrn	_starting_dos_msg	: byte
-	extrn	starting_dos_msg	: byte
+	extrn	kernel_ver_msg 	: byte
+	extern  repository_msg : byte
 	extrn	_lba_supp_msg		: byte
 	extrn	lba_supp_msg		: byte
diff --git a/drbio/init.asm b/drbio/init.asm
@@ -993,10 +993,11 @@ debugger_detected:
 
 	Assume	DS:CGROUP, ES:CGROUP
 
-	mov	si,offset kernel_msg
+	mov	si,offset kernel_ver_msg
 	call	output_msg
-	mov	si,offset starting_dos_msg
+	mov	si,offset repository_msg
 	call	output_msg
+
 ;	call	get_boot_options	; look for user keypress
 ;	mov	boot_options,ax		;  return any options
 

diff --git a/drdos/fdos.asm b/drdos/fdos.asm
@@ -170,7 +170,6 @@ ASSUME DS:PCMDATA
 	include driver.equ
 	include f52data.def	; DRDOS Structures
 	include bdos.equ
-	include version.inc
 	.list
 
 FD_EXPAND equ 55h
@@ -441,11 +440,6 @@ include	funcs.fdo
 include	utils.fdo
 
 BDOS_DATA	segment public word 'DATA'
-shortversion equ 1
-		db	longsysname
-		db	' Patches to original OpenDOS source code '
-		db	'Copyright (c) 2002-2011 Udo Kuhnt'
-		db	0
 
 BDOS_DATA	ends
 

diff --git a/drdos/misc.asm b/drdos/misc.asm
@@ -446,7 +446,7 @@ func33:
 	cmp	al, 0FFh		; is it function 33FFh ?
 	 jne	f33_XX			; no, jump -->
 	call	f33_FF			; yes
-	db	longsysname
+	db	KERNEL_VER_STR
 	db	0
 
 f33_FF:	pop	reg_AX[bp]		; dx:ax - hidden DOS string

diff --git a/version.inc b/version.inc
@@ -2,22 +2,19 @@ ifidn VERSION, <>
 VERSION	    textequ <?>
 endif
 
-SYSNAME     textequ <"SvarDOS">
-LONGSYSNAME textequ <"SvarDOS Enhanced DR-DOS based on Caldera OpenDOS 7.01">
-
-BUILDDATE   catstr <">, @date, < >, @time , <">
-
 ifidn GIT_REV, <>
-COMMIT   textequ <"?">
+COMMIT   textequ <?>
 else
-COMMIT   catstr <">, GIT_REV, <"> 
+COMMIT   textequ GIT_REV
 endif
 
-VERSIONSTR  catstr <">, VERSION, <">
+KERNEL_VER_STR	textequ <13, 10, "Enhanced DR-DOS kernel >, VERSION, < (git rev >, COMMIT, <) [built >, @date, < >, @time , <]", 13, 10>
+REPOSITORY_STR	textequ <"source and licensing conditions available at https://github.com/SvarDOS/edrdos", 13, 10>
 
-KERNELNAME  textequ <"SvarDOS Enhanced DR-DOS Kernel">
-KERNELMSG   textequ <13, 10, KERNELNAME, "                https://github.com/SvarDOS/edrdos", 13, 10, \
-		    "ver ", VERSIONSTR, " / rev ", COMMIT, " / built ", BUILDDATE , 13, 10>
+; used by command.com
+SYSNAME_STR textequ <'Enhanced DR-DOS based on Caldera OpenDOS 7.01'>
 
-COPYRIGHT   textequ <"based on Caldera OpenDOS 7.01 sources, patches (c)opyright 2002-2011 Udo Kuhnt", 13, 10, \
-		    "distributed and used under license agreement by DRDOS, Inc. on 2022-07-07", 13, 10>
+; embedded in DRBIO.SYS
+COPYRIGHT_STR   textequ <"Copyright (c) 1983,1996 Caldera, Inc. All Rights Reserved>, \
+< Patches to original OpenDOS source code Copyright (c) 2002-2011 Udo Kuhnt>, \
+< distributed and used under license agreement by DRDOS, Inc. on 2022-07-07">