Front page | perl.cvs.mod_parrot |
Postings from August 2009
[svn:mod_parrot] r662 - in mod_parrot/trunk: . eg/pir include languages/perl6/lib/Apache languages/perl6/lib/ModParrot lib/ModParrot/HLL src src/pmc t/conf
From:
jhorwitz
Date:
August 29, 2009 11:41
Subject:
[svn:mod_parrot] r662 - in mod_parrot/trunk: . eg/pir include languages/perl6/lib/Apache languages/perl6/lib/ModParrot lib/ModParrot/HLL src src/pmc t/conf
Message ID:
20090829184139.DEA161844E2@xx12.develooper.com
Author: jhorwitz
Date: Sat Aug 29 11:41:39 2009
New Revision: 662
Added:
mod_parrot/trunk/include/io_private.h
- copied unchanged from r661, /mod_parrot/branches/configure-jeff/include/io_private.h
Modified:
mod_parrot/trunk/Configure.pl
mod_parrot/trunk/Makefile.in
mod_parrot/trunk/README
mod_parrot/trunk/README.modperl6
mod_parrot/trunk/eg/pir/interpinfo.pir
mod_parrot/trunk/languages/perl6/lib/Apache/Const.pm
mod_parrot/trunk/languages/perl6/lib/ModParrot/Const.pm
mod_parrot/trunk/lib/ModParrot/HLL/lolcode.pir
mod_parrot/trunk/lib/ModParrot/HLL/perl6.pir
mod_parrot/trunk/src/mod_parrot.c
mod_parrot/trunk/src/parrot_util.c
mod_parrot/trunk/src/pmc/modparrothandle.pmc
mod_parrot/trunk/t/conf/extra.conf.in
Log:
Do a wholesale merge from configure-jeff branch r661:
svn merge https://svn.perl.org/parrot-modules/mod_parrot/trunk \
https://svn.perl.org/parrot-modules/mod_parrot/branches/configure-jeff
Modified: mod_parrot/trunk/Configure.pl
==============================================================================
--- mod_parrot/trunk/Configure.pl (original)
+++ mod_parrot/trunk/Configure.pl Sat Aug 29 11:41:39 2009
@@ -1,6 +1,6 @@
# $Id$
-# Copyright (c) 2004, 2005, 2007 Jeff Horwitz
+# Copyright (c) 2004, 2005, 2007, 2009 Jeff Horwitz
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
# mod_parrot configuration script
use Getopt::Long;
+use File::Spec::Functions;
+use IO::File;
# parts stolen from mod_perl
my %threaded_mpms = map { $_ => 1}
@@ -27,60 +29,105 @@
return $threaded_mpms{$_[0]};
}
-my $parrot_build_dir = '../parrot';
-my $apxs = '/usr/local/apache/bin/apxs';
-my $perl = $^X;
+# set some defaults
+my $apxs = 'apxs';
+my $parrot_config;
+my $parrot_build_dir;
+my $perl6;
my $res = GetOptions(
+ # supported options
+ 'with-parrot-config=s' => \$parrot_config,
+ 'with-apxs=s' => \$apxs,
+ 'with-perl6=s' => \$perl6,
+
+ # deprecated options
'parrot-build-dir=s' => \$parrot_build_dir,
'apxs=s' => \$apxs
+
);
$res || die "error while parsing options";
-sub parrot_config
-{
- my $config = shift;
- my $value = `$parrot_build_dir/parrot_config $config`;
- chomp($value);
- return $value;
+if ($parrot_build_dir) {
+ # adjust parrot_config for deprecated options
+ $parrot_config = catfile($parrot_build_dir, 'parrot_config');
+}
+else {
+ # use default parrot_config if we have nothing else
+ $parrot_config ||= 'parrot_config';
}
$| = 1;
-print "\n";
+# get parrot config data
+my %parrot_config;
+my $fh = IO::File->new;
+$fh->open("$parrot_config --dump |") or die $!;
+while (my $line = $fh->getline) {
+ if ($line =~ /([\w_]+)\s+=>\s+'(.+?)'/) {
+ $parrot_config{$1} = $2;
+ }
+}
+$fh->close();
-# defines to pass to compiler
-my $defines;
+# SOVERSION is missing, so infer from VERSION
+$parrot_config{'soversion'} = $parrot_config{'VERSION'};
-# debugging flags for developers
-my $debug = $ENV{'MP_DEBUG'};
+# kludge to translate $(KEY) to their proper values
+# can't do this in the previous loop -- substitutions might be forward-looking
+for (;;) {
+ my $n = 0;
+ while (my ($k, $v) = each %parrot_config) {
+ $parrot_config{$k} =~ s/\$\(([\w_]+)\)/$parrot_config{lc($1)}/g;
+ $n++ if $parrot_config{$k} =~ /\$\([\w_]+\)/;
+ }
+ last unless $n;
+}
+
+# populate config hash with the easy stuff
-# apache configs
-my $apache_include_dir = `$apxs -q INCLUDEDIR`;
-my $apr_include_dir = `$apxs -q APR_INCLUDEDIR`;
-my $apu_include_dir = `$apxs -q APU_INCLUDEDIR`;
-my $ap_cflags = `$apxs -q CFLAGS`;
-my $extra_cppflags = `$apxs -q EXTRA_CPPFLAGS`;
-my $libexec_dir = `$apxs -q LIBEXECDIR`;
-my $cc = `$apxs -q CC`;
-my $libtool = `$apxs -q LIBTOOL`;
+my %config = (
+ apache_include_dir => `$apxs -q INCLUDEDIR`,
+ apr_include_dir => `$apxs -q APR_INCLUDEDIR`,
+ apu_include_dir => `$apxs -q APU_INCLUDEDIR`,
+ apxs => $apxs,
+ cc => `$apxs -q CC`,
+ extra_cppflags => `$apxs -q EXTRA_CPPFLAGS`,
+ libexecdir => `$apxs -q LIBEXECDIR`,
+ libtool => `$apxs -q LIBTOOL`,
+ cp => $parrot_config{'cp'},
+ load_ext => $parrot_config{'load_ext'},
+ o => $parrot_config{'o'},
+ parrot_bin_dir => $parrot_config{'bindir'},
+ parrot_inc_dir => $parrot_config{'includedir'},
+ parrot_ld => $parrot_config{'ld'},
+ parrot_ld_load_flags => $parrot_config{'ld_load_flags'},
+ parrot_lib_dir => $parrot_config{'libdir'},
+ parrot_src_dir => $parrot_config{'srcdir'},
+ parrot_build_dir => $parrot_config{'build_dir'},
+ perl => $^X,
+ perl6 => ($perl6 ||
+ catfile($parrot_config{'bindir'}, "perl6")),
+);
+
+# now onto the more complex stuff
-# discover mpm -- we don't use this yet, but we might
my $mpm = `$apxs -q MPM_NAME`;
$mpm or die "Couldn't find Apache MPM";
chomp($mpm);
-print "Configuring mod_parrot for $mpm MPM.\n";
+print "\nConfiguring mod_parrot for $mpm MPM.\n";
+$config{mpm} = $mpm;
+$config{ap_cflags} = `$apxs -q CFLAGS`;
+chomp($config{ap_cflags});
+$config{cflags} = " -I$config{'parrot_inc_dir'} -Iinclude $config{ap_cflags}";
+$config{cflags} .= " -DMPM_IS_THREADED" if (mpm_is_threaded($mpm));
+$config{libs} = "$parrot_config{'libparrot_linkflags'}" .
+ " $parrot_config{'libparrot_ldflags'}" .
+ " -R$parrot_config{'libdir'}" .
+ " $parrot_config{'libparrot_linkflags'} $parrot_config{'libparrot_ldflags'}";
-# we can't use the config verbatim -- apxs chokes on it, so we use what we can
-chomp($ap_cflags);
-my $cflags = " -I$parrot_build_dir/include -Iinclude $ap_cflags";
-$cflags .= " -DMPM_IS_THREADED" if (mpm_is_threaded($mpm));
-my $libs = parrot_config('libs') . " -lparrot";
-my $blib_dir = parrot_config('blib_dir');
-my $ldflags = parrot_config('libparrot_ldflags') .
- parrot_config('libparrot_linkflags') .
- " -R$parrot_build_dir/$blib_dir";
+# we have our config hash, so create the makefile
print "Generating Makefile...";
my $template;
@@ -90,29 +137,14 @@
$template = <MAKEFILE_IN>;
close(MAKEFILE_IN);
}
-$template =~ s/\@CC\@/$cc/g;
-$template =~ s/\@LIBTOOL\@/$libtool/g;
-$template =~ s/\@DEFINES\@/$defines/g;
-$template =~ s/\@CFLAGS\@/$cflags/g;
-$template =~ s/\@DEBUG\@/$debug/g;
-$template =~ s/\@EXTRA_CPPFLAGS\@/$extra_cppflags/g;
-$template =~ s/\@LDFLAGS\@/$ldflags/g;
-$template =~ s/\@LIBS\@/$libs/g;
-$template =~ s/\@LIBEXECDIR\@/$libexec_dir/g;
-$template =~ s/\@APXS\@/$apxs/g;
-$template =~ s/\@PERL\@/$perl/g;
-$template =~ s/\@PARROT_SOURCE\@/$parrot_build_dir/g;
-$template =~ s/\@PARROT_BLIB_DIR\@/$parrot_build_dir\/$blib_dir/g;
-$template =~ s/\@PARROT\@/$parrot_build_dir\/parrot/g;
-$template =~ s/\@APACHE_INCLUDE_DIR\@/$apache_include_dir/g;
-$template =~ s/\@APR_INCLUDE_DIR\@/$apr_include_dir/g;
-$template =~ s/\@APU_INCLUDE_DIR\@/$apu_include_dir/g;
-$template =~ s/\@CALLING_CONVENTIONS\@/$calling_conventions/g;
+$template =~ s/\@(.+?)\@/$config{$1}/g;
open(MAKEFILE, ">Makefile") or die $!;
print MAKEFILE $template;
close(MAKEFILE);
print "done.\n";
+# configure Apache::Test
+
print "Creating testing infrastructure...";
eval "use Apache::Test 1.26";
unless ($@) {
@@ -131,7 +163,7 @@
package main;
use Apache::TestMM;
push(@ARGV, '-apxs', $apxs);
- push(@ARGV, '-defines', "PARROT_BUILD_DIR=$parrot_build_dir");
+ push(@ARGV, '-defines', "PARROT_BUILD_DIR=$parrot_config{'build_dir'}");
Apache::TestMM::filter_args();
ModParrot::TestRun->generate_script();
print "done.\n";
Modified: mod_parrot/trunk/Makefile.in
==============================================================================
--- mod_parrot/trunk/Makefile.in (original)
+++ mod_parrot/trunk/Makefile.in Sat Aug 29 11:41:39 2009
@@ -1,27 +1,36 @@
# $Id$
-# This file is autogenerated. Changes will be lost after reconfiguration.
-
-CC=@CC@
-LIBTOOL=@LIBTOOL@
-APR_INCLUDE_DIR=@APR_INCLUDE_DIR@
-APU_INCLUDE_DIR=@APU_INCLUDE_DIR@
-DEFINES=@DEFINES@
-CFLAGS=@CFLAGS@
-DEBUG=@DEBUG@
-EXTRA_CPPFLAGS=@EXTRA_CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
-LIBEXECDIR=@LIBEXECDIR@
-PERL=@PERL@
-APXS=@APXS@
-PARROT_SOURCE=@PARROT_SOURCE@
-PARROT_BLIB_DIR=@PARROT_BLIB_DIR@
-PARROT=@PARROT@
-APACHE_INCLUDE_DIR=@APACHE_INCLUDE_DIR@
-PARROT_DYNEXT=$(PARROT_SOURCE)/runtime/parrot/dynext
-BUILD_DYNPMC=$(PERL) $(PARROT_SOURCE)/tools/build/dynpmc.pl
-MODPARROT_GROUP=modparrot_group.so
+CC=@cc@
+LIBTOOL=@libtool@
+APACHE_INCLUDE_DIR=@apache_include_dir@
+APR_INCLUDE_DIR=@apr_include_dir@
+APU_INCLUDE_DIR=@apu_include_dir@
+DEFINES=@defines@
+CFLAGS=@cflags@
+DEBUG=@debug@
+EXTRA_CPPFLAGS=@extra_cppflags@
+LDFLAGS=@ldflags@
+LIBS=@libs@
+LIBEXECDIR=@libexecdir@
+PERL=@perl@
+PERL6=@perl6@
+APXS=@apxs@
+CP=@cp@
+PARROT_BIN_DIR=@parrot_bin_dir@
+PARROT_INC_DIR=@parrot_inc_dir@
+PARROT_LD=@parrot_ld@
+PARROT_LD_LOAD_FLAGS=@parrot_ld_load_flags@
+PARROT_LIB_DIR=@parrot_lib_dir@
+PARROT_SRC_DIR=@parrot_src_dir@
+PARROT=$(PARROT_BIN_DIR)/parrot
+PARROT_DYNEXT=$(PARROT_LIB_DIR)/dynext
+PMC2C=$(PERL) $(PARROT_LIB_DIR)/tools/build/pmc2c.pl
+PMC_DIR=src/pmc
+PMC2C_INCLUDES=--include $(PMC_DIR) --include $(PARROT_SRC_DIR) --include $(PARROT_SRC_DIR)/pmc
+MODPARROT_GROUP=modparrot_group
+O=@o@
+LOAD_EXT=@load_ext@
+DYNPMC=$(MODPARROT_GROUP)$(LOAD_EXT)
export DYNPMC_INCLUDE=$(APACHE_INCLUDE_DIR),$(APR_INCLUDE_DIR),$(APU_INCLUDE_DIR),../../include
SRC_DIR = src
@@ -61,11 +70,9 @@
lib/ModParrot/HLL/pipp.pbc \
lib/ModParrot/HLL/lolcode.pbc
-PMCS= modparrothandle
-
PMC_SOURCES= $(SRC_DIR)/pmc/modparrothandle.pmc
-all: gen-src $(SRC_DIR)/mod_parrot.la libs $(MODPARROT_GROUP)
+all: gen-src $(SRC_DIR)/mod_parrot.la libs $(DYNPMC)
%.lo: %.c
$(LIBTOOL) --mode=compile $(CC) -o $@ $(EXTRA_CPPFLAGS) $(DEBUG) $(CFLAGS) -I$(APACHE_INCLUDE_DIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) $(DEFINES) -c $<
@@ -82,17 +89,18 @@
libs: $(MPLIBS)
-$(MODPARROT_GROUP): $(PMC_SOURCES)
- cd $(SRC_DIR)/pmc && $(BUILD_DYNPMC) generate $(PMCS)
- cd $(SRC_DIR)/pmc && $(BUILD_DYNPMC) compile $(PMCS)
- cd $(SRC_DIR)/pmc && $(BUILD_DYNPMC) linklibs $(PMCS)
+$(DYNPMC): $(PMC_SOURCES)
+ $(PMC2C) --no-lines --dump $(PMC2C_INCLUDES) $(PMC_SOURCES)
+ $(PMC2C) --no-lines --c $(PMC2C_INCLUDES) $(PMC_SOURCES)
+ $(PMC2C) --no-lines --library $(MODPARROT_GROUP) --c $(PMC_SOURCES)
+ $(CC) -c -o $(MODPARROT_GROUP)$(O) -I$(PMC_DIR) -I$(PARROT_INC_DIR) -I$(PARROT_INC_DIR)/pmc $(CFLAGS) $(MODPARROT_GROUP).c
+ cd $(PMC_DIR) && $(CC) -c $(DFEINES) $(EXTRA_CPPFLAGS) $(CFLAGS) -I../../include -I$(APACHE_INCLUDE_DIR) -I$(APR_INCLUDE_DIR) -I$(APU_INCLUDE_DIR) -I$(PARROT_INC_DIR) -I$(PARROT_INC_DIR)/pmc $(CFLAGS) *.c
+ $(PARROT_LD) -o $@ $(MODPARROT_GROUP)$(O) $(PMC_DIR)/*$(O) $(PARROT_LD_LOAD_FLAGS)
modperl6: languages/perl6/lib/mod_perl6.pir languages/perl6/lib/ModPerl6/Registry.pir
%.pir: %.pm
- PERL6LIB=languages/perl6/lib \
- $(PARROT) $(PARROT_SOURCE)/languages/rakudo/perl6.pbc \
- --output=$@ --target=pir $<
+ PERL6LIB=languages/perl6/lib $(PERL6) --output=$@ --target=pir $<
modperl6-clean:
rm -f languages/perl6/lib/mod_perl6.pir \
@@ -100,7 +108,7 @@
gen-src:
@echo Generating Source...
- perl build/lib/generate_source.pl --apache-include-dir=$(APACHE_INCLUDE_DIR)
+ $(PERL) build/lib/generate_source.pl --apache-include-dir=$(APACHE_INCLUDE_DIR)
gen-src-clean:
rm -rf build/src
@@ -109,12 +117,10 @@
rm -f $(MPLIBS)
pmcs-clean:
- rm -f $(SRC_DIR)/pmc/$(MODPARROT_GROUP)
- rm -f $(SRC_DIR)/pmc/*.c
- rm -f $(SRC_DIR)/pmc/*.h
- rm -f $(SRC_DIR)/pmc/*.o
- rm -f $(SRC_DIR)/pmc/*.dump
- rm -f $(SRC_DIR)/pmc/*.exp
+ rm -f $(MODPARROT_GROUP).* $(DYNPMC)
+ rm -f $(PMC_DIR)/*.h
+ rm -f $(PMC_DIR)/*.c
+ rm -f $(PMC_DIR)/*.dump
test-clean:
if [ -x t/TEST ]; then t/TEST -clean; fi
@@ -125,9 +131,9 @@
distclean: clean test-clean
rm -f Makefile Makefile.old
-install: $(SRC_DIR)/mod_parrot.la $(MODPARROT_GROUP)
+install: $(SRC_DIR)/mod_parrot.la $(DYNPMC)
$(APXS) -i -n parrot -a $(SRC_DIR)/mod_parrot.la
- cd $(SRC_DIR)/pmc && $(BUILD_DYNPMC) copy "--destination=$(PARROT_DYNEXT)" $(PMCS)
+ $(CP) $(DYNPMC) $(PARROT_DYNEXT)
test: $(SRC_DIR)/mod_parrot.la libs
$(PARROT) -o t/lib/handlers.pbc t/lib/handlers.pir
Modified: mod_parrot/trunk/README
==============================================================================
--- mod_parrot/trunk/README (original)
+++ mod_parrot/trunk/README Sat Aug 29 11:41:39 2009
@@ -24,10 +24,12 @@
------------
To configure, compile, test and install:
-1) perl Configure.pl --parrot-build-dir=/path/to/parrot --apxs=/path/to/apxs
-2) make
-3) make test
-4) make install (as root, if appropriate)
+1) Build and install Parrot
+2) perl Configure.pl --with-parrot-config=/path/to/parrot_config \
+ --with-apxs=/path/to/apxs
+3) make
+4) make test
+5) make install (as root, if appropriate)
CONFIGURING APACHE
------------------
@@ -45,9 +47,10 @@
Alternatively you can copy mod_parrot.pbc to parrot's runtime directory
and set the PARROT_RUNTIME environment variable to that directory.
- mod_parrot will then be able to find this file automatically.
+ mod_parrot will then be able to find this file automatically. For an
+ installed Parrot, this should be /path/to/installed/parrot/lib.
-3) Tell mod_parrot where to find its libraries:
+3) Tell mod_parrot where to find its libraries and includes:
ParrotLibPath /path/to/mod_parrot/lib
Modified: mod_parrot/trunk/README.modperl6
==============================================================================
--- mod_parrot/trunk/README.modperl6 (original)
+++ mod_parrot/trunk/README.modperl6 Sat Aug 29 11:41:39 2009
@@ -2,13 +2,17 @@
0.5 release. While it is still bundled here, use the following procedures
to get registry scripts working (familiarity with Apache concepts assumed):
-1) make modperl6
+1) Reconfigure mod_parrot with "--with-perl6=/path/to/perl6/binary"
-2) In httpd.conf:
+2) make modperl6
- a) add /path/to/mod_parrot/lib to the colon separated ParrotLibPath
+3) In httpd.conf:
- b) add the following configuration:
+ a) add /path/to/mod_parrot/lib:/path/to/parrot/lib/library to ParrotLibPath
+
+ b) add /path/to/parrot/lib/include to ParrotIncludePath
+
+ c) add the following configuration:
ParrotLoadImmediate ModParrot/HLL/perl6.pbc
ScriptAlias /path/to/your/cgi/directory
@@ -18,10 +22,10 @@
Perl6ResponseHandler ModPerl6::Registry
</Directory>
-3) In /path/to/apache/bin/envvars:
+4) In /path/to/apache/bin/envvars:
PERL6LIB=/path/to/mod_parrot/languages/perl6/lib:/path/to/your/own/perl6/lib
-4) Stop and start Apache (don't use restart if you changed envvars)
+5) Stop and start Apache (don't use restart if you changed envvars)
-5) Add scripts to /path/to/your/cgi directory, set the execute bit, and enjoy!
+6) Add scripts to /path/to/your/cgi directory, set the execute bit, and enjoy!
Modified: mod_parrot/trunk/eg/pir/interpinfo.pir
==============================================================================
--- mod_parrot/trunk/eg/pir/interpinfo.pir (original)
+++ mod_parrot/trunk/eg/pir/interpinfo.pir Sat Aug 29 11:41:39 2009
@@ -98,10 +98,6 @@
$S0 = $I0
print_row(r, "GC_LAZY_MARK_RUNS", $S0)
- $I0 = interpinfo .INTERPINFO_EXTENDED_PMCS
- $S0 = $I0
- print_row(r, "EXTENDED_PMCS", $S0)
-
$S0 = interpinfo .INTERPINFO_RUNTIME_PREFIX
print_row(r, "RUNTIME_PREFIX", $S0)
Modified: mod_parrot/trunk/languages/perl6/lib/Apache/Const.pm
==============================================================================
--- mod_parrot/trunk/languages/perl6/lib/Apache/Const.pm (original)
+++ mod_parrot/trunk/languages/perl6/lib/Apache/Const.pm Sat Aug 29 11:41:39 2009
@@ -10,7 +10,7 @@
if null $P0 goto done
$P0 = get_root_global ['ModParrot'; 'Apache'; 'Constants'], 'table'
- $P1 = new 'Iterator', $P0
+ $P1 = iter $P0
$P1 = .ITERATE_FROM_START
iter_start:
unless $P1 goto iter_end
Modified: mod_parrot/trunk/languages/perl6/lib/ModParrot/Const.pm
==============================================================================
--- mod_parrot/trunk/languages/perl6/lib/ModParrot/Const.pm (original)
+++ mod_parrot/trunk/languages/perl6/lib/ModParrot/Const.pm Sat Aug 29 11:41:39 2009
@@ -10,7 +10,7 @@
if null $P0 goto done
$P0 = get_root_global ['ModParrot'; 'Constants'], 'table'
- $P1 = new 'Iterator', $P0
+ $P1 = iter $P0
$P1 = .ITERATE_FROM_START
iter_start:
unless $P1 goto iter_end
Modified: mod_parrot/trunk/lib/ModParrot/HLL/lolcode.pir
==============================================================================
--- mod_parrot/trunk/lib/ModParrot/HLL/lolcode.pir (original)
+++ mod_parrot/trunk/lib/ModParrot/HLL/lolcode.pir Sat Aug 29 11:41:39 2009
@@ -117,7 +117,7 @@
query_parse = get_hll_global [ 'CGI'; 'QueryHash' ], 'parse'
query = new 'Hash'
query = query_parse($S0)
- q_iter = new 'Iterator', query
+ q_iter = iter query
query_loop:
key = shift q_iter
unless key goto query_loop_end
Modified: mod_parrot/trunk/lib/ModParrot/HLL/perl6.pir
==============================================================================
--- mod_parrot/trunk/lib/ModParrot/HLL/perl6.pir (original)
+++ mod_parrot/trunk/lib/ModParrot/HLL/perl6.pir Sat Aug 29 11:41:39 2009
@@ -33,7 +33,7 @@
$P1 = get_class ['ModParrotHandle']
$P0.'register'($P1, 'perl6' :named('hll'))
- load_bytecode 'languages/rakudo/perl6.pbc'
+ load_bytecode 'languages/perl6/perl6.pbc'
# load mod_perl6.pm, which may be precompiled
$P0 = compreg 'perl6'
Modified: mod_parrot/trunk/src/mod_parrot.c
==============================================================================
--- mod_parrot/trunk/src/mod_parrot.c (original)
+++ mod_parrot/trunk/src/mod_parrot.c Sat Aug 29 11:41:39 2009
@@ -143,9 +143,8 @@
/* set additional paths from apache config */
if (cfg->include_path) {
- /* XXX set to "include_path" when tests & docs are updated */
modparrot_call_sub_IS(interp, "ModParrot",
- "modparrot_set_lib_path", &i, cfg->include_path);
+ "modparrot_set_include_path", &i, cfg->include_path);
}
if (cfg->lib_path) {
modparrot_call_sub_IS(interp, "ModParrot",
Modified: mod_parrot/trunk/src/parrot_util.c
==============================================================================
--- mod_parrot/trunk/src/parrot_util.c (original)
+++ mod_parrot/trunk/src/parrot_util.c Sat Aug 29 11:41:39 2009
@@ -21,7 +21,7 @@
#include "parrot/embed.h"
#include "parrot/extend.h"
#include "mod_parrot.h"
-#include "../src/pmc/pmc_continuation.h"
+#include "pmc/pmc_continuation.h"
static Parrot_PMC get_sub_pmc_s(Parrot_Interp interp, char *namespace, char *name)
{
Modified: mod_parrot/trunk/src/pmc/modparrothandle.pmc
==============================================================================
--- mod_parrot/trunk/src/pmc/modparrothandle.pmc (original)
+++ mod_parrot/trunk/src/pmc/modparrothandle.pmc Sat Aug 29 11:41:39 2009
@@ -32,7 +32,12 @@
*/
#include "parrot/parrot.h"
-#include "../src/io/io_private.h"
+
+/* We need constants are from ../src/io/io_private.h, which are missing
+ * from an installed parrot as of r40850. So we roll our own.
+ */
+#include "io_private.h"
+
#include "mod_parrot.h"
#include "httpd.h"
#include "http_protocol.h"
Modified: mod_parrot/trunk/t/conf/extra.conf.in
==============================================================================
--- mod_parrot/trunk/t/conf/extra.conf.in (original)
+++ mod_parrot/trunk/t/conf/extra.conf.in Sat Aug 29 11:41:39 2009
@@ -4,7 +4,7 @@
ParrotIncludePath @ServerRoot@/../lib
ParrotLibPath @ServerRoot@/../lib
-ParrotDynextPath @ServerRoot@/../src/pmc
+ParrotDynextPath @ServerRoot@/..
ParrotInit @ServerRoot@/../lib/mod_parrot.pbc
ParrotLoadImmediate @ServerRoot@/../lib/ModParrot/HLL/pir.pbc
ParrotLoad @ServerRoot@/lib/handlers.pbc
-
[svn:mod_parrot] r662 - in mod_parrot/trunk: . eg/pir include languages/perl6/lib/Apache languages/perl6/lib/ModParrot lib/ModParrot/HLL src src/pmc t/conf
by jhorwitz