Integrate:

[ 22824]
Fix new B::Concise test output
Subject: Re: Smoke [5.9.2] 22820 FAIL(F) openbsd 3.5 (i386/1 cpu)
From: Jim Cromie <jcromie@divsol.com>
Date: Mon, 17 May 2004 09:19:00 -0600
Message-ID: <40A8D7E4.1020007@divsol.com>

(the t/TEST part)

[ 22875]
Subject: [PATCH] Fix generation of perlapi.pod
From: Steve Hay <steve.hay@uk.radan.com>
Date: Fri, 28 May 2004 11:46:41 +0100
Message-ID: <40B71891.6090806@uk.radan.com>

[ 22878]
Subject: [perl #29937] Entries missing from .packlist
From: jdhedden@1979.usna.com (via RT) <perlbug-followup@perl.org>
Date: 28 May 2004 19:23:48 -0000
Message-ID: <rt-3.0.9-29937-88315.2.18472609678159@perl.org>

[ 22894]
Document embed.fnc 'U' and 's' flags.

[ 22932]
Subject: [PATCH] t/TEST
From: Abe Timmerman <abe@ztreet.demon.nl>
Date: Sun, 13 Jun 2004 11:41:49 +0200
Message-Id: <200406131141.50361.abe@ztreet.demon.nl>
p4raw-link: @22932 on //depot/perl: 26affc6c61604c9872ec2aaa162d647ce96277c4
p4raw-link: @22894 on //depot/perl: 3c3f4ab8346141e357ca6b8576755a4db710d2ac
p4raw-link: @22878 on //depot/perl: 25207203046d8f94b03829079bb348bf2c1b204b
p4raw-link: @22875 on //depot/perl: e509e6934ce7cafd6c279046164b9b6255429d8a
p4raw-link: @22824 on //depot/perl: 7ce9b5fb929d8db597cb08c830ef116cfd1fd078

p4raw-id: //depot/maint-5.8/perl@22973
p4raw-integrated: from //depot/perl@22875 'merge in' pod/perlapi.pod
	(@22853..)
p4raw-integrated: from //depot/perl@22871 'copy in' installman
	(@20466..) autodoc.pl (@21398..) 'merge in' installperl
	(@22770..) embed.fnc (@22889..)
p4raw-integrated: from //depot/perl@22824 'edit in' t/TEST (@22423..)

diff --git a/autodoc.pl b/autodoc.pl
index f0b9919..da05962 100644 (file)
--- a/autodoc.pl
+++ b/autodoc.pl
@@ -82,10 +82,6 @@ FUNC:
            my $docs = "";
 DOC:
            while (defined($doc = <$fh>)) {
-                if ($doc =~ /^=head1 (.*)/) {
-                    $curheader = $1;
-                    next DOC;
-                }
                $line++;
                last DOC if $doc =~ /^=\w+/;
                if ($doc =~ m:^\*/$:) {
@@ -107,7 +103,7 @@ DOC:
                $docfuncs{$name} = [$flags, $docs, $ret, $file, $curheader, @args];
            }
            if (defined $doc) {
-               if ($doc =~ /^=for/) {
+               if ($doc =~ /^=(?:for|head)/) {
                    $in = $doc;
                    redo FUNC;
                }

diff --git a/embed.fnc b/embed.fnc
index 3a9d2b6..0e60a29 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -10,7 +10,8 @@
 :                      proto, no #define
 :      d               function has documentation with its source
 :      s               static function, should have an S_ prefix in
-:                      source file
+:                      source file; for macros (m), suffix the usage
+:                      example with a semicolon
 :      n               has no implicit interpreter/thread context argument
 :      p               function has a Perl_ prefix
 :      f               function takes printf style format string, varargs
@@ -22,6 +23,7 @@
 :      E               visible to extensions included in the Perl core
 :      b               binary backward compatibility; function is a macro
 :                      but has also Perl_ implementation (which is exported)
+:      U               suppress usage example in autogenerated documentation
 :
 : Individual flags may be separated by whitespace.
 :

diff --git a/installman b/installman
index 79c6035..c736a9e 100755 (executable)
--- a/installman
+++ b/installman
@@ -91,6 +91,11 @@ while (<UTILS>) {
            my $new = "$opts{man1dir}/$what2.$opts{man1ext}";
            unlink($new);
            link($old, $new);
+           my $xold = $old;
+           $xold =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
+           my $xnew = $new;
+           $xnew =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
+           $packlist->{$xnew} = { from => $xold, type => 'link' };
        }
     }
 }

diff --git a/installperl b/installperl
index a3e698b..b6d9550 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -252,6 +252,9 @@ else {
                                " some tests failed! (Installing anyway.)\n";
 } #if (!$Is_NetWare)
 
+# This will be used to store the packlist
+my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
+
 if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
     my $perldll;
 
@@ -266,6 +269,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
                safe_unlink("$installbin/$_");
                copy("$_", "$installbin/$_");
                chmod(0755, "$installbin/$_");
+               $packlist->{"$installbin/$_"} = { type => 'file' };
            };
            open (LD2, ">$installbin/ld2");
            print LD2 <<SHELL;
@@ -302,11 +306,9 @@ SHELL
     safe_unlink("$installbin/$perldll");
     copy("$perldll", "$installbin/$perldll");
     chmod(0755, "$installbin/$perldll");
+    $packlist->{"$installbin/$perldll"} = { type => 'file' };
 } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
 
