From 84fcfc5f11180751c9dc849aaa1161d771e5d904 Mon Sep 17 00:00:00 2001
From: Kenneth J Davis <PerditionC@gmail.com>
Date: Tue, 23 Jun 2009 01:26:30 +0000
Subject: [PATCH] simplify how version specified, enable SVN builds with
 revision#

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1456 6ac86273-5f31-0410-b378-82cca8765d1b
---
 hdr/version.h    | 21 +++++++++++----------
 kernel/globals.h |  7 +------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/hdr/version.h b/hdr/version.h
index 72a9848..4410825 100644
--- a/hdr/version.h
+++ b/hdr/version.h
@@ -26,14 +26,7 @@
 /* Cambridge, MA 02139, USA.                                    */
 /****************************************************************/
 
-#ifdef MAIN
-#ifdef VERSION_STRINGS
-static BYTE *date_hRcsId =
-    "$Id$";
-#endif
-#endif
-
-/* This Kernel is at a min Dos Ver. 5.00 or 7.10 with FAT32 support */
+/* The version the kernel reports as compatible with */
 #ifdef WITHFAT32
 #define MAJOR_RELEASE   7
 #define MINOR_RELEASE   10
@@ -42,9 +35,17 @@ static BYTE *date_hRcsId =
 #define MINOR_RELEASE   22
 #endif
 
+/* The actual kernel revision, 2000+REVISION_SEQ = 2.REVISION_SEQ */
 #define REVISION_SEQ    39      /* returned in BL by int 21 function 30 */
 #define OEM_ID          0xfd    /* FreeDOS, returned in BH by int 21 30 */
 
-#define SOURCE_DATE_STRING "May 16, 2009" /* DATE OF THE NEWEST SOURCE FILE */
-#define KERNEL_BUILD_STRING "2039-svn"   /* used in os_release string */
+/* Used for version information displayed to user at boot (& stored in os_release string) */
+#ifndef KERNEL_VERSION
+#define KERNEL_VERSION "- SVN "
+#endif
+
+/* actual version string */
+#define KVS(v,s,o) "FreeDOS kernel " v "(build 20" #s " OEM:" #o ") [compiled " __DATE__ "]\n"
+#define xKVS(v,s,o) KVS(v,s,o)
+#define KERNEL_VERSION_STRING xKVS(KERNEL_VERSION, REVISION_SEQ, OEM_ID)
 
diff --git a/kernel/globals.h b/kernel/globals.h
index 1bc07ff..55c0ef7 100644
--- a/kernel/globals.h
+++ b/kernel/globals.h
@@ -213,12 +213,7 @@ GLOBAL BYTE copyright[] =
 
 GLOBAL const BYTE ASM os_release[]
 #ifdef MAIN
-    = "FreeDOS kernel build " KERNEL_BUILD_STRING
-    " [version " SOURCE_DATE_STRING " compiled " __DATE__ "]\n"
-#if 0
-    = "FreeDOS kernel version " KERNEL_VERSION_STRING
-    " (Build " KERNEL_BUILD_STRING ") [" __DATE__ " " __TIME__ "]\n"
-#endif
+    = KERNEL_VERSION_STRING
 #if 0
     "For technical information and description of the DOS-C operating system\n\
 consult \"FreeDOS Kernel\" by Pat Villani, published by Miller\n\