Changeset aca95f6b in mainline

Timestamp:

2006-11-24T19:27:09Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

22f851e

Parents:

44d0758

Message:

add version to init and boot loader

Files:

• boot/Makefile (modified) (1 diff)
• boot/arch/sparc64/loader/Makefile (modified) (2 diffs)
• boot/arch/sparc64/loader/main.c (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/init/Makefile (modified) (2 diffs)
• uspace/init/version.c (modified) (1 diff)

boot/Makefile

@@ -30 +30 @@
 #
 
--include ../version
 -include Makefile.config
 

boot/arch/sparc64/loader/Makefile

@@ -27 +27 @@
 #
 
+include ../../../../version
+include ../../../Makefile.config
+
 ## Toolchain configuration
 #
@@ -47 +50 @@
 endif
 
-CFLAGS = -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64
+CFLAGS = -DRELEASE=\"$(RELEASE)\" -I. -I../../../generic -I../../../genarch -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mcpu=ultrasparc -m64
+
+ifdef REVISION
+        CFLAGS += "-DREVISION=\"$(REVISION)\""
+endif
+
+ifdef TIMESTAMP
+        CFLAGS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 
 SOURCES = \

boot/arch/sparc64/loader/main.c

@@ -41 +41 @@
 component_t components[COMPONENTS];
 
+char *release = RELEASE;
+
+#ifdef REVISION
+        char *revision = ", revision " REVISION;
+#else
+        char *revision = "";
+#endif
+
+#ifdef TIMESTAMP
+        char *timestamp = "\nBuilt on " TIMESTAMP;
+#else
+        char *timestamp = "";
+#endif
+
+/** Print version information. */
+static void version_print(void)
+{
+        printf("HelenOS SPARC64 Bootloader\nRelease %s%s%s\nCopyright (C) 2006 HelenOS project\n", release, revision, timestamp);
+}
+
 void bootstrap(void)
 {
-        printf("HelenOS SPARC64 Bootloader\n");
+        version_print();
         
         init_components(components);

uspace/Makefile

@@ -30 +30 @@
 #
 
--include ../version
 -include Makefile.config
 

uspace/init/Makefile

@@ -27 +27 @@
 #
 
+include ../../version
+include ../Makefile.config
+
 ## Setup toolchain
 #
@@ -37 +40 @@
 
 LIBS = $(LIBC_PREFIX)/libc.a
+DEFS += -DRELEASE=\"$(RELEASE)\"
+
+ifdef REVISION
+        DEFS += "-DREVISION=\"$(REVISION)\""
+endif
+
+ifdef TIMESTAMP
+        DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
+endif
 
 ## Sources

uspace/init/version.c

@@ -38 +38 @@
 #include "version.h"
 
+char *release = RELEASE;
+
+#ifdef REVISION
+        char *revision = ", revision " REVISION;
+#else
+        char *revision = "";
+#endif
+
+#ifdef TIMESTAMP
+        char *timestamp = "\nBuilt on " TIMESTAMP;
+#else
+        char *timestamp = "";
+#endif
+
 /** Print version information. */
 void version_print(void)
 {
-        puts("HelenOS init");
-        puts("Copyright (C) 2006 HelenOS project");
+        printf("HelenOS init\nRelease %s%s%s\nCopyright (C) 2006 HelenOS project\n", release, revision, timestamp);
 }
 
 /** @}
  */
-