Author: stas Date: Tue Jan 4 11:58:35 2005 New Revision: 124148 URL: http://svn.apache.org/viewcvs?view=rev&rev=124148 Log: the autogenerated modules (and some implemented in xs/ modules) are now getting the same version number as $mod_perl::VERSION (the exception are APR modules which get 0.009_000 for now).
Modified: perl/modperl/trunk/Changes perl/modperl/trunk/lib/ModPerl/WrapXS.pm perl/modperl/trunk/xs/APR/APR/APR.pm perl/modperl/trunk/xs/APR/Const/Const.pm perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm perl/modperl/trunk/xs/Apache/Const/Const.pm perl/modperl/trunk/xs/ModPerl/Const/Const.pm Modified: perl/modperl/trunk/Changes Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=124148&p1=perl/modperl/trunk/Changes&r1=124147&p2=perl/modperl/trunk/Changes&r2=124148 ============================================================================== --- perl/modperl/trunk/Changes (original) +++ perl/modperl/trunk/Changes Tue Jan 4 11:58:35 2005 @@ -12,6 +12,10 @@ =item 1.999_20-dev +the autogenerated modules (and some implemented in xs/ modules) are +now getting the same version number as $mod_perl::VERSION (the +exception are APR modules which get 0.009_000 for now). [Stas] + until we figure out how to tell PAUSE index about versions of the autogenerated modules, create a fake module which lists all the autogenerated modules and their versions and include that in the Modified: perl/modperl/trunk/lib/ModPerl/WrapXS.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/WrapXS.pm?view=diff&rev=124148&p1=perl/modperl/trunk/lib/ModPerl/WrapXS.pm&r1=124147&p2=perl/modperl/trunk/lib/ModPerl/WrapXS.pm&r2=124148 ============================================================================== --- perl/modperl/trunk/lib/ModPerl/WrapXS.pm (original) +++ perl/modperl/trunk/lib/ModPerl/WrapXS.pm Tue Jan 4 11:58:35 2005 @@ -364,6 +364,13 @@ return $fh; } +sub module_version { + local $_ = shift; + require mod_perl; + # XXX: for now APR gets its libapr-0.9 version + return /^APR/ ? "0.009000" : "$mod_perl::VERSION"; +} + sub write_makefilepl { my($self, $class) = @_; @@ -381,6 +388,8 @@ $deps = Dumper $deps; my $noedit_warning = $self->ModPerl::Code::noedit_warning_hash(); + require mod_perl; + my $version = module_version($class); print $fh <<EOF; $noedit_warning @@ -390,7 +399,7 @@ ModPerl::BuildMM::WriteMakefile( 'NAME' => '$class', - 'VERSION' => '0.01', + 'VERSION' => '$version', 'depend' => $deps, ); EOF @@ -583,6 +592,7 @@ my $fh = $self->open_class_file($module, '.pm'); my $noedit_warning = $self->ModPerl::Code::noedit_warning_hash(); my $use_apr = ($module =~ /^APR::\w+$/) ? 'use APR ();' : ''; + my $version = module_version($module); print $fh <<EOF; $noedit_warning @@ -595,7 +605,7 @@ $isa $use_apr use $loader (); -our \$VERSION = '0.01'; +our \$VERSION = '$version'; $loader\::load __PACKAGE__; $code @@ -1093,7 +1103,7 @@ require mod_perl; $len += length '$::VERSION'; for (@modules) { - my $ver = /^APR/ ? "0.900000" : "$mod_perl::VERSION"; + my $ver = module_version($_); printf $fh "package %s;\n%-${len}s = %s;\n\n", $_, '$'.$_."::VERSION", $ver; } Modified: perl/modperl/trunk/xs/APR/APR/APR.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/APR/APR.pm?view=diff&rev=124148&p1=perl/modperl/trunk/xs/APR/APR/APR.pm&r1=124147&p2=perl/modperl/trunk/xs/APR/APR/APR.pm&r2=124148 ============================================================================== --- perl/modperl/trunk/xs/APR/APR/APR.pm (original) +++ perl/modperl/trunk/xs/APR/APR/APR.pm Tue Jan 4 11:58:35 2005 @@ -15,7 +15,7 @@ package APR; use DynaLoader (); -our $VERSION = '0.01'; +our $VERSION = '0.009000'; our @ISA = qw(DynaLoader); #dlopen("APR.so", RTDL_GLOBAL); so we only need to link libapr.a once Modified: perl/modperl/trunk/xs/APR/Const/Const.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/Const/Const.pm?view=diff&rev=124148&p1=perl/modperl/trunk/xs/APR/Const/Const.pm&r1=124147&p2=perl/modperl/trunk/xs/APR/Const/Const.pm&r2=124148 ============================================================================== --- perl/modperl/trunk/xs/APR/Const/Const.pm (original) +++ perl/modperl/trunk/xs/APR/Const/Const.pm Tue Jan 4 11:58:35 2005 @@ -18,7 +18,7 @@ use APR (); use XSLoader (); -our $VERSION = '0.01'; +our $VERSION = '0.009000'; our @ISA = qw(ModPerl::Const); XSLoader::load(__PACKAGE__, $VERSION); Modified: perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm?view=diff&rev=124148&p1=perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm&r1=124147&p2=perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm&r2=124148 ============================================================================== --- perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm (original) +++ perl/modperl/trunk/xs/APR/PerlIO/PerlIO.pm Tue Jan 4 11:58:35 2005 @@ -16,7 +16,7 @@ require 5.006001; -our $VERSION = '0.01'; +our $VERSION = '0.009000'; # The PerlIO layer is available only since 5.8.0 ([EMAIL PROTECTED]) use Config; Modified: perl/modperl/trunk/xs/Apache/Const/Const.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/Const/Const.pm?view=diff&rev=124148&p1=perl/modperl/trunk/xs/Apache/Const/Const.pm&r1=124147&p2=perl/modperl/trunk/xs/Apache/Const/Const.pm&r2=124148 ============================================================================== --- perl/modperl/trunk/xs/Apache/Const/Const.pm (original) +++ perl/modperl/trunk/xs/Apache/Const/Const.pm Tue Jan 4 11:58:35 2005 @@ -17,7 +17,7 @@ use ModPerl::Const (); use XSLoader (); -our $VERSION = '0.01'; +our $VERSION = do { require mod_perl; $mod_perl::VERSION }; our @ISA = qw(ModPerl::Const); XSLoader::load(__PACKAGE__, $VERSION); Modified: perl/modperl/trunk/xs/ModPerl/Const/Const.pm Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/ModPerl/Const/Const.pm?view=diff&rev=124148&p1=perl/modperl/trunk/xs/ModPerl/Const/Const.pm&r1=124147&p2=perl/modperl/trunk/xs/ModPerl/Const/Const.pm&r2=124148 ============================================================================== --- perl/modperl/trunk/xs/ModPerl/Const/Const.pm (original) +++ perl/modperl/trunk/xs/ModPerl/Const/Const.pm Tue Jan 4 11:58:35 2005 @@ -16,7 +16,7 @@ use DynaLoader (); -our $VERSION = '0.01'; +our $VERSION = do { require mod_perl; $mod_perl::VERSION }; our @ISA = qw(DynaLoader); #dlopen("Const.so", RTDL_GLOBAL);
