cvs commit: mod_parrot Makefile mod_parrot.diff
[email protected] 29 May 2002 02:17:50 -0000
Newsgroups
perl.cvs.mod_parrot
Message-ID
<[email protected] >
cvsuser 02/05/28 19:17:50
Modified: . Makefile mod_parrot.diff
Log:
Hack to fit in Brent's new Configure
maybe this trick to find the current directory works on BSD
Revision Changes Path
1.8 +8 -5 mod_parrot/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/public/mod_parrot/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- Makefile 24 May 2002 17:26:35 -0000 1.7
+++ Makefile 29 May 2002 02:17:49 -0000 1.8
@@ -4,10 +4,12 @@
PARROT_LIB_DIR=$(PARROT_DIR)/blib/lib
ASM=$(PARROT_DIR)/assemble.pl
+MODPARROT_DIR=$(PWD)
+
all: mod_parrot.so
mod_parrot.so: mod_parrot.c
- (cd $(PARROT_DIR); make shared-only)
+ (cd $(PARROT_DIR); make shared)
$(APACHEDIR)/bin/apxs -Wall -I $(PARROT_DIR)/include -c -n parrot mod_parrot.c -L$(PARROT_LIB_DIR) -lparrot
install: mod_parrot.so
@@ -25,8 +27,8 @@
LD_LIBRARY_PATH=$(PARROT_LIB_DIR):$(LD_LIBRARY_PATH) $(APACHEDIR)/bin/httpd -X
patch: mod_parrot.diff
- perl -pi -ne 's#(.Config{ccflags})#"\1 -I$(.CURDIR) -I$(APACHEDIR)/include"#' $(PARROT_DIR)/Configure.pl
- perl -pi -ne 's#(.Config{libs})#"\1 -L$(.CURDIR)"#' $(PARROT_DIR)/Configure.pl
+ perl -pi -ne 's#(.Config{ccflags})#"\1 -I$(MODPARROT_DIR) -I$(APACHEDIR)/include"#' $(PARROT_DIR)/config/init/data.pl
+ perl -pi -ne 's#(.Config{libs})#"\1 -L$(MODPARROT_DIR)"#' $(PARROT_DIR)/config/init/data.pl
patch -d $(PARROT_DIR) -p0 < mod_parrot.diff
patchprint:
@@ -36,6 +38,7 @@
clean:
rm *.o *.so
-demo: eg/demo.pasm
+demo: eg/demo.pasm eg/demo2.pasm
$(ASM) eg/demo.pasm > eg/demo.pbc
- cp eg/demo.pbc $(APACHEDIR)/htdocs/demo.pbc
+ $(ASM) eg/demo2.pasm > eg/demo2.pbc
+ cp eg/demo.pbc eg/demo2.pbc $(APACHEDIR)/parrot/
1.3 +28 -43 mod_parrot/mod_parrot.diff
Index: mod_parrot.diff
===================================================================
RCS file: /cvs/public/mod_parrot/mod_parrot.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- mod_parrot.diff 17 May 2002 16:18:21 -0000 1.2
+++ mod_parrot.diff 29 May 2002 02:17:49 -0000 1.3
@@ -1,36 +1,10 @@
-Index: Makefile.in
-===================================================================
-RCS file: /cvs/public/parrot/Makefile.in,v
-retrieving revision 1.149
-diff -u -u -r1.149 Makefile.in
---- Makefile.in 15 May 2002 01:45:03 -0000 1.149
-+++ Makefile.in 17 May 2002 15:11:55 -0000
-@@ -74,7 +74,8 @@
- CLASS_O_FILES = classes/default$(O) classes/array$(O) \
- 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)
-
- ENCODING_O_FILES = encodings/singlebyte$(O) encodings/utf8$(O) \
- encodings/utf16$(O) \
-@@ -188,6 +189,8 @@
- mkdir -p blib/lib
-
- shared : blib_lib blib/lib/libparrot$(SO) blib/lib/libcore_prederef$(SO) $(TEST_PROG_SO)
-+
-+shared-only : blib_lib blib/lib/libparrot$(SO) blib/lib/libcore_prederef$(SO)
-
- blib/lib/libparrot$(SO).${VERSION} : blib_lib $(O_FILES)
- $(LD) $(LD_SHARED) -Wl,-soname,libparrot$(SO).${MAJOR} $(LDFLAGS) $(LD_OUT)blib/lib/libparrot$(SO).${VERSION} $(O_FILES)
Index: global_setup.c
===================================================================
RCS file: /cvs/public/parrot/global_setup.c,v
retrieving revision 1.25
-diff -u -u -r1.25 global_setup.c
+diff -u -r1.25 global_setup.c
--- global_setup.c 5 Mar 2002 04:21:30 -0000 1.25
-+++ global_setup.c 17 May 2002 15:11:55 -0000
++++ 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);
@@ -39,14 +13,14 @@
/* Now register the names of the PMCs */
/*
-Index: classes/Makefile.in
+Index: config/gen/makefiles/classes.in
===================================================================
-RCS file: /cvs/public/parrot/classes/Makefile.in,v
-retrieving revision 1.19
-diff -u -r1.19 Makefile.in
---- classes/Makefile.in 29 Jan 2002 04:26:21 -0000 1.19
-+++ classes/Makefile.in 17 May 2002 16:08:34 -0000
-@@ -7,12 +7,13 @@
+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 @@
O_FILES = default$(O) array$(O) perlint$(O) perlstring$(O) perlnum$(O) \
@@ -56,12 +30,6 @@
#DO NOT ADD C COMPILER FLAGS HERE
#Add them in Configure.pl--look for the
- #comment 'ADD C COMPILER FLAGS HERE'
--CFLAGS = ${ccflags} ${cc_warn} ${cc_debug} -I../include
-+CFLAGS = ${ccflags} ${cc_warn} ${cc_debug} -I../include
-
- C_LIBS = ${libs}
-
@@ -25,6 +26,11 @@
$(CC) $(CFLAGS) ${cc_exe_out}$@ -c $<
@@ -74,13 +42,30 @@
array.c array.h: array.pmc
$(PMC2C) array.pmc
+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) \
+ 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)
+
+ ENCODING_O_FILES = encodings/singlebyte$(O) encodings/utf8$(O) \
+ encodings/utf16$(O) \
Index: include/parrot/pmc.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/pmc.h,v
retrieving revision 1.29
-diff -u -u -r1.29 pmc.h
+diff -u -r1.29 pmc.h
--- include/parrot/pmc.h 15 May 2002 01:45:09 -0000 1.29
-+++ include/parrot/pmc.h 17 May 2002 15:11:55 -0000
++++ include/parrot/pmc.h 29 May 2002 00:44:10 -0000
@@ -14,6 +14,7 @@
#define PARROT_PMC_H_GUARD