svn commit: r441414 - /perl/Apache-SizeLimit/trunk/Makefile.PL
Author: pgollucci
Date: Fri Sep 8 00:32:49 2006
New Revision: 441414
URL: http://svn.apache.org/viewvc?view=rev&rev=441414
Log:
This seems to work for integration with mp2 Dynamic builds.
Note: this requires corresponding changes in mp2's top-level Makefile.PL
TODO:
Static builds
Modified:
perl/Apache-SizeLimit/trunk/Makefile.PL
Modified: perl/Apache-SizeLimit/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/Apache-SizeLimit/trunk/Makefile.PL?view=diff&rev=441414&r1=441413&r2=441414
==
--- perl/Apache-SizeLimit/trunk/Makefile.PL (original)
+++ perl/Apache-SizeLimit/trunk/Makefile.PL Fri Sep 8 00:32:49 2006
@@ -6,11 +6,18 @@
my %mp2 = ( mod_perl2 => 1.99022 );
my %mp1 = ( mod_perl => 0 );
+my $mp_gen;
+if ($ENV{MOD_PERL_2_BUILD}) {
+push @ARGV, "-apxs $ENV{MP_APXS}";
+my $mp_gen = satisfy_mp_generation(2);
+}
+else {
+$mp_gen = satisfy_mp_generation();
+}
-my $mp_gen = satisfy_mp_generation();
%prereqs = ($mp_gen == 1 ? %mp1 : %mp2);
-unless ( $ARGV[0] eq '--dist' ) {
+unless ( $ARGV[0] eq '--dist' || $ENV{MOD_PERL_2_BUILD} ) {
if ( $Config{'osname'} eq 'linux' ) {
$prereqs{'Linux::Pid'} = 0;
if ( -e '/proc/self/smaps' ) {
@@ -52,6 +59,9 @@
);
}
+if ($ENV{MOD_PERL_2_BUILD}) {
+pop @ARGV;
+}
sub check_for_apache_test {
return unless eval {
svn commit: r441417 - in /perl/modperl/branches/apache_sizelimit_integration: ./ Makefile.PL lib/Apache2/SizeLimit.pm t/conf/post_config_startup.pl
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/;
}
}
svn commit: r441421 - /perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
Author: pgollucci
Date: Fri Sep 8 00:53:41 2006
New Revision: 441421
URL: http://svn.apache.org/viewvc?view=rev&rev=441421
Log:
okay, I'm sick of bumping this. To prevent this test from failing
if a new CGI version comes out before the next mp release the min
version is set at 99.99.
When its actually fixed, then we can set the min version effectively.
Modified:
perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
Modified: perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t?view=diff&rev=441421&r1=441420&r2=441421
==
--- perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t (original)
+++ perl/modperl/trunk/ModPerl-Registry/t/fatalstobrowser.t Fri Sep 8 00:53:41
2006
@@ -12,7 +12,7 @@
plan tests => 4, need need_module(qw(alias)),
need_cgi,
- need_min_module_version CGI => 3.22,
+ need_min_module_version CGI => 99.99,
skip_reason('fatalsToBrowser known not to work');
my $file = catfile(Apache::Test::vars('serverroot'),
