Changeset 940cac0 in mainline

Timestamp:

2005-12-07T17:17:20Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4acac843

Parents:

54257ba

Message:

better way of placing revision, timestamp and arch in banner

Files:

• Makefile (modified) (2 diffs)
• generic/include/debug.h (modified) (1 diff)
• generic/src/main/main.c (modified) (3 diffs)
• kernel.config (modified) (1 diff)
• tools/buildtag (deleted)
• tools/config.py (modified) (2 diffs)

Makefile

@@ -50 +50 @@
 AFLAGS =
 
-ifdef TAG
-        DEFS += "-DTAG=\"$(TAG)\""
+ifdef REVISION
+        DEFS += "-DREVISION=\"$(REVISION)\""
+endif
+
+ifdef TIMESTAMP
+        DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
 endif
 
@@ -139 +143 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
-.PHONY: all clean config links depend boot
+.PHONY: all build clean config links depend boot
 
 all:
         tools/config.py default
-        $(MAKE) -C . real_all
-
-real_all: kernel.bin boot disasm
+        $(MAKE) -C . build
+
+build: kernel.bin boot disasm
 
 config:

generic/include/debug.h

@@ -48 +48 @@
 #endif
 
+#define STRING(arg) STRING_ARG(arg)
+#define STRING_ARG(arg) #arg
+
 #endif

generic/src/main/main.c

@@ -31 +31 @@
 #include <print.h>
 #include <panic.h>
+#include <debug.h>
 #include <config.h>
 #include <time/clock.h>
@@ -64 +65 @@
 
 char *project = "SPARTAN kernel";
-char *release = RELEASE " (" NAME ")";
-#ifdef TAG
-        char *rr_delimiter = "\n";
-        char *revision = TAG;
+char *copyright = "Copyright (C) 2001-2005 HelenOS project";
+char *release = RELEASE;
+char *name = NAME;
+char *arch = STRING(ARCH);
+
+#ifdef REVISION
+        char *revision = ", revision " REVISION;
 #else
-        char *rr_delimiter = "";
         char *revision = "";
 #endif
-char *copyright = "Copyright (C) 2001-2005 HelenOS project";
+
+#ifdef TIMESTAMP
+        char *timestamp = " on " TIMESTAMP;
+#else
+        char *timestamp = "";
+#endif
+
 
 config_t config;
@@ -173 +182 @@
         arch_post_mm_init();
 
-        printf("%s, release %s%s%s\n%s\n", project, release, rr_delimiter, revision, copyright);
+        printf("%s, release %s (%s)%s\nBuild%s for %s\n%s\n", project, release, name, revision, timestamp, arch, copyright);
         printf("%P: hardcoded_ktext_size=%dK, hardcoded_kdata_size=%dK\n",
                 config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);

kernel.config

@@ -9 +9 @@
 @ "sparc64" Sun UltraSPARC
 ! ARCH (choice)
-
-% SHELLCMD TAG tools/buildtag $ARCH
 
 # IA32 Compiler

tools/config.py

@@ -6 +6 @@
 import os
 import re
+import commands
 
 INPUT = 'kernel.config'
@@ -377 +378 @@
             # Set title of the dialog window
             dlg.set_title(line[2:].strip())
-        
+
+    outf.write('\n')
+    outf.write('REVISION=%s\n' % commands.getoutput('svnversion . 2> /dev/null'))
+    outf.write('TIMESTAMP=%s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"'))
     outf.close()
     f.close()