dougm 02/04/08 18:15:44
Modified: . Makefile.PL
lib/ModPerl Code.pm WrapXS.pm
Log:
cut down on build noise by changing some prints to Apache::TestTrace::debug
Revision Changes Path
1.75 +4 -4 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Makefile.PL 7 Apr 2002 03:51:39 -0000 1.74
+++ Makefile.PL 9 Apr 2002 01:15:44 -0000 1.75
@@ -120,10 +120,10 @@
system_sanity_check();
if ($build->{MP_APXS}) {
- print "Using APXS => $build->{MP_APXS}\n";
+ debug "Using APXS => $build->{MP_APXS}\n";
}
elsif ($build->{MP_AP_PREFIX} and -e $build->apxs(-q => 'INCLUDEDIR')) {
- print "Using Apache prefix => $build->{MP_AP_PREFIX}\n";
+ debug "Using Apache prefix => $build->{MP_AP_PREFIX}\n";
}
else {
for my $path ($build->find) {
@@ -152,7 +152,7 @@
$httpd_version, $VERSION, $^V;
for (@{ clean_files() }) {
- print "unlink...$_\n" if -e $_ && unlink;
+ debug "unlink...$_" if -e $_ && unlink;
}
#ModPerl::MM will use Apache::BuildConfig in subdir/Makefile.PL's
@@ -168,7 +168,7 @@
unshift @INC, $tables_dir;
if ($build->{MP_GENERATE_XS}) {
- print "generating XS code using $tables_dir...\n";
+ debug "generating XS code using $tables_dir...";
xs_generate($httpd_version);
}
1.77 +4 -4 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.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Code.pm 6 Apr 2002 01:42:53 -0000 1.76
+++ Code.pm 9 Apr 2002 01:15:44 -0000 1.77
@@ -6,6 +6,7 @@
use Apache::Build ();
use Apache::TestConfig ();
+use Apache::TestTrace;
our $VERSION = '0.01';
our @ISA = qw(Apache::Build);
@@ -627,7 +628,7 @@
}
my $file = "$self->{path}/$name";
- warn "generating...$file\n";
+ debug "generating...$file";
unlink $file;
open my $fh, '>>', $file or die "open $file: $!";
print $fh @preamble, noedit_warning_c();
@@ -659,7 +660,6 @@
}
for my $method (reverse sort keys %sources) {
- print "$method...";
my($h_fh, $c_fh) = map {
$self->fh($sources{$method}->{$_});
} qw(h c);
@@ -670,13 +670,13 @@
if ($c_add) {
print $c_fh $c_add;
}
- print "done\n";
+ debug "$method...done";
}
$self->postamble;
my $xsinit = "$self->{path}/modperl_xsinit.c";
- warn "generating...$xsinit\n";
+ debug "generating...$xsinit";
#create bootstrap method for static xs modules
my $static_xs = [keys %{ $build->{XS} }];
1.42 +10 -4 modperl-2.0/lib/ModPerl/WrapXS.pm
Index: WrapXS.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- WrapXS.pm 26 Mar 2002 02:45:32 -0000 1.41
+++ WrapXS.pm 9 Apr 2002 01:15:44 -0000 1.42
@@ -4,6 +4,7 @@
use warnings FATAL => 'all';
use constant GvSHARED => 0; #$^V gt v5.7.0;
+use Apache::TestTrace;
use Apache::Build ();
use ModPerl::Code ();
use ModPerl::TypeMap ();
@@ -223,11 +224,13 @@
$self->{DIR} = 'WrapXS';
$self->{XS_DIR} = catdir fastcwd(), 'xs';
+ my $verbose = $Apache::TestTrace::Level eq 'debug' ? 1 : 0;
+
if (-e $self->{DIR}) {
- rmtree([$self->{DIR}], 1, 1);
+ rmtree([$self->{DIR}], $verbose, 1);
}
- mkpath [$self->{DIR}], 1, 0755;
+ mkpath [$self->{DIR}], $verbose, 0755;
}
sub class_dirname {
@@ -245,7 +248,10 @@
my $dir = ($dirname =~ m:/: and $dirname !~ m:^$self->{DIR}:) ?
catdir($self->{DIR}, $dirname) : $dirname;
- mkpath [$dir], 1, 0755 unless -d $dir;
+ unless (-d $dir) {
+ mkpath [$dir], 0, 0755;
+ debug "mkdir.....$dir";
+ }
$dir;
}
@@ -272,7 +278,7 @@
my $name = $self->class_file($class, $file);
open my $fh, '>', $name or die "open $name: $!";
- print "writing...$name\n";
+ debug "writing...$name";
return $fh;
}
