Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 560 → Rev 561

/kernel/trunk/tools/buildtag
File deleted
Property changes:
Deleted: svn:executable
-*
\ No newline at end of property
/kernel/trunk/tools/config.py
5,6 → 5,7
import sys
import os
import re
import commands
 
INPUT = 'kernel.config'
OUTPUT = 'Makefile.config'
376,7 → 377,10
elif line.startswith('## '):
# 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()
return asked_names
/kernel/trunk/kernel.config
9,8 → 9,6
@ "sparc64" Sun UltraSPARC
! ARCH (choice)
 
% SHELLCMD TAG tools/buildtag $ARCH
 
# IA32 Compiler
@ "cross" Cross-compiler
@ "native" Native
/kernel/trunk/generic/include/debug.h
47,4 → 47,7
# define ASSERT(expr)
#endif
 
#define STRING(arg) STRING_ARG(arg)
#define STRING_ARG(arg) #arg
 
#endif
/kernel/trunk/generic/src/main/main.c
30,6 → 30,7
#include <context.h>
#include <print.h>
#include <panic.h>
#include <debug.h>
#include <config.h>
#include <time/clock.h>
#include <proc/scheduler.h>
63,16 → 64,24
#include <typedefs.h>
 
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;
context_t ctx;
 
172,7 → 181,7
tlb_init();
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/trunk/Makefile
49,10 → 49,14
LFLAGS = -M
AFLAGS =
 
ifdef TAG
DEFS += "-DTAG=\"$(TAG)\""
ifdef REVISION
DEFS += "-DREVISION=\"$(REVISION)\""
endif
 
ifdef TIMESTAMP
DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
endif
 
## Setup kernel configuration
#
 
138,13 → 142,13
ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES)))
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
$(MAKE) -C . build
 
real_all: kernel.bin boot disasm
build: kernel.bin boot disasm
 
config:
tools/config.py