[eros-cvs] cvs commit: eros/src/tutorial/triv-keeper .cvsignore Makefile imgmap
shap@eros.cs.jhu.edu
shap@eros.cs.jhu.edu
Wed, 28 Nov 2001 16:01:40 -0500
shap 01/11/28 16:01:40
Modified: src/tutorial tutorial.mk
src/tutorial/hello-constituents .cvsignore Makefile imgmap
src/tutorial/hello-large .cvsignore Makefile imgmap
src/tutorial/hello-small .cvsignore
src/tutorial/triv-keeper .cvsignore Makefile imgmap
Added: src/tutorial .cvsignore
Log:
Patches to make in subdir correctly
Revision Changes Path
1.8 +2 -2 eros/src/tutorial/tutorial.mk
Index: tutorial.mk
===================================================================
RCS file: /cvs/eros/src/tutorial/tutorial.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tutorial.mk 2001/11/28 19:34:40 1.7
+++ tutorial.mk 2001/11/28 21:01:39 1.8
@@ -28,7 +28,7 @@
endif
OPTIM=-O
-INC=-I$(EROS_ROOT)/include
+INC=-I$(BUILDDIR) -I$(EROS_ROOT)/include
MAPINC=-I$(EROS_ROOT)/domain -I$(EROS_ROOT)/include
BOOT=$(EROS_ROOT)/lib/$(EROS_TARGET)/image/$(BOOTSTRAP)
@@ -94,6 +94,6 @@
#arguments from the "sysimg:" line, above.
$(BUILDDIR)/.sysimg.m: $(TARGETS) $(IMGMAP)
- -$(MKIMAGEDEP) -DBUILDDIR='\"$(BUILDDIR)/\"' -o $(BUILDDIR)/sysimg $(MAPINC) $(IMGMAP) $(BUILDDIR)/.sysimg.m >/dev/null 2>&1
+ -$(MKIMAGEDEP) -DBUILDDIR='"$(BUILDDIR)/"' -o $(BUILDDIR)/sysimg $(MAPINC) $(IMGMAP) $(BUILDDIR)/.sysimg.m >/dev/null 2>&1
-include $(BUILDDIR)/.*.m
1.1 eros/src/tutorial/.cvsignore
Index: .cvsignore
===================================================================
BUILD
1.3 +1 -9 eros/src/tutorial/hello-constituents/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-constituents/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 2001/07/06 21:49:02 1.2
+++ .cvsignore 2001/11/28 21:01:39 1.3
@@ -1,9 +1 @@
-constituents.h
-sysimg
-sysvol
-hello
-zsysvol
-sysgen.map
-.*.m
-*.out
-vmfloppy
+BUILD
1.4 +2 -2 eros/src/tutorial/hello-constituents/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-constituents/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 2001/11/28 19:34:40 1.3
+++ Makefile 2001/11/28 21:01:39 1.4
@@ -26,7 +26,7 @@
EROS_SRC=../..
include $(EROS_SRC)/build/lib/make/makevars.mk
-GENERATED=constituents.h
+GENERATED=$(BUILDDIR)/constituents.h
TARGETS=$(BUILDDIR)/hello
OBJECTS=$(BUILDDIR)/hello.o
@@ -35,7 +35,7 @@
install all: $(TARGETS)
-hello.c: constituents.h
+hello.c: $(BUILDDIR)/constituents.h
$(BUILDDIR)/hello: $(OBJECTS) $(DOMLIB) $(DOMCRT0)
$(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) -lsmall $(DOMLIB)
1.8 +2 -2 eros/src/tutorial/hello-constituents/imgmap
Index: imgmap
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-constituents/imgmap,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- imgmap 2001/10/07 12:01:15 1.7
+++ imgmap 2001/11/28 21:01:39 1.8
@@ -29,8 +29,8 @@
hello = new process with constituents;
-hello space = small program "hello";
-hello pc = symbol "hello" _start;
+hello space = small program BUILDDIR "hello";
+hello pc = symbol BUILDDIR "hello" _start;
hello schedule = sched(8);
CONSTIT(hello, KC_OSTREAM, 3) = misc Console;
1.4 +1 -9 eros/src/tutorial/hello-large/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2001/09/22 00:28:06 1.3
+++ .cvsignore 2001/11/28 21:01:39 1.4
@@ -1,9 +1 @@
-constituents.h
-sysimg
-sysvol
-hello
-zsysvol
-sysgen.map
-.*.m
-*.out
-vmfloppy
+BUILD
1.5 +2 -2 eros/src/tutorial/hello-large/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile 2001/11/28 19:34:40 1.4
+++ Makefile 2001/11/28 21:01:39 1.5
@@ -26,7 +26,7 @@
EROS_SRC=../..
include $(EROS_SRC)/build/lib/make/makevars.mk
-GENERATED=constituents.h
+GENERATED=$(BUILDDIR)/constituents.h
TARGETS=$(BUILDDIR)/hello
OBJECTS=$(BUILDDIR)/hello.o
@@ -35,7 +35,7 @@
install all: $(TARGETS)
-hello.c: constituents.h
+hello.c: $(BUILDDIR)/constituents.h
$(BUILDDIR)/hello: $(OBJECTS) $(DOMLIB) $(DOMCRT0)
$(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(OBJECTS) $(DOMLIB)
1.9 +2 -2 eros/src/tutorial/hello-large/imgmap
Index: imgmap
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-large/imgmap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- imgmap 2001/11/20 03:22:04 1.8
+++ imgmap 2001/11/28 21:01:39 1.9
@@ -30,11 +30,11 @@
#include <vcs.map>
#include <ipltool.map>
-MAKE_VIRTUAL_COPIER(hello_vcsk, "hello");
+MAKE_VIRTUAL_COPIER(hello_vcsk, BUILDDIR "hello");
BOOT_CONSTRUCTOR(hello_c,hello);
PROD_SPACE(hello_c) = hello_vcsk_c;
-PROD_PC(hello_c) = symbol "hello" _start;
+PROD_PC(hello_c) = symbol BUILDDIR "hello" _start;
PROD_CONSTIT(hello_c, KC_OSTREAM, 3) = misc Console;
run hello_c;
1.4 +2 -7 eros/src/tutorial/hello-small/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/tutorial/hello-small/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2001/11/28 19:34:40 1.3
+++ .cvsignore 2001/11/28 21:01:39 1.4
@@ -1,7 +1,2 @@
-sysimg
-sysvol
-zsysvol
-sysgen.map
-*.out
-vmfloppy
-hello-small.html
+BUILD
+*.html
1.3 +1 -10 eros/src/tutorial/triv-keeper/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/eros/src/tutorial/triv-keeper/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 2001/10/01 03:56:58 1.2
+++ .cvsignore 2001/11/28 21:01:39 1.3
@@ -1,10 +1 @@
-constituents.h
-sysimg
-sysvol
-trivkpr
-faulter
-zsysvol
-sysgen.map
-.*.m
-*.out
-vmfloppy
+BUILD
1.4 +5 -5 eros/src/tutorial/triv-keeper/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/eros/src/tutorial/triv-keeper/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 2001/11/28 19:34:40 1.3
+++ Makefile 2001/11/28 21:01:39 1.4
@@ -26,7 +26,7 @@
EROS_SRC=../..
include $(EROS_SRC)/build/lib/make/makevars.mk
-GENERATED=constituents.h
+GENERATED=$(BUILDDIR)/constituents.h
TARGETS=$(BUILDDIR)/trivkpr $(BUILDDIR)/faulter
OBJECTS=$(BUILDDIR)/trivkpr.o $(BUILDDIR)/faulter.o
OPTIM=-g
@@ -37,12 +37,12 @@
install all: $(TARGETS)
$(BUILDDIR)/trivkpr: $(BUILDDIR)/trivkpr.o $(DOMLIB) $(DOMCRT0)
- $(DOMLINK) $(DOMLINKOPT) -o $(BUILDDIR)/trivkpr $(DOMCRT0) $(BUILDDIR)/trivkpr.o -lsmall $(DOMLIB)
+ $(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(BUILDDIR)/trivkpr.o -lsmall $(DOMLIB)
$(BUILDDIR)/faulter: $(BUILDDIR)/faulter.o $(DOMLIB) $(DOMCRT0)
- $(DOMLINK) $(DOMLINKOPT) -o $(BUILDDIR)/faulter $(DOMCRT0) $(BUILDDIR)/faulter.o -lsmall $(DOMLIB)
+ $(DOMLINK) $(DOMLINKOPT) -o $@ $(DOMCRT0) $(BUILDDIR)/faulter.o -lsmall $(DOMLIB)
-trivkpr.c: constituents.h
-faulter.c: constituents.h
+trivkpr.c: $(BUILDDIR)/constituents.h
+faulter.c: $(BUILDDIR)/constituents.h
-include $(BUILDDIR)/.*.m
1.5 +4 -4 eros/src/tutorial/triv-keeper/imgmap
Index: imgmap
===================================================================
RCS file: /cvs/eros/src/tutorial/triv-keeper/imgmap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- imgmap 2001/10/07 12:01:15 1.4
+++ imgmap 2001/11/28 21:01:39 1.5
@@ -34,8 +34,8 @@
* that.
*/
trivkpr = new process with constituents;
-trivkpr space = small program "trivkpr";
-trivkpr pc = symbol "trivkpr" _start;
+trivkpr space = small program BUILDIR "trivkpr";
+trivkpr pc = symbol BUILDDIR "trivkpr" _start;
trivkpr schedule = sched(8); /* "normal" */
trivkpr key reg KR_SELF = trivkpr;
@@ -48,8 +48,8 @@
/* Now set up the process that will do the dirty deed: */
faulter = new process with constituents;
-faulter space = small program "faulter";
-faulter pc = symbol "faulter" _start;
+faulter space = small program BUILDDIR "faulter";
+faulter pc = symbol BUILDDIR "faulter" _start;
faulter schedule = sched(8);
faulter process keeper = start trivkpr 0;