[svn:mod_parrot] r256 - in mod_parrot/trunk: . eg

Author: jhorwitz
Date: Wed Sep 19 06:54:22 2007
New Revision: 256

Modified:
   mod_parrot/trunk/README
   mod_parrot/trunk/eg/authenhandler.pir
   mod_parrot/trunk/eg/handler.pir

Log:
update installation procedure and examples to reflect reality


Modified: mod_parrot/trunk/README
==============================================================================
--- mod_parrot/trunk/README	(original)
+++ mod_parrot/trunk/README	Wed Sep 19 06:54:22 2007
@@ -19,59 +19,33 @@
 REQUIREMENTS
 ------------
 * Apache 2.0.x or 2.2.x
-* A recent Parrot source tree (all tests pass as of r20271)
+* A recent Parrot source tree (all tests pass as of r21360)
 * Perl 5.6.0 or later
 * Apache::Test 1.26 or later (for tests)
 
-PRE-INSTALLATION
-----------------
-On Unix platforms, set the LD_LIBRARY_PATH environment variable to the
-location of the libparrot.so shared library, usually in blib/lib in the
-parrot source tree.  This is a temporary measure until parrot has a
-proper installation procedure.
-
-Bourne shells (sh, bash):
-$ LD_LIBRARY_PATH=/home/jeff/build/parrot/blib/lib
-$ export LD_LIBRARY_PATH
-
-csh/tcsh:
-$ setenv LD_LIBRARY_PATH /home/jeff/build/parrot/blib/lib
-
-You can also add this to the apachectl script so it gets set automatically
-when Apache starts.
-
 INSTALLATION
 ------------
 To install:
 
-1) If you haven't already, append the signatures from call_list.txt to
-   src/call_list.txt in parrot's source.  These signatures will eventually be
-   shipped with Parrot, but you have to add them manually for now.
-2) Rebuild parrot.
-3) perl ./Configure.pl --parrot-build-dir=/path/to/parrot --apxs=/path/to/apxs
-4) make
-5) make libraries
-6) make test (requires Apache::Test)
-7) make install
-8) Copy the lib directory to a directory of your choosing.  This *should* be
+1) perl ./Configure.pl --parrot-build-dir=/path/to/parrot --apxs=/path/to/apxs
+2) make
+3) make libraries
+4) make test (requires Apache::Test)
+5) make install
+6) Copy the lib directory to a directory of your choosing.  This *should* be
    installed in a more standard place, but we'll just copy it anywhere for now.
 
-
 CONFIGURING APACHE
 ------------------
 1) Verify mod_parrot is activated in httpd.conf:
 
    LoadModule parrot_module      modules/mod_parrot.so
 
-2) Tell Apache how to initialize mod_parrot using ParrotInit.  You should also
-   preload the Apache::RequestRec and Apache::Constants library here.
+2) Tell Apache how to initialize mod_parrot using ParrotInit.
 
-   ParrotInit /path/to/lib/ModParrot/init.pbc
-   ParrotLoad /path/to/lib/Apache/Constants.pbc
-   ParrotLoad /path/to/lib/Apache/RequestRec.pbc
-   ParrotLoad /path/to/lib/APR/Table.pbc
+   ParrotInit /path/to/lib/mod_parrot.pbc
 
-3) Preload your handler with ParrotLoad.  It can be IMC or compiled PBC.
+3) Preload your Parrot handler with ParrotLoad.  It can be PIR or compiled PBC.
 
    ParrotLoad /path/to/your/code
 

Modified: mod_parrot/trunk/eg/authenhandler.pir
==============================================================================
--- mod_parrot/trunk/eg/authenhandler.pir	(original)
+++ mod_parrot/trunk/eg/authenhandler.pir	Wed Sep 19 06:54:22 2007
@@ -12,7 +12,7 @@
     .local string pw
     .local int status
 
-    find_global ap_const, 'Apache::Constants', 'ap_constants'
+    ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
 
     # decline if not the initial request
     $I1 = r.'is_initial_req'( )

Modified: mod_parrot/trunk/eg/handler.pir
==============================================================================
--- mod_parrot/trunk/eg/handler.pir	(original)
+++ mod_parrot/trunk/eg/handler.pir	Wed Sep 19 06:54:22 2007
@@ -15,7 +15,7 @@
     r.'puts'($S0)
 
     # tell apache we're finished
-    find_global ap_const, 'Apache::Constants', 'ap_constants'
+    ap_const = get_root_global [ 'Apache'; 'Constants' ], 'ap_constants'
     $I0 = ap_const['OK']
     .return($I0)
 .end