Re: [Apache-dispatch-devel] SF.net SVN: apache-dispatch: [52] trunk
Brought to you by:
geoffrey_young,
phred_moyer
Menu
▾
▴
Re: [Apache-dispatch-devel] SF.net SVN: apache-dispatch: [52] trunk
|
From: Fred M. <fr...@re...> - 2006-09-02 23:53:51
|
Should play nicely now with -httpd options. The solution I took is a bit verbose but it seems to work well. One interesting thing I noticed was that the use constant HAS_APACHE_TEST snippet was not happy on OS X so I changed it to use a variable instead like Apache::SizeLimit. Hmmm... Geoff if you have time take this one for a spin, I think this is the one :) I'll bug Philip also, maybe he can try a build for us. On Sat, 2 Sep 2006, phr...@us... wrote: > Revision: 52 > http://svn.sourceforge.net/apache-dispatch/?rev=52&view=rev > Author: phred_moyer > Date: 2006-09-02 16:44:15 -0700 (Sat, 02 Sep 2006) > > Log Message: > ----------- > More build changes based on Geoff's test results, Philip's feeback, > and testing on OS X. The Makefile.PL is a bit klunky but it seems to cover > all the bases right now. I've updated the INSTALL also. > > Modified Paths: > -------------- > trunk/INSTALL > trunk/Makefile.PL > > Modified: trunk/INSTALL > =================================================================== > --- trunk/INSTALL 2006-08-12 20:47:13 UTC (rev 51) > +++ trunk/INSTALL 2006-09-02 23:44:15 UTC (rev 52) > @@ -1,11 +1,17 @@ > -Install and guess which version of mod_perl you use, defaulting to mp2 if both > -exist. > +------------------------------------------------------------------------------ > +Install Apache::Dispatch for mod_perl 1. > > -perl Makefile.PL > +perl Makefile.PL -httpd /path/to/my/httpd > make && make test && make install > > ------------------------------------------------------------------------------ > +Install Apache2::Dispatch for mod_perl 2. > > +perl Makefile.PL -httpd /path/to/my/httpd -apxs /path/to/my/apxs > +make && make test && make install > + > +------------------------------------------------------------------------------ > + > Install Apache2::Dispatch explicitly for mod_perl2. > > perl Makefile.PL MOD_PERL=2 > > Modified: trunk/Makefile.PL > =================================================================== > --- trunk/Makefile.PL 2006-08-12 20:47:13 UTC (rev 51) > +++ trunk/Makefile.PL 2006-09-02 23:44:15 UTC (rev 52) > @@ -9,7 +9,7 @@ > use Apache::Dispatch::Util; > use ExtUtils::MakeMaker; > > -use constant HAS_APACHE_TEST => eval { > +my $HAS_APACHE_TEST = eval { > require Apache::Test; > require Apache::TestMM; > > @@ -17,20 +17,22 @@ > Apache::TestMM::filter_args(); > > my %args = @Apache::TestMM::Argv; > - > - die 'suitable httpd required' > - unless ( $args{apxs} > + return 0 > + unless ( > + ( > + Apache::TestConfig->can('custom_config_path') > + and -f Apache::TestConfig->custom_config_path() > + ) > + or $args{apxs} > or $args{httpd} > or $ENV{APACHE_TEST_HTTPD} > - or $ENV{APACHE_TEST_APXS} ); > + or $ENV{APACHE_TEST_APXS} > + ); > > Apache::TestMM::generate_script('t/TEST'); > - > - return Apache::TestMM->test; > + return 1; > }; > > -warn $@ if $@; > - > sub MY::test { > > eval { require Test::More } or return <<EOF; > @@ -40,7 +42,7 @@ > \t\@echo > EOF > > - return HAS_APACHE_TEST if HAS_APACHE_TEST; > + return $HAS_APACHE_TEST if $HAS_APACHE_TEST; > > return <<EOF > test:: > @@ -53,7 +55,7 @@ > > sub MY::clean { > > - if (HAS_APACHE_TEST) { > + if ($HAS_APACHE_TEST) { > require Apache::TestMM; > > return Apache::TestMM::clean(@_); > @@ -79,7 +81,7 @@ > WriteMakefile(%makefile_params); > } > > -elsif ( $mp_wanted != 2 ) { # mod_perl1 specific makefile > +elsif ( $mp_wanted == 1 ) { # mod_perl1 specific makefile > eval { > require Apache::ExtUtils; > require Apache::src; > @@ -123,6 +125,47 @@ > > sub get_mp_ver { > > + my $at_ver; > + my %at_args; > + if ($HAS_APACHE_TEST) { > + %at_args = @Apache::TestMM::Argv; > + } elsif ( @ARGV ) { > + %at_args = @ARGV; > + $at_args{'httpd'} = $at_args{'-httpd'}; > + $at_args{'apxs'} = $at_args{'-apxs'}; > + } > + > + if ( $at_args{'apxs'} && $at_args{'httpd'} ) { > + > + # probably mp2 > + ($at_ver) = `$at_args{'httpd'} -v` =~ m!Apache\/(\d{1})!; > + if ( $at_ver == 1 ) { > + die <<EOF; > +Sorry dynamic builds are not supported for mod_perl 1 > +EOF > + } elsif (!$at_ver) { > + die <<EOF; > +Couldn't determine an apache version from your -httpd argument > +EOF > + } > + } > + elsif ( $at_args{'httpd'} ) { > + > + # probably mp1 > + ($at_ver) = `$at_args{'httpd'} -v` =~ m!Apache\/(\d{1})!; > + if ( $at_ver == 2 ) { # static build for mp2 not supported > + die <<EOF; > +You specified -httpd, and httpd version is 2, but static > +builds in mp2 are not yet supported. Please see INSTALL > +or specify a -apxs /path/to/apxs option. > +EOF > + } > + unless ( $at_ver == 1 ) { > + die <<EOF; > +Couldn't determine an apache version from your -httpd argument > +EOF > + } > + } > my $flag = 0; > my @args = (); > > @@ -147,35 +190,61 @@ > enviroment variable MOD_PERL=$env > Makefile.PL option MOD_PERL=$flag > EOF > -} > + } > > -my $wanted = 2; ## default to wanting mp2 > -$wanted = 1 if $env == 1 || $flag == 1; > + my $wanted; > + $wanted = 2 if $env == 2 || $flag == 2 || $at_ver == 2; > + $wanted = 1 if $env == 1 || $flag == 1 || $at_ver == 1; > > -my $mp_ver; > + unless ($wanted) { > > -if ( $wanted == 2 ) { > - eval { require mod_perl2 }; > - my $req_ver = 1.999022; > - if ( $mod_perl2::VERSION < $req_ver || $@ ) { > - die > -"mod_perl2 required version is $req_ver, you have $mod_perl2::VERSION. Please upgrade to continue."; > + # if still unknown try to require mod_perl.pm > + eval { require mod_perl2 }; > + if ($@) { > + > + # if we don't have mp1, check for mp2 > + eval { require mod_perl } if ($@); > + unless ($@) { > + $wanted = 1; > + } > + } > + else { > + $wanted = 2; > + } > } > - else { > - $mp_ver = $mod_perl2::VERSION; > + > + if ( !$wanted ) { > + die "can't determine your mod_perl version, see INSTALL\n"; > } > -} > -else { > - eval { require mod_perl }; > - no warnings qw(uninitialized); > - if ( $mod_perl::VERSION > 1.99 || $@ ) { > - die "You don't seem to have mod_perl 1.0 installed"; > + elsif ( !( $wanted == 1 || $wanted == 2 ) ) { > + die "don't know anything about mod_perl generation: $wanted\n" > + . "currently supporting only generations 1 and 2"; > } > - else { > - $mp_ver = $mod_perl::VERSION; > + > + my $mp_ver; > + > + if ( $wanted == 2 ) { > + eval { require mod_perl2 }; > + my $req_ver = 1.999022; > + if ( $mod_perl2::VERSION < $req_ver || $@ ) { > + die > +"mod_perl2 required version is $req_ver, you have $mod_perl2::VERSION. Please upgrade to continue."; > + } > + else { > + $mp_ver = $mod_perl2::VERSION; > + } > } > -} > + elsif ( $wanted == 1 ) { > + eval { require mod_perl }; > + no warnings qw(uninitialized); > + if ( $mod_perl::VERSION > 1.99 || $@ ) { > + die "You don't seem to have mod_perl 1.0 installed, see INSTALL\n"; > + } > + else { > + $mp_ver = $mod_perl::VERSION; > + } > + } > > -return ( $wanted, $mp_ver ); > + return ( $wanted, $mp_ver ); > } > > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------- > Using Tomcat but need to do more? Need to support web services, security? > Get stuff done quickly with pre-integrated technology to make your job easier > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > _______________________________________________ > Apache-dispatch-devel mailing list > Apa...@li... > https://lists.sourceforge.net/lists/listinfo/apache-dispatch-devel > |
