Change 20528 by [EMAIL PROTECTED] on 2003/08/06 15:03:43
Integrate:
[ 20513]
Subject: [PATCH] dprofpp.PL again -- #20488 thinko
From: "Craig A. Berry" <[EMAIL PROTECTED]>
Date: Wed, 06 Aug 2003 00:18:36 -0500
Message-ID: <[EMAIL PROTECTED]>
(from vmsperl list)
[ 20514]
Subject: Re: [PATCH pod/perlfaq2.pod] update Friedl book listing for 2nd
edition
From: Tim Jenness <[EMAIL PROTECTED]>
Date: Tue, 5 Aug 2003 17:21:46 -1000 (HST)
Message-ID: <[EMAIL PROTECTED]>
[ 20520]
Subject: [PATCH] Re: [PATCH] Re: MakeMaker doesn't pasthru DEFINE command-line
args to subdirs on Win32
From: Steve Hay <[EMAIL PROTECTED]>
Date: Wed, 06 Aug 2003 10:56:44 +0100
Message-ID: <[EMAIL PROTECTED]>
[ 20523]
Subject: maint @ 20512
From: Robin Barker <[EMAIL PROTECTED]>
Date: Wed, 6 Aug 2003 15:31:33 +0100
Message-ID: <[EMAIL PROTECTED]>
[ 20526]
Cast away gcc 3.3 type conversion pickiness.
[ 20527]
More PASTHRU patching from Steve Hay.
Affected files ...
... //depot/maint-5.8/perl/MANIFEST#89 integrate
... //depot/maint-5.8/perl/Porting/Maintainers.pl#4 integrate
... //depot/maint-5.8/perl/ext/threads/threads.xs#19 integrate
... //depot/maint-5.8/perl/lib/ExtUtils/MM_Unix.pm#19 integrate
... //depot/maint-5.8/perl/pad.c#11 integrate
... //depot/maint-5.8/perl/pod/perlfaq2.pod#7 integrate
... //depot/maint-5.8/perl/utils/dprofpp.PL#6 integrate
Differences ...
==== //depot/maint-5.8/perl/MANIFEST#89 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#88~20504~ Tue Aug 5 09:12:30 2003
+++ perl/MANIFEST Wed Aug 6 08:03:43 2003
@@ -2790,7 +2790,7 @@
t/pod/lref.t Test L<...> sequences
t/pod/lref.xr Expected results for lref.t
t/pod/multiline_items.t Test multiline =items
-t/pod/multiline_items.xr Test multiline =items
+t/pod/multiline_items.xr Expected results for multiline_items.t
t/pod/nested_items.t Test nested =items
t/pod/nested_items.xr Expected results for nested_items.t
t/pod/nested_seqs.t Test nested interior sequences
@@ -2801,11 +2801,11 @@
t/pod/pod2usage.t Test Pod::Usage
t/pod/pod2usage.xr Expected results for pod2usage.t
t/pod/poderrs.t Test POD errors
-t/pod/poderrs.xr Expected results for emptycmd.t
+t/pod/poderrs.xr Expected results for poderrs.t
t/pod/podselect.t Test Pod::Select
t/pod/podselect.xr Expected results for podselect.t
t/pod/special_seqs.t Test "special" interior sequences
-t/pod/special_seqs.xr Expected results for emptycmd.t
+t/pod/special_seqs.xr Expected results for special_seqs.t
t/pod/testcmp.pl Module to compare output against expected results
t/pod/testp2pt.pl Module to test Pod::PlainText for a given file
t/pod/testpchk.pl Module to test Pod::Checker for a given file
==== //depot/maint-5.8/perl/Porting/Maintainers.pl#4 (text) ====
Index: perl/Porting/Maintainers.pl
--- perl/Porting/Maintainers.pl#3~20504~ Tue Aug 5 09:12:30 2003
+++ perl/Porting/Maintainers.pl Wed Aug 6 08:03:43 2003
@@ -359,6 +359,13 @@
'CPAN' => 0,
},
+ 'Pod::Checker' => {
+ 'MAINTAINER' => 'marekr',
+ 'FILES' => q[lib/Pod/Checker.pm pod/podchecker.PL
+ t/pod/testpchk.pl],
+ 'CPAN' => 1,
+ },
+
'Pod::Find' =>
{
'MAINTAINER' => 'marekr',
@@ -380,6 +387,15 @@
'CPAN' => 1,
},
+ 'Pod::Parser' => {
+ 'MAINTAINER' => 'marekr',
+ 'FILES' => q[lib/Pod/{InputObjects,Parse{r,Utils}}.pm
+ t/pod/testcmp.pl
+
t/pod/{emptycmd,for,headings,include{,d},lref,{multiline,nested}_items,{nested,special}_seqs,oneline_cmds,poderrs}.{t,xr}
+ ],
+ 'CPAN' => 1,
+ },
+
'Pod::Perldoc' =>
{
'MAINTAINER' => 'sburke',
@@ -392,6 +408,26 @@
'MAINTAINER' => 'rmbarker',
'FILES' => q[lib/Pod/Plainer.pm t/pod/plainer.t],
'CPAN' => 0,
+ },
+
+ 'Pod::PlainText' => {
+ 'MAINTAINER' => 'marekr',
+ 'FILES' => q[lib/Pod/PlainText.pm t/pod/testp2pt.pl],
+ 'CPAN' => 1,
+ },
+
+ 'Pod::Select' => {
+ 'MAINTAINER' => 'marekr',
+ 'FILES' => q[lib/Pod/Select.pm pod/podselect.PL
+ t/pod/podselect.{t,xr}],
+ 'CPAN' => 1,
+ },
+
+ 'Pod::Usage' => {
+ 'MAINTAINER' => 'marekr',
+ 'FILES' => q[lib/Pod/Usage.pm pod/pod2usage.PL
+ t/pod/pod2usage.{t,xr}],
+ 'CPAN' => 1,
},
'Safe' =>
==== //depot/maint-5.8/perl/ext/threads/threads.xs#19 (xtext) ====
Index: perl/ext/threads/threads.xs
--- perl/ext/threads/threads.xs#18~19738~ Tue Jun 10 22:13:38 2003
+++ perl/ext/threads/threads.xs Wed Aug 6 08:03:43 2003
@@ -71,7 +71,7 @@
void Perl_ithread_set (pTHX_ ithread* thread)
{
- SV* thread_sv = newSViv((IV)thread);
+ SV* thread_sv = newSViv(PTR2IV(thread));
if(!hv_store(PL_modglobal, "threads::self", 12, thread_sv,0)) {
croak("%s\n","Internal error, couldn't set TLS");
}
@@ -82,7 +82,7 @@
if(!thread_sv) {
croak("%s\n","Internal error, couldn't get TLS");
}
- return (ithread*)SvIV(*thread_sv);
+ return INT2PTR(ithread*,SvIV(*thread_sv));
}
==== //depot/maint-5.8/perl/lib/ExtUtils/MM_Unix.pm#19 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm#18~20509~ Tue Aug 5 11:42:33 2003
+++ perl/lib/ExtUtils/MM_Unix.pm Wed Aug 6 08:03:43 2003
@@ -9,6 +9,7 @@
use Config qw(%Config);
use File::Basename qw(basename dirname fileparse);
use DirHandle;
+use Text::ParseWords;
use vars qw($VERSION @ISA
$Is_Mac $Is_OS2 $Is_VMS $Is_Win32 $Is_Win95 $Is_Dos $Is_VOS
@@ -3111,11 +3112,18 @@
$sep .= "\\\n\t";
foreach $key (qw(LIB LIBPERL_A LINKTYPE PREFIX OPTIMIZE INC DEFINE)) {
- if ($key eq 'INC' && defined(my $inc = $self->{INC})) {
+ next unless defined $self->{$key};
+ if ($key eq 'INC') {
# For INC we need to prepend parent directory but
# only iff the parent directory is not absolute.
my ($o, $i) = $Is_VMS ? ('/Include=', 'i') : ('-I', '');
- $inc =~
s!(?$i)$o(.+?)!$o.($self->file_name_is_absolute($1)?$1:$self->catdir($self->updir,$1))!eg;
+ my $inc = '';
+ foreach (grep { /\S/ } parse_line(qr/\s*(?$i)$o/, 1, $self->{INC})) {
+ s/^"(.+)"\s*$/$1/o;
+ my $dir = File::Spec->file_name_is_absolute($_) ? $_ :
File::Spec->catdir(File::Spec->updir, $_);
+ $dir = qq["$dir"] if $dir =~ / /;
+ $inc .= " $o$dir";
+ }
push @pasthru, "INC=\"$inc\"";
} else {
push @pasthru, "$key=\"\$($key)\"";
==== //depot/maint-5.8/perl/pod/perlfaq2.pod#7 (text) ====
Index: perl/pod/perlfaq2.pod
--- perl/pod/perlfaq2.pod#6~20511~ Tue Aug 5 12:29:26 2003
+++ perl/pod/perlfaq2.pod Wed Aug 6 08:03:43 2003
@@ -393,6 +393,11 @@
ISBN 1-56592-716-8 [1st edition January 2002]
http://www.oreilly.com/catalog/mastperltk/
+ Extending and Embedding Perl
+ by Tim Jenness and Simon Cozens
+ ISBN 1-930110-82-0 [1st edition August 2002]
+ http://www.manning.com/jenness
+
=back
=head2 Perl in Magazines
==== //depot/maint-5.8/perl/utils/dprofpp.PL#6 (text) ====
Index: perl/utils/dprofpp.PL
--- perl/utils/dprofpp.PL#5~20493~ Tue Aug 5 01:43:49 2003
+++ perl/utils/dprofpp.PL Wed Aug 6 08:03:43 2003
@@ -14,9 +14,8 @@
# This forces PL files to create target in same directory as PL file.
# This is so that make depend always knows where to find PL derivatives.
chdir(dirname($0));
-($file = basename($0)) =~ s/\.PL$//;
-$file =~ s/\.pl$// if ($Config{'osname'} eq 'OS2'); # "case-forgiving"
-$file =~ s/\.pl$/.com/i if ($Config{'osname'} eq 'VMS'); # "case-forgiving"
+($file = basename($0)) =~ s/\.PL$//i;
+$file .= '.COM' if ($^O eq 'VMS');
my $dprof_pm = File::Spec->catfile(File::Spec->updir, 'ext', 'Devel', 'DProf',
'DProf.pm');
my $VERSION = 0;
End of Patch.
