Author: pgollucci
Date: Fri Sep 8 00:36:26 2006
New Revision: 441417
URL: http://svn.apache.org/viewvc?view=rev&rev=441417
Log:
First cut at integrating Apache-SizeLimit into mp2 dynamic builds.
Note: this requires corresponding changes in Apache-SizeLimit s
top-level Makefile.PL
TODO:
Do we want to run the Apache-SizeLimit test-suite during mp2's make test ?
static builds
Removed:
perl/modperl/branches/apache_sizelimit_integration/lib/Apache2/SizeLimit.pm
Modified:
perl/modperl/branches/apache_sizelimit_integration/ (props changed)
perl/modperl/branches/apache_sizelimit_integration/Makefile.PL
perl/modperl/branches/apache_sizelimit_integration/t/conf/post_config_startup.pl
Propchange: perl/modperl/branches/apache_sizelimit_integration/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Sep 8 00:36:26 2006
@@ -1,2 +1,3 @@
Apache-Test https://svn.apache.org/repos/asf/perl/Apache-Test/trunk
docs
https://svn.apache.org/repos/asf/perl/modperl/docs/trunk/src/docs/2.0
+Apache-SizeLimit https://svn.apache.org/repos/asf/perl/Apache-SizeLimit/trunk
Modified: perl/modperl/branches/apache_sizelimit_integration/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/apache_sizelimit_integration/Makefile.PL?view=diff&rev=441417&r1=441416&r2=441417
==============================================================================
--- perl/modperl/branches/apache_sizelimit_integration/Makefile.PL (original)
+++ perl/modperl/branches/apache_sizelimit_integration/Makefile.PL Fri Sep 8
00:36:26 2006
@@ -119,10 +119,12 @@
# mod_perl test suite relies on having Apache-Test bundled with
# the mod_perl source, since any pre-installed version may not do
# the right thing
- unless (-d "Apache-Test") {
- error "Can't find a sub-directory Apache-Test. " .
- "Make sure that you are using a complete source distribution";
- exit 1;
+ foreach my $dir (qw(Apache-Test Apache-SizeLimit)) {
+ unless (-d $dir) {
+ error "Can't find a sub-directory $dir. " .
+ "Make sure that you are using a complete source distribution";
+ exit 1;
+ }
}
set_modperl_version();
@@ -225,6 +227,7 @@
if ($build->{MP_APXS}) {
debug "Using APXS => $build->{MP_APXS}";
+ $ENV{MP_APXS} = $build->{MP_APXS}; # for Apache-SizeLimit
}
elsif ($build->{MP_AP_PREFIX}) {
if (my $reason = $build->ap_prefix_invalid) {
Modified:
perl/modperl/branches/apache_sizelimit_integration/t/conf/post_config_startup.pl
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/apache_sizelimit_integration/t/conf/post_config_startup.pl?view=diff&rev=441417&r1=441416&r2=441417
==============================================================================
---
perl/modperl/branches/apache_sizelimit_integration/t/conf/post_config_startup.pl
(original)
+++
perl/modperl/branches/apache_sizelimit_integration/t/conf/post_config_startup.pl
Fri Sep 8 00:36:26 2006
@@ -70,7 +70,7 @@
if ($@) {
# unsupported platform
die $@ unless $@ =~ /Apache2::SizeLimit not implemented on/
- or $@ =~ /you must install BSD::Resource/;
+ or $@ =~ /You must install BSD::Resource/;
}
}
