Change 33196 by [EMAIL PROTECTED] on 2008/02/02 17:19:38
Integrate:
[ 32573]
Don't list README.win32 as private in the META.yml
[ 32574]
The win32 files are not the Win32 (dual-lived) distribution.
Plus, regenerate the meta file.
[ 33194]
Integrate:
[ 33193]
Remove the _ prototype, as Maintainers is used by makemeta, and in turn
that has to be run with the newly built perl. Which can be 5.8.x.
Affected files ...
... //depot/maint-5.8/perl/META.yml#12 integrate
... //depot/maint-5.8/perl/Porting/Maintainers.pl#36 integrate
... //depot/maint-5.8/perl/Porting/Maintainers.pm#5 integrate
Differences ...
==== //depot/maint-5.8/perl/META.yml#12 (text) ====
Index: perl/META.yml
--- perl/META.yml#11~32312~ 2007-11-14 10:09:03.000000000 -0800
+++ perl/META.yml 2008-02-02 09:19:38.000000000 -0800
@@ -18,9 +18,15 @@
- ext/MIME/Base64
- ext/Safe
- ext/Storable
+ - ext/Sys/Syslog
+ - ext/Text/Soundex
+ - ext/threads/hints
+ - ext/threads/shared
+ - ext/threads/t
- ext/Time/HiRes
- ext/Unicode/Normalize
- ext/Win32
+ - ext/Win32API/File
- lib/Attribute/Handlers
- lib/base
- lib/bignum
@@ -28,17 +34,19 @@
- lib/Class/ISA
- lib/CPAN
- lib/Digest
- - lib/ExtUtils/t
+ - lib/ExtUtils/Constant
- lib/File/Spec
- lib/File/Temp
- lib/Filter/Simple
- lib/Getopt/Long
- lib/I18N/LangTags
- - lib/Locale/Maketext
+ - lib/Locale/Maketext/t
- lib/Math/BigFloat
- lib/Math/BigInt
- lib/Math/BigRat
- lib/Memoize
+ - lib/Module/CoreList
+ - lib/Module/Pluggable
- lib/Net/FTP
- lib/Net/Ping
- lib/Net/t
@@ -46,43 +54,65 @@
- lib/Pod/Perldoc
- lib/Switch
- lib/Term/ANSIColor
+ - lib/Test/Builder
- lib/Test/Harness
- lib/Test/Simple
- lib/Test/t
- lib/Text/Balanced
- lib/Text/TabsWrap
- lib/Tie/File
+ - lib/Tie/RefHash
- lib/Unicode/Collate
- t/lib/Filter/Simple
- t/lib/MakeMaker
- t/lib/Math
- t/lib/sample-tests
- t/lib/Test/Simple
+ - t/Module_Pluggable
file:
+ - ext/B/B/Lint.pm
+ - ext/B/t/lint.t
+ - ext/B/t/pluglib/B/Lint/Plugin/Test.pm
- ext/Compress/Zlib
+ - ext/Digest/SHA
- ext/DynaLoader/t/XSLoader.t
- ext/DynaLoader/XSLoader_pm.PL
- ext/Filter/t/call.t
- ext/Math/BigInt/FastCalc
+ - ext/Opcode/Safe.pm
+ - ext/threads/threads.pm
+ - ext/threads/threads.xs
+ - ext/Time/Piece
+ - lib/Archive/Extract
+ - lib/Archive/Extract.pm
- lib/Archive/Tar
- lib/Archive/Tar.pm
- lib/Attribute/Handlers.pm
+ - lib/AutoLoader.pm
+ - lib/AutoLoader.t
- lib/base.pm
- lib/bigint.pm
- lib/bignum.pm
- lib/bigrat.pm
- lib/CGI.pm
- lib/Class/ISA.pm
+ - lib/constant.pm
+ - lib/constant.t
- lib/CPAN.pm
- lib/Cwd.pm
+ - lib/Devel/InnerPackage.pm
- lib/Digest.pm
- lib/encoding/warnings
- lib/encoding/warnings.pm
+ - lib/Exporter.pm
+ - lib/Exporter.t
+ - lib/Exporter/Heavy.pm
- lib/ExtUtils/CBuilder
- lib/ExtUtils/CBuilder.pm
- lib/ExtUtils/Command
- lib/ExtUtils/Command.pm
+ - lib/ExtUtils/Constant.pm
- lib/ExtUtils/Install.pm
- lib/ExtUtils/Installed.pm
- lib/ExtUtils/Liblist
@@ -113,8 +143,64 @@
- lib/ExtUtils/Packlist.pm
- lib/ExtUtils/ParseXS
- lib/ExtUtils/ParseXS.pm
+ - lib/ExtUtils/t/00compile.t
+ - lib/ExtUtils/t/backwards.t
+ - lib/ExtUtils/t/basic.t
+ - lib/ExtUtils/t/build_man.t
+ - lib/ExtUtils/t/bytes.t
+ - lib/ExtUtils/t/cd.t
+ - lib/ExtUtils/t/config.t
+ - lib/ExtUtils/t/Constant.t
+ - lib/ExtUtils/t/dir_target.t
+ - lib/ExtUtils/t/Embed.t
+ - lib/ExtUtils/t/eu_command.t
+ - lib/ExtUtils/t/FIRST_MAKEFILE.t
+ - lib/ExtUtils/t/fixin.t
+ - lib/ExtUtils/t/hints.t
+ - lib/ExtUtils/t/INST.t
+ - lib/ExtUtils/t/INST_PREFIX.t
+ - lib/ExtUtils/t/Install.t
+ - lib/ExtUtils/t/INSTALL_BASE.t
+ - lib/ExtUtils/t/Installed.t
+ - lib/ExtUtils/t/Liblist.t
+ - lib/ExtUtils/t/make.t
+ - lib/ExtUtils/t/maketext_filter.t
+ - lib/ExtUtils/t/Manifest.t
+ - lib/ExtUtils/t/Mkbootstrap.t
+ - lib/ExtUtils/t/MM_Any.t
+ - lib/ExtUtils/t/MM_BeOS.t
+ - lib/ExtUtils/t/MM_Cygwin.t
+ - lib/ExtUtils/t/MM_NW5.t
+ - lib/ExtUtils/t/MM_OS2.t
+ - lib/ExtUtils/t/MM_Unix.t
+ - lib/ExtUtils/t/MM_VMS.t
+ - lib/ExtUtils/t/MM_Win32.t
+ - lib/ExtUtils/t/oneliner.t
+ - lib/ExtUtils/t/Packlist.t
+ - lib/ExtUtils/t/parse_version.t
+ - lib/ExtUtils/t/PL_FILES.t
+ - lib/ExtUtils/t/pm.t
+ - lib/ExtUtils/t/postamble.t
+ - lib/ExtUtils/t/prefixify.t
+ - lib/ExtUtils/t/prereq.t
+ - lib/ExtUtils/t/prereq_print.t
+ - lib/ExtUtils/t/problems.t
+ - lib/ExtUtils/t/prompt.t
+ - lib/ExtUtils/t/recurs.t
+ - lib/ExtUtils/t/revision.t
+ - lib/ExtUtils/t/split_command.t
+ - lib/ExtUtils/t/testlib.t
+ - lib/ExtUtils/t/VERSION_FROM.t
+ - lib/ExtUtils/t/vmsish.t
+ - lib/ExtUtils/t/WriteEmptyMakefile.t
+ - lib/ExtUtils/t/writemakefile_args.t
+ - lib/ExtUtils/t/xs.t
- lib/ExtUtils/testlib.pm
- lib/fields.pm
+ - lib/File/Fetch
+ - lib/File/Fetch.pm
+ - lib/File/Path.pm
+ - lib/File/Path.t
- lib/File/Spec.pm
- lib/File/Temp.pm
- lib/Filter/Simple.pm
@@ -124,6 +210,8 @@
- lib/if.t
- lib/IO/Zlib
- lib/IO/Zlib.pm
+ - lib/IPC/Cmd
+ - lib/IPC/Cmd.pm
- lib/Locale/Codes
- lib/Locale/Constants.pm
- lib/Locale/Constants.pod
@@ -134,14 +222,30 @@
- lib/Locale/Language.pm
- lib/Locale/Language.pod
- lib/Locale/Maketext.pm
+ - lib/Locale/Maketext.pod
+ - lib/Locale/Maketext/ChangeLog
+ - lib/Locale/Maketext/Guts.pm
+ - lib/Locale/Maketext/GutsLoader.pm
+ - lib/Locale/Maketext/README
+ - lib/Locale/Maketext/Simple
+ - lib/Locale/Maketext/Simple.pm
+ - lib/Locale/Maketext/TPJ13.pod
- lib/Locale/Script.pm
- lib/Locale/Script.pod
- lib/Math/BigFloat.pm
- lib/Math/BigInt.pm
- lib/Math/BigRat.pm
+ - lib/Math/Complex.pm
+ - lib/Math/Trig.pm
- lib/Memoize.pm
- - lib/Module/CoreList
- lib/Module/CoreList.pm
+ - lib/Module/Load.pm
+ - lib/Module/Load/Conditional
+ - lib/Module/Load/Conditional.pm
+ - lib/Module/Load/t
+ - lib/Module/Loaded
+ - lib/Module/Loaded.pm
+ - lib/Module/Pluggable.pm
- lib/Net/ChangeLog
- lib/Net/Cmd.pm
- lib/Net/Config.eg
@@ -158,6 +262,12 @@
- lib/Net/SMTP.pm
- lib/Net/Time.pm
- lib/NEXT.pm
+ - lib/Object/Accessor
+ - lib/Object/Accessor.pm
+ - lib/Package/Constants
+ - lib/Package/Constants.pm
+ - lib/Params/Check
+ - lib/Params/Check.pm
- lib/PerlIO/via/QuotedPrint.pm
- lib/PerlIO/via/t/QuotedPrint.t
- lib/Pod/Checker.pm
@@ -194,10 +304,14 @@
- lib/Pod/Text/Overstrike.pm
- lib/Pod/Text/Termcap.pm
- lib/Pod/Usage.pm
+ - lib/Shell.pm
+ - lib/Shell.t
- lib/Switch.pm
- lib/Term/ANSIColor.pm
- lib/Term/Cap.pm
- lib/Term/Cap.t
+ - lib/Term/UI
+ - lib/Term/UI.pm
- lib/Test.pm
- lib/Test/Builder.pm
- lib/Test/Harness.pm
@@ -207,9 +321,13 @@
- lib/Text/Tabs.pm
- lib/Text/Wrap.pm
- lib/Tie/File.pm
+ - lib/Tie/RefHash.pm
- lib/Time/Local.pm
- lib/Time/Local.t
- lib/Unicode/Collate.pm
+ - lib/version.pm
+ - lib/version.pod
+ - lib/version.t
- pod/pod2man.PL
- pod/pod2text.PL
- pod/pod2usage.PL
==== //depot/maint-5.8/perl/Porting/Maintainers.pl#36 (text) ====
Index: perl/Porting/Maintainers.pl
--- perl/Porting/Maintainers.pl#35~32457~ 2007-11-22 15:19:55.000000000
-0800
+++ perl/Porting/Maintainers.pl 2008-02-02 09:19:38.000000000 -0800
@@ -873,8 +873,8 @@
'win32' =>
{
'MAINTAINER' => 'jand',
- 'FILES' => q[win32 README.win32 t/win32 ext/Win32CORE],
- 'CPAN' => 1,
+ 'FILES' => q[win32 t/win32 README.win32 ext/Win32CORE],
+ 'CPAN' => 0,
},
'Win32' =>
==== //depot/maint-5.8/perl/Porting/Maintainers.pm#5 (text) ====
Index: perl/Porting/Maintainers.pm
--- perl/Porting/Maintainers.pm#4~32298~ 2007-11-12 15:21:15.000000000
-0800
+++ perl/Porting/Maintainers.pm 2008-02-02 09:19:38.000000000 -0800
@@ -7,7 +7,9 @@
use strict;
use lib "Porting";
-use 5.010;
+# Please don't use post 5.008 features as this module is used by
+# Porting/makemeta, and that in turn has to be run by the perl just built.
+use 5.008;
require "Maintainers.pl";
use vars qw(%Modules %Maintainers);
@@ -249,7 +251,6 @@
}
}
-sub warn_maintainer(_);
my %files;
sub maintainers_files {
@@ -270,19 +271,21 @@
}
}
+sub warn_maintainer {
+ my $name = shift;
+ warn "File $name has no maintainer\n" if not $files{$name};
+}
+
sub missing_maintainers {
my($check, @path) = @_;
maintainers_files();
my @dir;
- for (@path) { if( -d ) { push @dir, $_ } else { warn_maintainer() } }
+ for my $d (@path) {
+ if( -d $d ) { push @dir, $d } else { warn_maintainer($d) }
+ }
find sub { warn_maintainer($File::Find::name) if /$check/; }, @dir
if @dir;
}
-sub warn_maintainer(_) {
- my $name = shift;
- warn "File $name has no maintainer\n" if not $files{$name};
-}
-
1;
End of Patch.
