dougm 2003/01/10 19:20:54
Modified: . Makefile.PL
lib/ModPerl Code.pm
Log:
reuse Makefile.PL $mod_perl::VERSION fixup
Revision Changes Path
1.89 +2 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Makefile.PL 15 Dec 2002 04:03:43 -0000 1.88
+++ Makefile.PL 11 Jan 2003 03:20:54 -0000 1.89
@@ -293,6 +293,8 @@
last if /^=item/;
}
close $fh;
+
+ $build->{VERSION} = $VERSION;
}
sub perl_version_check {
1.89 +4 -3 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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Code.pm 4 Sep 2002 17:10:14 -0000 1.88
+++ Code.pm 11 Jan 2003 03:20:54 -0000 1.89
@@ -433,9 +433,8 @@
sub generate_trace {
my($self, $h_fh) = @_;
- my $dev = '-dev'; #XXX parse Changes
- my $v = $mod_perl::VERSION;
- $v =~ s/(\d\d)(\d\d)$/$1 . '_' . $2 . $dev/e;
+ my $v = $self->{build}->{VERSION};
+
print $h_fh qq(#define MP_VERSION_STRING "mod_perl/$v"\n);
my $i = 1;
@@ -667,6 +666,8 @@
sub generate {
my($self, $build) = @_;
+
+ $self->{build} = $build;
for my $s (values %sources) {
for (qw(h c)) {
