[svn:mod_parrot] r659 - in mod_parrot/branches/configure-jeff: . lib/ModParrot/HLL

Author: jhorwitz
Date: Sat Aug 29 11:20:39 2009
New Revision: 659

Modified:
   mod_parrot/branches/configure-jeff/Configure.pl
   mod_parrot/branches/configure-jeff/Makefile.in
   mod_parrot/branches/configure-jeff/README
   mod_parrot/branches/configure-jeff/README.modperl6
   mod_parrot/branches/configure-jeff/lib/ModParrot/HLL/perl6.pir

Log:
make mod_perl6 work with installed parrot and rakudo


Modified: mod_parrot/branches/configure-jeff/Configure.pl
==============================================================================
--- mod_parrot/branches/configure-jeff/Configure.pl	(original)
+++ mod_parrot/branches/configure-jeff/Configure.pl	Sat Aug 29 11:20:39 2009
@@ -30,13 +30,16 @@
 }
 
 # set some defaults
-my $parrot_config;
 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,
@@ -104,6 +107,8 @@
     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

Modified: mod_parrot/branches/configure-jeff/Makefile.in
==============================================================================
--- mod_parrot/branches/configure-jeff/Makefile.in	(original)
+++ mod_parrot/branches/configure-jeff/Makefile.in	Sat Aug 29 11:20:39 2009
@@ -13,6 +13,7 @@
 LIBS=@libs@
 LIBEXECDIR=@libexecdir@
 PERL=@perl@
+PERL6=@perl6@
 APXS=@apxs@
 CP=@cp@
 PARROT_BIN_DIR=@parrot_bin_dir@
@@ -99,9 +100,7 @@
 modperl6: languages/perl6/lib/mod_perl6.pir languages/perl6/lib/ModPerl6/Registry.pir
 
 %.pir: %.pm
-	PERL6LIB=languages/perl6/lib \
-	$(PARROT) $(PARROT_LIB_DIR)/languages/perl6/perl6.pbc \
-	--output=$@ --target=pir $<
+	PERL6LIB=languages/perl6/lib $(PERL6) --output=$@ --target=pir $<
 
 modperl6-clean:
 	rm -f languages/perl6/lib/mod_perl6.pir \

Modified: mod_parrot/branches/configure-jeff/README
==============================================================================
--- mod_parrot/branches/configure-jeff/README	(original)
+++ mod_parrot/branches/configure-jeff/README	Sat Aug 29 11:20: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/branches/configure-jeff/README.modperl6
==============================================================================
--- mod_parrot/branches/configure-jeff/README.modperl6	(original)
+++ mod_parrot/branches/configure-jeff/README.modperl6	Sat Aug 29 11:20: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/branches/configure-jeff/lib/ModParrot/HLL/perl6.pir
==============================================================================
--- mod_parrot/branches/configure-jeff/lib/ModParrot/HLL/perl6.pir	(original)
+++ mod_parrot/branches/configure-jeff/lib/ModParrot/HLL/perl6.pir	Sat Aug 29 11:20: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'

• [svn:mod_parrot] r659 - in mod_parrot/branches/configure-jeff: . lib/ModParrot/HLL by jhorwitz