dougm 02/04/05 17:42:53
Modified: lib .cvsignore
lib/ModPerl Code.pm
t/conf modperl_extra.pl
t/response/TestDirective perlrequire.pm
Added: lib Apache2.pm
Log:
no longer generate Apache2.pm
add an Apache2.pm that scans @INC for Apache2/ directories rather than
hardcode paths as the old generated one did.
use Apache2 (); in the tests so t/TEST can run when built with
MP_INST_APACHE2=1
Revision Changes Path
1.2 +1 -1 modperl-2.0/lib/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Apr 2000 03:34:00 -0000 1.1
+++ .cvsignore 6 Apr 2002 01:42:52 -0000 1.2
@@ -1 +1 @@
-Apache2.pm
+
1.1 modperl-2.0/lib/Apache2.pm
Index: Apache2.pm
===================================================================
package Apache2;
BEGIN {
my @dirs = ();
for my $path (@INC) {
my $dir = "$path/Apache2";
next unless -d $dir;
push @dirs, $dir;
}
if (@dirs) {
unshift @INC, @dirs;
}
}
1;
1.76 +0 -29 modperl-2.0/lib/ModPerl/Code.pm
Index: Code.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Code.pm 21 Feb 2002 01:45:34 -0000 1.75
+++ Code.pm 6 Apr 2002 01:42:53 -0000 1.76
@@ -681,35 +681,6 @@
#create bootstrap method for static xs modules
my $static_xs = [keys %{ $build->{XS} }];
ExtUtils::Embed::xsinit($xsinit, 1, $static_xs);
-
- warn "generating...", $self->generate_apache2_pm, "\n";
-}
-
-sub generate_apache2_pm {
- my $self = shift;
-
- my $lib = $self->perl_config('installsitelib');
- my $arch = $self->perl_config('installsitearch');
- my $file = $self->default_file('apache2_pm');
-
- open my $fh, '>', $file or die "open $file: $!";
-
- my $package = 'package Apache2';
-
- print $fh noedit_warning_hash();
-
- print $fh <<EOF;
-$package;
-
-use lib qw($lib/Apache2
- $arch/Apache2);
-
-1;
-
-EOF
- close $fh;
-
- $file;
}
my $constant_prefixes = join '|', qw{APR?};
1.13 +2 -0 modperl-2.0/t/conf/modperl_extra.pl
Index: modperl_extra.pl
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modperl_extra.pl 8 Jan 2002 22:46:08 -0000 1.12
+++ modperl_extra.pl 6 Apr 2002 01:42:53 -0000 1.13
@@ -1,3 +1,5 @@
+use Apache2 ();
+
use ModPerl::Util (); #for CORE::GLOBAL::exit
use Apache::RequestRec ();
1.6 +1 -0 modperl-2.0/t/response/TestDirective/perlrequire.pm
Index: perlrequire.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlrequire.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perlrequire.pm 18 Jan 2002 06:57:32 -0000 1.5
+++ perlrequire.pm 6 Apr 2002 01:42:53 -0000 1.6
@@ -9,6 +9,7 @@
use strict;
use warnings FATAL => 'all';
+use Apache2 ();
use Apache::Test ();
use Apache::Const -compile => 'OK';
use File::Spec::Functions qw(catfile);
