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

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

Revision: 84
          http://apache-dispatch.svn.sourceforge.net/apache-dispatch/?rev=84&view=rev
Author:   phred_moyer
Date:     2010-02-06 21:18:41 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Release 0.13

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	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/Changes	2010-02-06 21:18:41 UTC (rev 84)
@@ -1,6 +1,7 @@
 Revision history for Perl extension Apache::Dispatch
 
-0.13-dev
+0.13 02.06.2010 13:08 PST
+  - require Apache::Bootstrap 0.07 to install on mp1/mp2 properly
   - fix some of the Makefile.PL logic so that mp2 is checked first
 
 0.12 04.25.2009 16:06 PST

Modified: trunk/Makefile.PL
===================================================================
--- trunk/Makefile.PL	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/Makefile.PL	2010-02-06 21:18:41 UTC (rev 84)
@@ -3,42 +3,51 @@
 use strict;
 use warnings;
 
+use constant DEBUG => $ENV{AB_DEBUG} || 0;
+
+#########################################################################
 # minimum version of A::B required
-use Apache::Bootstrap 0.07;
+my $ab = 0.07;
+eval { require Apache::Bootstrap };
 
-my $bootstrap;
+die "Please install Apache::Bootstrap $ab" if $@;
 
-BEGIN {
-    # make sure we have at least one minimum version required
-    $bootstrap = Apache::Bootstrap->new({ mod_perl2 => 1.99022,
-                                          mod_perl  => 1.30 });
-}
+die "Apache::Bootstrap $ab required, found " . $Apache::Bootstrap::VERSION
+    if ($Apache::Bootstrap::VERSION < $ab);
 
-# try mp2 first, but allow builds with mod_perl one 
+# make sure we have at least one minimum version of mod_perl
+my $bs = eval { Apache::Bootstrap->new({ mod_perl2 => 1.99022,
+                                         mod_perl  => 1.30 }) };
+do { $! = 255; die($@); } if $@;
+##########################################################################
+
+
+# try mp2 first, but allow builds with mod_perl one
 # when MOD_PERL_1_BUILD ENV is set (for maintainers mostly)
-my $mp_gen = $bootstrap->satisfy_mp_generation(2);
+my $mp_gen = $bs->satisfy_mp_generation(2);
 if (! $ENV{MOD_PERL_1_BUILD} && $mp_gen) {
 
-	warn("building for mp2 since MOD_PERL_1_BUILD not set");
+	warn("building for mp2 since MOD_PERL_1_BUILD not set") if DEBUG;
     push @ARGV, "-apxs $ENV{MP_APXS}" if exists $ENV{MP_APXS};
 
-} elsif ( $mp_gen = $bootstrap->satisfy_mp_generation(1)) {
+} elsif ( $mp_gen = $bs->satisfy_mp_generation(1)) {
 
-	warn("building for mp1");
+	warn("building for mp1") if DEBUG;
 } else {
 	die "no mp generation could be satisfied\n";
 }
 
 # check for Apache::Test, $HAS_APACHE_TEST contains version or is undefined
-my $HAS_APACHE_TEST = $bootstrap->check_for_apache_test();
+my $HAS_APACHE_TEST = $bs->check_for_apache_test();
 
 # calculate common makefile version vars
-my $apache = $bootstrap->apache_major_version;
+
+my $apache = $bs->apache_major_version;
 my $base_lib = "lib/$apache/Dispatch.pm";
 
 # common makefile build options
 my %maker_opts = (
-    PREREQ_PM     => $bootstrap->mp_prereqs,
+    PREREQ_PM     => $bs->mp_prereqs,
     clean         => { FILES => 't/TEST, *.xs*' },
     NAME          => "$apache\::Dispatch",
     VERSION_FROM  => 'lib/Apache/Dispatch/Util.pm',
@@ -84,7 +93,7 @@
 
 }
 
-$bootstrap->WriteMakefile( %maker_opts );
+$bs->WriteMakefile( %maker_opts );
 
 pop @ARGV if $ENV{MOD_PERL_1_BUILD};
 

Modified: trunk/README
===================================================================
--- trunk/README	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/README	2010-02-06 21:18:41 UTC (rev 84)
@@ -1,12 +1,12 @@
 NAME
-    Apache::Dispatch - call PerlHandlers with the ease of Registry scripts
+    Apache2::Dispatch - call PerlHandlers with the ease of Registry scripts
 
 SYNOPSIS
     Makefile.PL:
 
-        # require util since it can be used outside an apache process
+        # require a:d:util since it can be used outside an apache process
         PREREQ_PM    => {
-            'Apache::Dispatch::Util'    => 0.11,
+            'Apache::Dispatch::Util'    => 0.13,
         }
 
     httpd.conf:
@@ -28,6 +28,11 @@
       </Location>
 
 DESCRIPTION
+    As of version 0.13, Apache2::Dispatch is now the preferred package over
+    Apache::Dispatch.  The ASF end of lifed Apache 1.3, so future versions
+    of Apache2::Dispatch will default to installing against mod_perl2.
+    mod_perl1 is still very much supported through, thanks to Apache::Boostrap.
+
     Apache::Dispatch translates $r->uri into a class and method and runs it
     as a PerlHandler. Basically, this allows you to call PerlHandlers as you
     would Regsitry scripts without having to load your httpd.conf with a

Modified: trunk/lib/Apache/Dispatch/Util.pm
===================================================================
--- trunk/lib/Apache/Dispatch/Util.pm	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/lib/Apache/Dispatch/Util.pm	2010-02-06 21:18:41 UTC (rev 84)
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13-dev';
+our $VERSION = '0.13';
 
 =head1 NAME
 

Modified: trunk/lib/Apache/Dispatch.pm
===================================================================
--- trunk/lib/Apache/Dispatch.pm	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/lib/Apache/Dispatch.pm	2010-02-06 21:18:41 UTC (rev 84)
@@ -9,13 +9,13 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13-dev';
-
 use mod_perl 1.2401;
 use Apache::Constants qw(OK DECLINED SERVER_ERROR);
 use Apache::Log			   ();
 use Apache::Dispatch::Util ();
 
+our $VERSION = $Apache::Dispatch::Util::VERSION;
+
 BEGIN {
     push @Apache::Dispatch::ISA, qw(Apache::Dispatch::Util);
 

Modified: trunk/lib/Apache2/Dispatch.pm
===================================================================
--- trunk/lib/Apache2/Dispatch.pm	2009-04-26 07:13:11 UTC (rev 83)
+++ trunk/lib/Apache2/Dispatch.pm	2010-02-06 21:18:41 UTC (rev 84)
@@ -9,8 +9,6 @@
 use strict;
 use warnings;
 
-our $VERSION = '0.13-dev';
-
 use mod_perl2 1.99023;
 use Apache2::Const -compile => qw(OK DECLINED SERVER_ERROR);
 use Apache2::Log         ();
@@ -20,6 +18,8 @@
 use Apache::Dispatch::Util;
 push @Apache2::Dispatch::ISA, qw(Apache::Dispatch::Util);
 
+our $VERSION = $Apache::Dispatch::Util::VERSION;
+
 # Initialize the directives
 my $directives = __PACKAGE__->directives();
 


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