-# This will be used to store the packlist
-my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
-
 # First we install the version-numbered executables.
 
 if ($Is_VMS) {

diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 819ff66..e558e36 100644 (file)
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -283,14 +283,6 @@ Creates a new AV.  The reference count is set to 1.
 =for hackers
 Found in file av.c
 
-=item Nullav
-
-Null AV pointer.
-
-
-=for hackers
-Found in file av.h
-
 =item sortsv
 
 Sort an array. Here is an example:
@@ -576,14 +568,6 @@ NOTE: the perl_ form of this function is deprecated.
 =for hackers
 Found in file perl.c
 
-=item Nullcv
-
-Null CV pointer.
-
-
-=for hackers
-Found in file cv.h
-
 
 =back
 
@@ -924,15 +908,12 @@ Found in file gv.c
 
 =over 8
 
-=item HEf_SVKEY
-
-This flag, used in the length slot of hash entries and magic structures,
-specifies the structure contains an C<SV*> pointer where a C<char*> pointer
-is to be expected. (For information only--not to be used).
+=item Nullav
 
+Null AV pointer.
 
 =for hackers
-Found in file hv.h
+Found in file av.h
 
 =item Nullch
 
@@ -941,6 +922,20 @@ Null character pointer.
 =for hackers
 Found in file handy.h
 
+=item Nullcv
+
+Null CV pointer.
+
+=for hackers
+Found in file cv.h
+
+=item Nullhv
+
+Null HV pointer.
+
+=for hackers
+Found in file hv.h
+
 =item Nullsv
 
 Null SV pointer.
@@ -968,6 +963,15 @@ NOTE: the perl_ form of this function is deprecated.
 =for hackers
 Found in file perl.c
 
+=item HEf_SVKEY
+
+This flag, used in the length slot of hash entries and magic structures,
+specifies the structure contains an C<SV*> pointer where a C<char*> pointer
+is to be expected. (For information only--not to be used).
+
+=for hackers
+Found in file hv.h
+
 =item HeHASH
 
 Returns the computed hash stored in the hash entry.
@@ -1355,14 +1359,6 @@ Creates a new HV.  The reference count is set to 1.
 =for hackers
 Found in file hv.c
 
-=item Nullhv
-
-Null HV pointer.
-
-
-=for hackers
-Found in file hv.h
-
 
 =back
 
@@ -1520,6 +1516,16 @@ has been loaded.
 =for hackers
 Found in file sv.h
 
+=item SvUNLOCK
+
+Releases a mutual exclusion lock on sv if a suitable module
+has been loaded.
+
+       void    SvUNLOCK(SV* sv)
+
+=for hackers
+Found in file sv.h
+
 
 =back
 
@@ -1568,20 +1574,6 @@ cast.
 =for hackers
 Found in file handy.h
 
-=item NEWSV
-
-Creates a new SV.  A non-zero C<len> parameter indicates the number of
-bytes of preallocated string space the SV should have.  An extra byte for a
-tailing NUL is also reserved.  (SvPOK is not set for the SV even if string
-space is allocated.)  The reference count for the new SV is set to 1.
-C<id> is an integer id between 0 and 1299 (used to identify leaks).
-
-
-       SV*     NEWSV(int id, STRLEN len)
-
-=for hackers
-Found in file handy.h
-
 =item Newz
 
 The XSUB-writer's interface to the C C<malloc> function.  The allocated
@@ -2445,6 +2437,15 @@ handled by C<xsubpp>.
 =for hackers
 Found in file XSUB.h
 
+=item XSRETURN_EMPTY
+
+Return an empty list from an XSUB immediately.
+
+               XSRETURN_EMPTY;
+
+=for hackers
+Found in file XSUB.h
+
 =item XSRETURN_IV
 
 Return an integer from an XSUB immediately.  Uses C<XST_mIV>.
@@ -2683,6 +2684,19 @@ SV is B<not> incremented.
 =for hackers
 Found in file sv.c
 
+=item NEWSV
+
+Creates a new SV.  A non-zero C<len> parameter indicates the number of
+bytes of preallocated string space the SV should have.  An extra byte for a
+tailing NUL is also reserved.  (SvPOK is not set for the SV even if string
+space is allocated.)  The reference count for the new SV is set to 1.
+C<id> is an integer id between 0 and 1299 (used to identify leaks).
+
+       SV*     NEWSV(int id, STRLEN len)
+
+=for hackers
+Found in file handy.h
+
 =item newSV
 
 Create a new null SV, or if len > 0, create a new empty SVt_PV type SV
@@ -3448,17 +3462,6 @@ Returns the type of the SV.  See C<svtype>.
 =for hackers
 Found in file sv.h
 
-=item SvUNLOCK
-
-Releases a mutual exclusion lock on sv if a suitable module
-has been loaded.
-
-
-       void    SvUNLOCK(SV* sv)
-
-=for hackers
-Found in file sv.h
-
 =item SvUOK
 
 Returns a boolean indicating whether the SV contains an unsigned integer.
@@ -5353,16 +5356,6 @@ C<xsubpp>.
 =for hackers
 Found in file XSUB.h
 
-=item XSRETURN_EMPTY
-
-Return an empty list from an XSUB immediately.
-
-
-               XSRETURN_EMPTY;
-
-=for hackers
-Found in file XSUB.h
-
 =item XS_VERSION
 
 The version identifier for an XS module.  This is usually

diff --git a/t/TEST b/t/TEST
index 7aa212a..12985b7 100755 (executable)
--- a/t/TEST
+++ b/t/TEST
@@ -448,7 +448,12 @@ EOT
        }
        else {
            $next += 1;
-           print "${te}FAILED at test $next\n";
+           if ($next > $max) {
+               print "${te}FAILED at test $next\tpossibly due to extra output\n";
+           }
+           else {
+               print "${te}FAILED at test $next\n";
+           }
            $bad = $bad + 1;
            $_ = $test;
            if (/^base/) {