[Kos-cvs] kos TODO, 1.99, 1.100 Makefile, 1.39, 1.40 MkVars, 1.112, 1.113

thomas at kos.enix.org thomas at kos.enix.org
Tue Jan 4 23:13:20 CET 2005


Update of /home/kos/cvs/kos
In directory the-doors:/tmp/cvs-serv9732

Modified Files:
	TODO Makefile MkVars 
Log Message:
2005-01-04  Thomas Petazzoni  <thomas at crazy.kos.nx>

	* TODO: More job !

	* MkVars: Added the GPL header, and definition of the default
	value for the KOSSYSPATH variable.

	* Makefile: Added the GPL header, some documentation concerning
	the main targets. Use the new KOSSYSPATH variable which contains
	the relative path to the kos-sys module. Use the new BXSHARE
	variable which contains the path to Bochs BIOS files. Remove the
	useless babel target.



Index: MkVars
===================================================================
RCS file: /home/kos/cvs/kos/MkVars,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- MkVars	29 Dec 2004 19:28:49 -0000	1.112
+++ MkVars	4 Jan 2005 22:13:17 -0000	1.113
@@ -1,3 +1,21 @@
+# Copyright (C) 2000-2005
+# David Decotigny, Julien Munier, Thomas Petazzoni
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+
 # Global -*-Makefile-*- Variables
 
 ########################################################
@@ -28,21 +46,20 @@
 
 # Do not modify anything here. Create a .mkvars file and override the
 # variables in that file.
-CC       = gcc
-HOST_CC  = gcc # When modcheck is to be compiled for a different host
-CXX      = g++ # /usr/local/stow/gcc-3.2-linux/bin/g++-3.2
-LD       = ld
-MCOPY    = mcopy
-BOCHS    = bochs
-QEMU     = qemu
-GZIP     = gzip
-DOT      = dot
-LN_S     = ln -s
-EMULATOR = bochs
+CC         = gcc
+HOST_CC    = gcc # When modcheck is to be compiled for a different host
+CXX        = g++ # /usr/local/stow/gcc-3.2-linux/bin/g++-3.2
+LD         = ld
+MCOPY      = mcopy
+BOCHS      = bochs
+QEMU       = qemu
+GZIP       = gzip
+DOT        = dot
+LN_S       = ln -s
+EMULATOR   = bochs
+KOSSYSPATH = ../kos-sys# The patch to the kos-sys CVS module,
+                       # in which the hard disk image is stored.
 
-# The patch to the kos-sys CVS module, in which the hard disk image 
-# is stored.
-KOSSYSPATH = ../kos-sys/
 
 #
 # Compilation flags

Index: TODO
===================================================================
RCS file: /home/kos/cvs/kos/TODO,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- TODO	28 Dec 2004 18:44:08 -0000	1.99
+++ TODO	4 Jan 2005 22:13:17 -0000	1.100
@@ -7,6 +7,10 @@
 - Dans unmap_ures, que faire quand on a un shrink donnant lieu à une
   allocation de mémoire et que celle-ci échoue ?
 - Virer la macro DEBUG_PRINT, et utiliser DEBUG_PRINT1,2,3 à la place
+- Virer la synchq de tty et utiliser une synchro de plus haut niveau à
+  la place. Kitc doit être le seul module à utiliser les fonctions
+  synchq_*_unsafe, et celles-ci devront donc être exportés avec
+  _RESTRICTED.
 
 [d2]
 - Rajouter un test dans cpl0_switch pour ne pas faire le

Index: Makefile
===================================================================
RCS file: /home/kos/cvs/kos/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile	29 Dec 2004 19:28:49 -0000	1.39
+++ Makefile	4 Jan 2005 22:13:17 -0000	1.40
@@ -1,3 +1,41 @@
+# Copyright (C) 2000-2005
+# David Decotigny, Julien Munier, Thomas Petazzoni
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.
+
+
+# Externaly useful targets
+# ########################
+#
+# all: Builds the loader and the modules
+#
+# grub: Build the floppy disk image
+#
+# floppy: Install KOS on the floppy disk for a boot on a real machine
+#
+# check: Checks the imported/exported symbols of the modules without
+# running KOS
+#
+# run: Run KOS with the default emulator
+#
+# bochs: Run KOS with Bochs
+#
+# qemu: Run KOS with Qemu
+#
+
 .PRECIOUS: %.dot %-i.dot %-iv.dot %-e.dot %-ev.dot %.ps %.pdf %-deps.html
 .PHONY: utils
 
@@ -5,7 +43,7 @@
 
 floppy grub: loader modules check
 
-babel doc loader grub utils: FORCE
+doc loader grub utils: FORCE
 	$(MAKE) -C $@
 
 modules: utils FORCE
@@ -24,13 +62,13 @@
 check: bochs.map
 
 bochs: bochs.map grub
-	(echo load-symbols \"$<\" ; echo c) | $(BOCHS)
+	(echo load-symbols \"$<\" ; echo c) | KOSSYSPATH=$(KOSSYSPATH) BXSHARE=$(BXSHARE) $(BOCHS)
 
 bochs.map: loader modules
 	./loader/mod_check -m$@ $(LOAD_MODULE_FILES)
 
 qemu: grub
-	$(QEMU) -fda grub/fd.img -boot a -dummy-net -hda $(KOSSYSPATH)/hd10M.img $(QEMU_OPTIONS)
+	$(QEMU) -m 5 -fda grub/fd.img -boot a -dummy-net -hda $(KOSSYSPATH)/hd10M.img $(QEMU_OPTIONS)
 
 run:
 	$(MAKE) $(EMULATOR)



More information about the Kos-cvs mailing list