Change 34253 by [EMAIL PROTECTED] on 2008/09/03 19:22:40
Integrate:
[ 34043]
Subject: Re: Change 34005: Re: CPAN Upload:
S/SA/SAPER/Sys-Syslog-0.25.tar.gz
From: Sébastien Aperghis-Tramoni <[EMAIL PROTECTED]>
Message-Id: <[EMAIL PROTECTED]>
Date: Sun, 8 Jun 2008 02:55:21 +0200
[applied manually, plus $VERSION bump]
[ 34044]
Patch from MHX to change the WriteConstant()'s documentation to note
that to change the constant subroutine's name one needs XS_SUBNAME
not SUBNAME, and then make C_SUBNAME default to XS_SUBNAME to be
consistent with the revised documentation.
http://rt.cpan.org/Public/Bug/Display.html?id=29968
[ 34072]
Fix release date for 5.002
(noticed by Grant McLean)
[ 34093]
Subject: [perl #34339][PATCH] "perldoc lib" doesn't describe actual
behavior
From: Renée Bäcker <[EMAIL PROTECTED]>
Date: Wed, 25 Jun 2008 16:40:57 +0200
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.10/perl/lib/ExtUtils/Constant.pm#2 integrate
... //depot/maint-5.10/perl/lib/Module/CoreList.pm#5 integrate
... //depot/maint-5.10/perl/lib/lib_pm.PL#4 integrate
Differences ...
==== //depot/maint-5.10/perl/lib/ExtUtils/Constant.pm#2 (text) ====
Index: perl/lib/ExtUtils/Constant.pm
--- perl/lib/ExtUtils/Constant.pm#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/lib/ExtUtils/Constant.pm 2008-09-03 12:22:40.000000000 -0700
@@ -1,6 +1,6 @@
package ExtUtils::Constant;
use vars qw (@ISA $VERSION @EXPORT_OK %EXPORT_TAGS);
-$VERSION = 0.20;
+$VERSION = 0.21;
=head1 NAME
@@ -149,7 +149,7 @@
breakout => $breakout}, @items);
}
-=item XS_constant PACKAGE, TYPES, SUBNAME, C_SUBNAME
+=item XS_constant PACKAGE, TYPES, XS_SUBNAME, C_SUBNAME
A function to generate the XS code to implement the perl subroutine
I<PACKAGE>::constant used by I<PACKAGE>::AUTOLOAD to load constants.
@@ -163,7 +163,7 @@
the number of parameters passed to the C function C<constant>]
You can call the perl visible subroutine something other than C<constant> if
-you give the parameter I<SUBNAME>. The C subroutine it calls defaults to
+you give the parameter I<XS_SUBNAME>. The C subroutine it calls defaults to
the name of the perl visible subroutine, unless you give the parameter
I<C_SUBNAME>.
@@ -172,10 +172,10 @@
sub XS_constant {
my $package = shift;
my $what = shift;
- my $subname = shift;
+ my $XS_subname = shift;
my $C_subname = shift;
- $subname ||= 'constant';
- $C_subname ||= $subname;
+ $XS_subname ||= 'constant';
+ $C_subname ||= $XS_subname;
if (!ref $what) {
# Convert line of the form IV,UV,NV to hash
@@ -186,7 +186,7 @@
my $xs = <<"EOT";
void
-$subname(sv)
+$XS_subname(sv)
PREINIT:
#ifdef dXSTARG
dXSTARG; /* Faster if we have it. */
@@ -438,6 +438,10 @@
An array of constants' names, either scalars containing names, or hashrefs
as detailed in L<"C_constant">.
+=item PROXYSUBS
+
+If true, uses proxy subs. See L<ExtUtils::Constant::ProxySubs>.
+
=item C_FH
A filehandle to write the C code to. If not given, then I<C_FILE> is opened
@@ -461,7 +465,7 @@
The name of the file to write containing the XS code. The default is
C<const-xs.inc>.
-=item SUBNAME
+=item XS_SUBNAME
The perl visible name of the XS subroutine generated which will return the
constants. The default is C<constant>.
@@ -469,7 +473,7 @@
=item C_SUBNAME
The name of the C subroutine generated which will return the constants.
-The default is I<SUBNAME>. Child subroutines have C<_> and the name
+The default is I<XS_SUBNAME>. Child subroutines have C<_> and the name
length appended, so constants with 10 character names would be in
C<constant_10> with the default I<XS_SUBNAME>.
@@ -482,11 +486,11 @@
( # defaults
C_FILE => 'const-c.inc',
XS_FILE => 'const-xs.inc',
- SUBNAME => 'constant',
+ XS_SUBNAME => 'constant',
DEFAULT_TYPE => 'IV',
@_);
- $ARGS{C_SUBNAME} ||= $ARGS{SUBNAME}; # No-one sane will have C_SUBNAME eq '0'
+ $ARGS{C_SUBNAME} ||= $ARGS{XS_SUBNAME}; # No-one sane will have C_SUBNAME eq
'0'
croak "Module name not specified" unless length $ARGS{NAME};
==== //depot/maint-5.10/perl/lib/Module/CoreList.pm#5 (text) ====
Index: perl/lib/Module/CoreList.pm
--- perl/lib/Module/CoreList.pm#4~33640~ 2008-04-03 09:03:24.000000000
-0700
+++ perl/lib/Module/CoreList.pm 2008-09-03 12:22:40.000000000 -0700
@@ -1,7 +1,7 @@
package Module::CoreList;
use strict;
use vars qw/$VERSION %released %patchlevel %version %families/;
-$VERSION = '2.15';
+$VERSION = '2.16';
=head1 NAME
@@ -148,7 +148,7 @@
%released = (
5.000 => '1994-10-17',
5.001 => '1995-03-14',
- 5.002 => '1996-02-96',
+ 5.002 => '1996-02-29',
5.00307 => '1996-10-10',
5.004 => '1997-05-15',
5.005 => '1998-07-22',
==== //depot/maint-5.10/perl/lib/lib_pm.PL#4 (text) ====
Index: perl/lib/lib_pm.PL
--- perl/lib/lib_pm.PL#3~34011~ 2008-06-07 07:29:13.000000000 -0700
+++ perl/lib/lib_pm.PL 2008-09-03 12:22:40.000000000 -0700
@@ -223,11 +223,17 @@
checks to see if a directory called $dir/$archname/auto exists.
If so the $dir/$archname directory is assumed to be a corresponding
architecture specific directory and is added to @INC in front of $dir.
+lib.pm also checks if directories called $dir/$version and
$dir/$version/$archname
+exist and adds these directories to @INC.
The current value of C<$archname> can be found with this command:
perl -V:archname
+The corresponding command to get the current value of C<$version> is:
+
+ perl -V:version
+
To avoid memory leaks, all trailing duplicate entries in @INC are
removed.
End of Patch.
