| Newsgroups |
perl.cvs.mod_parrot |
| Message-ID |
<[email protected]> |
cvsuser 02/06/07 16:57:04
Modified: . mod_parrot.diff
Log:
Melvin checked in new PMCs, broke the patch badly
pmc2c.pl and assemble.pl will be updated to not need this treatment soon
(it is on my TODO)
Revision Changes Path
1.5 +67 -63 mod_parrot/mod_parrot.diff
Index: mod_parrot.diff
===================================================================
RCS file: /cvs/public/mod_parrot/mod_parrot.diff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- mod_parrot.diff 1 Jun 2002 15:56:32 -0000 1.4
+++ mod_parrot.diff 7 Jun 2002 23:57:04 -0000 1.5
@@ -1,14 +1,29 @@
+Index: assemble.pl
+===================================================================
+RCS file: /cvs/public/parrot/assemble.pl,v
+retrieving revision 1.64
+diff -u -r1.64 assemble.pl
+--- assemble.pl 7 Jun 2002 23:18:56 -0000 1.64
++++ assemble.pl 7 Jun 2002 23:56:07 -0000
+@@ -134,6 +134,7 @@
+ $self->{constants}{IntQueue} = 8;
+ $self->{constants}{ParrotSub} = 9;
+ $self->{constants}{ParrotCoroutine} = 10;
++ $self->{constants}{Apache} = 13;
+ $self;
+ }
+
Index: global_setup.c
===================================================================
RCS file: /cvs/public/parrot/global_setup.c,v
-retrieving revision 1.25
-diff -u -r1.25 global_setup.c
---- global_setup.c 5 Mar 2002 04:21:30 -0000 1.25
-+++ global_setup.c 29 May 2002 00:44:09 -0000
-@@ -29,6 +29,7 @@
- Parrot_PerlHash_class_init(enum_class_PerlHash);
- Parrot_ParrotPointer_class_init(enum_class_ParrotPointer);
+retrieving revision 1.26
+diff -u -r1.26 global_setup.c
+--- global_setup.c 7 Jun 2002 23:18:56 -0000 1.26
++++ global_setup.c 7 Jun 2002 23:56:07 -0000
+@@ -31,6 +31,7 @@
Parrot_IntQueue_class_init(enum_class_IntQueue);
+ Parrot_ParrotSub_class_init(enum_class_ParrotSub);
+ Parrot_ParrotCoroutine_class_init(enum_class_ParrotCoroutine);
+ Parrot_Apache_class_init(enum_class_Apache);
/* Now register the names of the PMCs */
@@ -16,21 +31,20 @@
Index: config/gen/makefiles/classes.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/classes.in,v
-retrieving revision 1.1
-diff -u -r1.1 classes.in
---- config/gen/makefiles/classes.in 24 May 2002 06:23:58 -0000 1.1
-+++ config/gen/makefiles/classes.in 29 May 2002 00:44:10 -0000
-@@ -7,7 +7,8 @@
-
+retrieving revision 1.2
+diff -u -r1.2 classes.in
+--- config/gen/makefiles/classes.in 7 Jun 2002 23:22:28 -0000 1.2
++++ config/gen/makefiles/classes.in 7 Jun 2002 23:56:07 -0000
+@@ -8,7 +8,7 @@
O_FILES = default$(O) array$(O) perlint$(O) perlstring$(O) perlnum$(O) \
--perlarray$(O) perlhash$(O) perlundef$(O) parrotpointer$(O) intqueue$(O)
-+perlarray$(O) perlhash$(O) perlundef$(O) parrotpointer$(O) intqueue$(O) \
-+apache$(O)
+ perlarray$(O) perlhash$(O) perlundef$(O) parrotpointer$(O) intqueue$(O) \
+-parrotsub$(O) parrotcoroutine$(O)
++parrotsub$(O) parrotcoroutine$(O) apache$(O)
#DO NOT ADD C COMPILER FLAGS HERE
#Add them in Configure.pl--look for the
-@@ -25,6 +26,11 @@
+@@ -26,6 +26,11 @@
$(CC) $(CFLAGS) ${cc_exe_out}$@ -c $<
all : $(O_FILES)
@@ -45,62 +59,52 @@
Index: config/gen/makefiles/root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
-retrieving revision 1.2
-diff -u -r1.2 root.in
---- config/gen/makefiles/root.in 24 May 2002 16:34:19 -0000 1.2
-+++ config/gen/makefiles/root.in 29 May 2002 00:44:10 -0000
-@@ -74,7 +74,8 @@
- CLASS_O_FILES = classes/default$(O) classes/array$(O) \
+retrieving revision 1.7
+diff -u -r1.7 root.in
+--- config/gen/makefiles/root.in 7 Jun 2002 23:22:28 -0000 1.7
++++ config/gen/makefiles/root.in 7 Jun 2002 23:56:07 -0000
+@@ -75,7 +75,7 @@
classes/perlint$(O) classes/perlstring$(O) classes/perlnum$(O) \
classes/perlarray$(O) classes/perlundef$(O) \
--classes/perlhash$(O) classes/parrotpointer$(O) classes/intqueue$(O)
-+classes/perlhash$(O) classes/parrotpointer$(O) classes/intqueue$(O) \
-+classes/apache$(O)
+ classes/perlhash$(O) classes/parrotpointer$(O) classes/parrotsub$(O) \
+-classes/parrotcoroutine$(O) classes/intqueue$(O)
++classes/parrotcoroutine$(O) classes/intqueue$(O) classes/apache$(O)
ENCODING_O_FILES = encodings/singlebyte$(O) encodings/utf8$(O) \
encodings/utf16$(O) \
-Index: newasm
+Index: config/init/data.pl
===================================================================
-RCS file: /cvs/public/parrot/newasm,v
-retrieving revision 1.14
-diff -u -r1.14 newasm
---- newasm 31 May 2002 05:10:19 -0000 1.14
-+++ newasm 1 Jun 2002 15:05:15 -0000
-@@ -117,6 +117,7 @@
- $self->{constants}{PerlHash} = 6;
- $self->{constants}{ParrotPointer} = 7;
- $self->{constants}{IntQueue} = 8;
-+ $self->{constants}{Apache} = 9;
- $self;
- }
+RCS file: /cvs/public/parrot/config/init/data.pl,v
+retrieving revision 1.2
+diff -u -r1.2 data.pl
+--- config/init/data.pl 24 May 2002 22:16:57 -0000 1.2
++++ config/init/data.pl 7 Jun 2002 23:56:07 -0000
+@@ -15,11 +15,11 @@
+
+ my(%c)=(
+ cc => $Config{cc},
+- ccflags => $Config{ccflags},
++ ccflags => "$Config{ccflags} -I/home/kevin/cvs/mod_parrot -I/home/kevin/httpd/include",
+ ld => $Config{ld},
+ ldflags => $Config{ldflags},
+- libs => $Config{libs},
++ libs => "$Config{libs} -L/home/kevin/cvs/mod_parrot",
+
+ cc_inc => "-I./include",
+ cc_debug => '-g',
Index: include/parrot/pmc.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/pmc.h,v
-retrieving revision 1.29
-diff -u -r1.29 pmc.h
---- include/parrot/pmc.h 15 May 2002 01:45:09 -0000 1.29
-+++ include/parrot/pmc.h 1 Jun 2002 15:06:35 -0000
-@@ -23,6 +23,7 @@
- enum_class_PerlHash,
- enum_class_ParrotPointer,
- enum_class_IntQueue,
+retrieving revision 1.30
+diff -u -r1.30 pmc.h
+--- include/parrot/pmc.h 7 Jun 2002 23:24:33 -0000 1.30
++++ include/parrot/pmc.h 7 Jun 2002 23:56:07 -0000
+@@ -27,6 +27,7 @@
+ enum_class_ParrotCoroutine,
+ enum_class_ParrotClosure,
+ enum_class_ParrotContinuation,
+ enum_class_Apache,
enum_class_max = 100
};
VAR_SCOPE VTABLE Parrot_base_vtables[enum_class_max];
-Index: assemble.pl
-===================================================================
-RCS file: /cvs/public/parrot/assemble.pl,v
-retrieving revision 1.54
-diff -u -r1.54 assemble.pl
---- assemble.pl 1 Jun 2002 08:06:53 -0000 1.54
-+++ assemble.pl 1 Jun 2002 15:12:25 -0000
-@@ -117,6 +117,7 @@
- $self->{constants}{PerlHash} = 6;
- $self->{constants}{ParrotPointer} = 7;
- $self->{constants}{IntQueue} = 8;
-+ $self->{constants}{Apache} = 9;
- $self;
- }
-