perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r907306 - in /perl/Apache-Bootstrap/trunk: Changes Makefile.PL lib/Apache/Bootstrap.pm t/00-load.t
Date Sat, 06 Feb 2010 20:51:07 GMT
Author: phred
Date: Sat Feb  6 20:51:07 2010
New Revision: 907306

URL: http://svn.apache.org/viewvc?rev=907306&view=rev
Log:
Fixup some minor formatting nits in the Makefile
Add some reassuring text to the test
Update comments

Modified:
    perl/Apache-Bootstrap/trunk/Changes
    perl/Apache-Bootstrap/trunk/Makefile.PL
    perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm
    perl/Apache-Bootstrap/trunk/t/00-load.t

Modified: perl/Apache-Bootstrap/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Bootstrap/trunk/Changes?rev=907306&r1=907305&r2=907306&view=diff
==============================================================================
--- perl/Apache-Bootstrap/trunk/Changes (original)
+++ perl/Apache-Bootstrap/trunk/Changes Sat Feb  6 20:51:07 2010
@@ -1,6 +1,7 @@
 Revision history for Apache-Bootstrap
 
 0.08-dev
+    - some minor formatting and test fixups
 
 0.07 Mon Jul 13 12:09:00 PST 2009
     - fix syntax error in params validation in new (mp2 param unchecked)

Modified: perl/Apache-Bootstrap/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/Apache-Bootstrap/trunk/Makefile.PL?rev=907306&r1=907305&r2=907306&view=diff
==============================================================================
--- perl/Apache-Bootstrap/trunk/Makefile.PL (original)
+++ perl/Apache-Bootstrap/trunk/Makefile.PL Sat Feb  6 20:51:07 2010
@@ -1,5 +1,6 @@
 use strict;
 use warnings;
+
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
@@ -18,8 +19,8 @@
     my $self = shift;
 
     eval { require Test::More } or return <<EOF;
-test::
-\t\@echo sorry, cannot run tests without Test::More
+test :
+	\@echo sorry, cannot run tests without Test::More
 EOF
 
     return $self->SUPER::test();
@@ -33,7 +34,7 @@
     $string .= <<'EOF';
 tag :
 	svn copy https://svn.apache.org/repos/asf/perl/Apache-Bootstrap/trunk https://svn.apache.org/repos/asf/perl/Apache-Bootstrap/tags/$(VERSION_SYM)
-	@echo update lib/Apache/Bootstrap.pm VERSION now
+	\@echo update lib/Apache/Bootstrap.pm VERSION now
 EOF
 
     return $string;

Modified: perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm?rev=907306&r1=907305&r2=907306&view=diff
==============================================================================
--- perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm (original)
+++ perl/Apache-Bootstrap/trunk/lib/Apache/Bootstrap.pm Sat Feb  6 20:51:07 2010
@@ -56,10 +56,8 @@
 
 Writing modules for mod_perl that work under both mod_perl and mod_perl2 is not fun.
 
-This module is here to make that endeavour less painful.  mod_perl2 is great, but
-a lot of users are still using mod_perl.  Migrating to mod_perl2 while maintaining
-mod_perl compatibility isn't easy, and this module is here to make that transition
-as painless as possible.
+This module is here to make that endeavour less painful.  mod_perl2 is great,
+but a lot of users are still using mod_perl.  Migrating to mod_perl2 while maintaining mod_perl
compatibility isn't easy, and this module is here to make that transition as painless as possible.
 
 =head1 METHODS
 
@@ -87,7 +85,7 @@
     my %self;
     if ( defined $args->{mod_perl} ) {
 
-        # delete mp2 from inc first, note that we don't delete mod_perl2.pm
+        # delete from INC first
         delete $INC{'mod_perl.pm'};
 
         # look for mp1
@@ -114,6 +112,9 @@
 
 	if ( defined $args->{mod_perl2} ) {
 
+        # delete from INC first
+        delete $INC{'mod_perl2.pm'};
+
         # look for mp2
         eval { require mod_perl2 };
 

Modified: perl/Apache-Bootstrap/trunk/t/00-load.t
URL: http://svn.apache.org/viewvc/perl/Apache-Bootstrap/trunk/t/00-load.t?rev=907306&r1=907305&r2=907306&view=diff
==============================================================================
--- perl/Apache-Bootstrap/trunk/t/00-load.t (original)
+++ perl/Apache-Bootstrap/trunk/t/00-load.t Sat Feb  6 20:51:07 2010
@@ -64,6 +64,7 @@
     # need a bootstrap object
     my $bootstrap = $dual_bootstrap || $mp2_bootstrap || $mp1_bootstrap;
 
+    diag("Look for a higher version of Apache::Test than is present");
     my $at_version = $bootstrap->check_for_apache_test(
         $Apache::Test::VERSION + 0.01);
 



Mime
View raw message