[eros-cvs] cvs commit: eros/src/tutorial/hello-large .cvsignore Makefile hello.c imgmap

[shap@eros.cs.jhu.edu]

shap        01/07/06 17:49:02

  Modified:    src/tutorial tutorial.mk
               src/tutorial/hello-constituents .cvsignore Makefile hello.c
               src/tutorial/hello-large .cvsignore Makefile hello.c imgmap
  Log:
  Update tutorials for new constituents conventions

Revision  Changes    Path
1.3       +1 -1      eros/src/tutorial/tutorial.mk

Index: tutorial.mk
===================================================================
RCS file: /cvs/eros/src/tutorial/tutorial.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tutorial.mk	2001/05/26 18:16:38	1.2
+++ tutorial.mk	2001/07/06 21:49:02	1.3
@@ -22,6 +22,7 @@
 
 CLEANLIST+= sysimg sysvol zsysvol .sysimg.m.* tstflop ztstflop vmfloppy
 CLEANLIST+= mkimage.out
+
 ifndef VOLMAP
 VOLMAP=../volmap
 endif
@@ -45,7 +46,6 @@
 # so shap can see it better when necessary:
 DDBS=1440k
 SETVOL_FLAGS += -z
-
 
 install all: $(TARGETS) sysimg
 



1.2       +1 -0      eros/src/tutorial/hello-constituents/.cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-constituents/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2001/05/23 22:00:35	1.1
+++ .cvsignore	2001/07/06 21:49:02	1.2
@@ -1,3 +1,4 @@
+constituents.h
 sysimg
 sysvol
 hello



1.2       +3 -0      eros/src/tutorial/hello-constituents/Makefile

Index: Makefile
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-constituents/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	2001/05/23 22:00:35	1.1
+++ Makefile	2001/07/06 21:49:02	1.2
@@ -26,6 +26,7 @@
 EROS_SRC=../..
 include $(EROS_SRC)/build/lib/make/makevars.mk
 
+GENERATED=constituents.h
 TARGETS=hello
 OBJECTS=hello.o
 
@@ -33,6 +34,8 @@
 include ../tutorial.mk
 
 install all: $(TARGETS)
+
+hello.c: constituents.h
 
 hello: hello.o $(DOMLIB) $(DOMCRT0)
 	$(DOMLINK) $(DOMLINKOPT) -o hello $(DOMCRT0) hello.o -lsmall $(DOMLIB)



1.2       +1 -1      eros/src/tutorial/hello-constituents/hello.c

Index: hello.c
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-constituents/hello.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hello.c	2001/05/23 22:00:35	1.1
+++ hello.c	2001/07/06 21:49:02	1.2
@@ -4,7 +4,7 @@
 #include <domain/domdbg.h>
 #include <eros/NodeKey.h>
 
-#define KC_OSTREAM  3
+#include "constituents.h"
 
 #define KR_CONSTIT  1
 #define KR_SELF     2



1.2       +1 -0      eros/src/tutorial/hello-large/.cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2001/05/23 22:00:35	1.1
+++ .cvsignore	2001/07/06 21:49:02	1.2
@@ -1,3 +1,4 @@
+constituents.h
 sysimg
 sysvol
 hello



1.2       +3 -0      eros/src/tutorial/hello-large/Makefile

Index: Makefile
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	2001/05/23 22:00:35	1.1
+++ Makefile	2001/07/06 21:49:02	1.2
@@ -26,6 +26,7 @@
 EROS_SRC=../..
 include $(EROS_SRC)/build/lib/make/makevars.mk
 
+GENERATED=constituents.h
 TARGETS=hello builder
 HELLO_OBJECTS=hello.o
 BUILDER_OBJECTS=builder.o
@@ -35,6 +36,8 @@
 include ../tutorial.mk
 
 install all: $(TARGETS)
+
+hello.c: constituents.h
 
 hello: $(HELLO_OBJECTS) $(DOMLIB) $(DOMCRT0)
 	$(DOMLINK) $(DOMLINKOPT) -o hello $(DOMCRT0) $(HELLO_OBJECTS) $(DOMLIB)



1.2       +1 -1      eros/src/tutorial/hello-large/hello.c

Index: hello.c
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/hello.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hello.c	2001/05/23 22:00:35	1.1
+++ hello.c	2001/07/06 21:49:02	1.2
@@ -4,7 +4,7 @@
 #include <domain/domdbg.h>
 #include <eros/NodeKey.h>
 
-#define KC_OSTREAM  3
+#include "constituents.h"
 
 #define KR_CONSTIT  1
 #define KR_SELF     2



1.6       +1 -1      eros/src/tutorial/hello-large/imgmap

Index: imgmap
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/imgmap,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- imgmap	2001/06/10 19:43:13	1.5
+++ imgmap	2001/07/06 21:49:02	1.6
@@ -35,7 +35,7 @@
 BOOT_CONSTRUCTOR(hello_c);
 PROD_SPACE(hello_c) = hello_vcsk_c;
 PROD_PC(hello_c) = symbol "hello" _start;
-PROD_CONSTIT(hello_c, 3) = misc Console;
+PROD_CONSTIT(hello_c, KC_OSTREAM, 3) = misc Console;
 
 /* A small builder of programs, not a builder of small programs... */
 builder = new process;