You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2003/05/15 05:29:10 UTC
cvs commit: modperl-2.0/lib/ModPerl BuildMM.pm MM.pm
stas 2003/05/14 20:29:09
Modified: lib/Apache Build.pm
lib/ModPerl BuildMM.pm MM.pm
Log:
rearrange constants definition and modules loading to resolve problems in
circular referencing, loading.
Revision Changes Path
1.123 +10 -9 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- Build.pm 12 May 2003 06:37:13 -0000 1.122
+++ Build.pm 15 May 2003 03:29:09 -0000 1.123
@@ -6,21 +6,13 @@
use lib qw(Apache-Test/lib);
-use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl.pm" } qw(. ..);
-
use Config;
use Cwd ();
use File::Spec::Functions qw(catfile);
use File::Basename;
use ExtUtils::Embed ();
-use ModPerl::Code ();
-use ModPerl::BuildOptions ();
-use Apache::TestTrace;
-use Apache::TestConfig ();
-use constant REQUIRE_ITHREADS => grep { $^O eq $_ } qw(MSWin32);
-use constant HAS_ITHREADS =>
- $Config{useithreads} && ($Config{useithreads} eq 'define');
+use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl.pm" } qw(. ..);
use constant AIX => $^O eq 'aix';
use constant DARWIN => $^O eq 'darwin';
@@ -28,6 +20,15 @@
use constant WIN32 => $^O eq 'MSWin32';
use constant MSVC => WIN32() && ($Config{cc} eq 'cl');
+
+use constant REQUIRE_ITHREADS => grep { $^O eq $_ } qw(MSWin32);
+use constant HAS_ITHREADS =>
+ $Config{useithreads} && ($Config{useithreads} eq 'define');
+
+use ModPerl::Code ();
+use ModPerl::BuildOptions ();
+use Apache::TestTrace;
+use Apache::TestConfig ();
our $VERSION = '0.01';
our $AUTOLOAD;
1.9 +3 -3 modperl-2.0/lib/ModPerl/BuildMM.pm
Index: BuildMM.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildMM.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- BuildMM.pm 12 May 2003 04:04:17 -0000 1.8
+++ BuildMM.pm 15 May 2003 03:29:09 -0000 1.9
@@ -3,12 +3,12 @@
use strict;
use warnings;
-use ModPerl::MM;
-
use ExtUtils::MakeMaker ();
use Cwd ();
-use Apache::Build ();
use File::Spec;
+
+use Apache::Build ();
+use ModPerl::MM;
our %PM; #add files to installation
1.29 +3 -1 modperl-2.0/lib/ModPerl/MM.pm
Index: MM.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MM.pm 25 Mar 2003 02:20:56 -0000 1.28
+++ MM.pm 15 May 2003 03:29:09 -0000 1.29
@@ -2,10 +2,11 @@
use strict;
use warnings;
+
use ExtUtils::MakeMaker ();
use ExtUtils::Install ();
+
use Cwd ();
-use Apache::Build ();
use Carp;
our %PM; #add files to installation
@@ -62,6 +63,7 @@
sub build_config {
my $key = shift;
+ require Apache::Build;
my $build = Apache::Build->build_config;
return $build unless $key;
$build->{$key};