cvs commit: modperl-2.0/lib/APR XSLoader.pm

[dougm]

dougm       01/09/12 19:37:37

  Modified:    lib/ModPerl WrapXS.pm
               src/modules/perl mod_perl.c
  Added:       lib/Apache XSLoader.pm
               lib/APR  XSLoader.pm
  Log:
  move ModPerl::XSLoader to Apache::XSLoader
  add APR::XSLoader
  bootstrap APR::* with APR::XSLoader
  bootstrap Apache::* with Apache::XSLoader
  
  Revision  Changes    Path
  1.21      +6 -2      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- WrapXS.pm 2001/09/10 04:43:02     1.20
  +++ WrapXS.pm 2001/09/13 02:37:37     1.21
  @@ -482,15 +482,19 @@
           close $fh;
       }
   
  +    my $base   = (split '::', $module)[0];
  +    my $loader = join '::', $base, 'XSLoader';
  +
       my $fh = $self->open_class_file($module, '.pm');
  +
       print $fh <<EOF;
   $self->{noedit_warning_hash}
   
   package $module;
   $isa
  -use ModPerl::XSLoader ();
  +use $loader ();
   our \$VERSION = '0.01';
  -ModPerl::XSLoader::load __PACKAGE__;
  +$loader\::load __PACKAGE__;
   
   $code
   
  
  
  
  1.66      +1 -1      modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- mod_perl.c        2001/09/13 02:10:35     1.65
  +++ mod_perl.c        2001/09/13 02:37:37     1.66
  @@ -25,7 +25,7 @@
   #endif
   
   static const char *MP_xs_loaders[] = {
  -    "ModPerl", "APR", NULL,
  +    "Apache", "APR", NULL,
   };
   
   #define MP_xs_loader_name "%s::XSLoader::BOOTSTRAP"
  
  
  
  1.1                  modperl-2.0/lib/Apache/XSLoader.pm
  
  Index: XSLoader.pm
  ===================================================================
  package Apache::XSLoader;
  
  use strict;
  use warnings FATAL => 'all';
  
  use XSLoader ();
  
  BEGIN {
      unless (defined &BOOTSTRAP) {
          *BOOTSTRAP = sub () { 0 };
      }
  }
  
  sub load {
      return unless BOOTSTRAP;
      XSLoader::load(@_);
  }
  
  1;
  
  
  
  1.1                  modperl-2.0/lib/APR/XSLoader.pm
  
  Index: XSLoader.pm
  ===================================================================
  package APR::XSLoader;
  
  use strict;
  use warnings FATAL => 'all';
  
  use XSLoader ();
  
  BEGIN {
      unless (defined &BOOTSTRAP) {
          *BOOTSTRAP = sub () { 0 };
      }
  }
  
  sub load {
      return unless BOOTSTRAP;
      XSLoader::load(@_);
  }
  
  1;
  __END__