[Apache-dispatch-devel] SF.net SVN: apache-dispatch:[72] trunk

[<phr...@us...>]

Revision: 72
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=72&view=rev
Author:   phred_moyer
Date:     2009-04-06 03:41:35 +0000 (Mon, 06 Apr 2009)

Log Message:
-----------
Use Apache::Bootstrap 0.05.
Put version in Apache::Dispatch::Util (thanks randy kobes for the suggestion)

Modified Paths:
--------------
    trunk/Changes
    trunk/Makefile.PL
    trunk/README
    trunk/lib/Apache/Dispatch/Util.pm
    trunk/lib/Apache/Dispatch.pm
    trunk/lib/Apache2/Dispatch.pm

Modified: trunk/Changes
===================================================================
--- trunk/Changes	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/Changes	2009-04-06 03:41:35 UTC (rev 72)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
-0.11
+0.11 04.05.2009 20:34 PDT
+  - put version in Apache::Dispatch::Util to avoid issue with Apache2::Module
   - document PerlLoadModule for Dispatch* directives - ideysus@annocpan
   - reduce unnecessary log verbosity
   - use Apache::Bootstrap to bootstrap mod_perl version

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/Makefile.PL	2009-04-06 03:41:35 UTC (rev 72)
@@ -4,13 +4,14 @@
 use warnings;
 
 # minimum version of A::B required
-use Apache::Bootstrap 0.03;
+use Apache::Bootstrap 0.05;
 
 my $bootstrap;
 
 BEGIN {
     # make sure we have at least one minimum version required
-    $bootstrap = Apache::Bootstrap->new({ mod_perl2 => '1.99022', mod_perl => 0, });
+    $bootstrap = Apache::Bootstrap->new({ mod_perl2 => 1.99022,
+                                          mod_perl1 => 0, });
 }
 
 # allow builds with mod_perl one when MOD_PERL_1_BUILD ENV is set
@@ -37,7 +38,7 @@
     PREREQ_PM     => $bootstrap->mp_prereqs,
     clean         => { FILES => 't/TEST, *.xs*' },
     NAME          => "$apache\::Dispatch",
-    VERSION_FROM  => $base_lib,
+    VERSION_FROM  => 'lib/Apache/Dispatch/Util.pm',
     ABSTRACT_FROM => $base_lib,
 );
 

Modified: trunk/README
===================================================================
--- trunk/README	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/README	2009-04-06 03:41:35 UTC (rev 72)
@@ -4,6 +4,12 @@
 
 SYNOPSIS
 
+Makefile.PL:
+
+    # require util since it can be used outside an apache process
+    PREREQ_PM    => {
+        'Apache::Dispatch::Util'    => 0.11,
+
 httpd.conf:
 
   PerlModule Apache::Dispatch

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/lib/Apache/Dispatch/Util.pm	2009-04-06 03:41:35 UTC (rev 72)
@@ -3,6 +3,8 @@
 use strict;
 use warnings;
 
+our $VERSION = 0.11;
+
 =head1 NAME
 
   Apache::Dispatch::Util - methods for Apache::Dispatch and Apache2::Dispatch

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/lib/Apache/Dispatch.pm	2009-04-06 03:41:35 UTC (rev 72)
@@ -11,13 +11,13 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.11';
 
 use mod_perl 1.2401;
 use Apache::Constants qw(OK DECLINED SERVER_ERROR);
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
+
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
@@ -318,6 +318,12 @@
 
 =head1 SYNOPSIS
 
+Makefile.PL:
+
+    # require util since it can be used outside an apache process
+    PREREQ_PM    => {
+        'Apache::Dispatch::Util'    => 0.11,
+
 httpd.conf:
 
   PerlModule Apache::Dispatch

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2008-10-08 19:35:44 UTC (rev 71)
+++ trunk/lib/Apache2/Dispatch.pm	2009-04-06 03:41:35 UTC (rev 72)
@@ -9,8 +9,6 @@
 use strict;
 use warnings;
 
-$Apache2::Dispatch::VERSION = '0.11';
-
 use mod_perl2 1.99023;
 use Apache2::Const -compile => qw(OK DECLINED SERVER_ERROR);
 use Apache2::Log         ();
@@ -244,6 +242,12 @@
 
 =head1 SYNOPSIS
 
+Makefile.PL:
+
+    # require util since it can be used outside an apache process
+    PREREQ_PM    => {
+        'Apache::Dispatch::Util'    => 0.11,
+
 httpd.conf:
 
   PerlLoadModule Apache2::Dispatch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.