From 04721f73a0257be8c30d3812ecdf4b80e7ae6ad1 Mon Sep 17 00:00:00 2001 From: Florian Ragwitz Date: Tue, 9 Nov 2010 21:18:21 +0100 Subject: [PATCH] Move ExtUtils-Manifest from cpan/ to dist/ Randy Kobes passed away recently, so let's have p5p maintain it for now. --- MANIFEST | 6 ++-- Porting/Maintainers.pl | 6 ++-- .../ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP | 2 +- .../ExtUtils-Manifest/lib/ExtUtils/Manifest.pm | 32 +++++++++++----------- {cpan => dist}/ExtUtils-Manifest/t/Manifest.t | 25 ++++++++--------- make_ext.pl | 2 +- t/TEST | 2 +- 7 files changed, 37 insertions(+), 38 deletions(-) rename {cpan => dist}/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP (99%) rename {cpan => dist}/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm (98%) rename {cpan => dist}/ExtUtils-Manifest/t/Manifest.t (97%) diff --git a/MANIFEST b/MANIFEST index fa2698f..a28abe5 100644 --- a/MANIFEST +++ b/MANIFEST @@ -992,9 +992,6 @@ cpan/ExtUtils-MakeMaker/t/VERSION_FROM.t See if MakeMaker's VERSION_FROM works cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t See if WriteEmptyMakefile works cpan/ExtUtils-MakeMaker/t/writemakefile_args.t See if WriteMakefile works cpan/ExtUtils-MakeMaker/t/xs.t Part of MakeMaker's test suite -cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm Utilities to write MANIFEST files -cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP The default MANIFEST.SKIP -cpan/ExtUtils-Manifest/t/Manifest.t See if ExtUtils::Manifest works cpan/File-Fetch/lib/File/Fetch.pm File::Fetch cpan/File-Fetch/t/01_File-Fetch.t File::Fetch tests cpan/File-Fetch/t/null_subclass.t @@ -2713,6 +2710,9 @@ dist/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm MakeMaker test utilities dist/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm MakeMaker test utilities dist/ExtUtils-Install/t/lib/TieOut.pm Testing library to capture prints dist/ExtUtils-Install/t/Packlist.t See if Packlist works +dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm Utilities to write MANIFEST files +dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP The default MANIFEST.SKIP +dist/ExtUtils-Manifest/t/Manifest.t See if ExtUtils::Manifest works dist/ExtUtils-ParseXS/Changes ExtUtils::ParseXS change log dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm converts Perl XS code into C code dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp External subroutine preprocessor diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 1e17e61..654ed68 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -590,10 +590,10 @@ use File::Glob qw(:case); 'ExtUtils::Manifest' => { - 'MAINTAINER' => 'rkobes', + 'MAINTAINER' => 'p5p', 'DISTRIBUTION' => 'RKOBES/ExtUtils-Manifest-1.58.tar.gz', - 'FILES' => q[cpan/ExtUtils-Manifest], - 'UPSTREAM' => 'cpan', + 'FILES' => q[dist/ExtUtils-Manifest], + 'UPSTREAM' => 'blead', }, 'ExtUtils::ParseXS' => diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP b/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP similarity index 99% rename from cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP rename to dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP index 85a5c19..bea6874 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP +++ b/dist/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP @@ -50,6 +50,6 @@ # Avoid Devel::Cover and Devel::CoverX::Covered files. \bcover_db\b \bcovered\b - + # Avoid MYMETA files ^MYMETA\. diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm b/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm similarity index 98% rename from cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm rename to dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm index ed8007f..ce4314c 100644 --- a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm +++ b/dist/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm @@ -9,7 +9,7 @@ use File::Spec; use Carp; use strict; -use vars qw($VERSION @ISA @EXPORT_OK +use vars qw($VERSION @ISA @EXPORT_OK $Is_MacOS $Is_VMS $Is_VMS_mode $Is_VMS_lc $Is_VMS_nodot $Debug $Verbose $Quiet $MANIFEST $DEFAULT_MSKIP); @@ -44,7 +44,7 @@ if ($Is_VMS) { my $unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || ''; my $efs_charset = $ENV{'DECC$EFS_CHARSET'} || ''; my $efs_case = $ENV{'DECC$EFS_CASE_PRESERVE'} || ''; - $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i; + $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i; $vms_efs = $efs_charset =~ /^[ET1]/i; $vms_case = $efs_case =~ /^[ET1]/i; } @@ -155,7 +155,7 @@ sub mkmanifest { close M; } -# Geez, shouldn't this use File::Spec or File::Basename or something? +# Geez, shouldn't this use File::Spec or File::Basename or something? # Why so careful about dependencies? sub clean_up_filename { my $filename = shift; @@ -190,9 +190,9 @@ sub manifind { $found->{$name} = ""; }; - # We have to use "$File::Find::dir/$_" in preprocess, because + # We have to use "$File::Find::dir/$_" in preprocess, because # $File::Find::name is unavailable. - # Also, it's okay to use / here, because MANIFEST files use Unix-style + # Also, it's okay to use / here, because MANIFEST files use Unix-style # paths. find({wanted => $wanted}, $Is_MacOS ? ":" : "."); @@ -377,7 +377,7 @@ sub maniread { my $okfile = "$dir$base"; warn "Debug: Illegal name $file changed to $okfile\n" if $Debug; $file = $okfile; - } + } $file = lc($file) unless $Is_VMS_lc &&($file =~ /^MANIFEST(\.SKIP)?$/); } @@ -414,8 +414,8 @@ sub maniskip { $_ =~ qr{^\s*(?:(?:'([^\\']*(?:\\.[^\\']*)*)')|([^#\s]\S*))?(?:(?:\s*)|(?:\s+(.*?)\s*))$}; #my $comment = $3; my $filename = $2; - if ( defined($1) ) { - $filename = $1; + if ( defined($1) ) { + $filename = $1; $filename =~ s/\\(['\\])/$1/g; } next if (not defined($filename) or not $filename); @@ -514,13 +514,13 @@ typically returned by the maniread() function. manicopy( maniread(), $dest_dir ); -This function is useful for producing a directory tree identical to the -intended distribution tree. +This function is useful for producing a directory tree identical to the +intended distribution tree. $how can be used to specify a different methods of "copying". Valid values are C, which actually copies the files, C which creates hard links, and C which mostly links the files but copies any -symbolic link to make a tree without any symbolic link. C is the +symbolic link to make a tree without any symbolic link. C is the default. =cut @@ -535,11 +535,11 @@ sub manicopy { $target = VMS::Filespec::unixify($target) if $Is_VMS_mode; File::Path::mkpath([ $target ],! $Quiet,$Is_VMS ? undef : 0755); foreach my $file (keys %$read){ - if ($Is_MacOS) { - if ($file =~ m!:!) { - my $dir = _maccat($target, $file); + if ($Is_MacOS) { + if ($file =~ m!:!) { + my $dir = _maccat($target, $file); $dir =~ s/[^:]+$//; - File::Path::mkpath($dir,1,0755); + File::Path::mkpath($dir,1,0755); } cp_if_diff($file, _maccat($target, $file), $how); } else { @@ -689,7 +689,7 @@ sub maniadd { my @needed = grep { !exists $manifest->{$_} } keys %$additions; return 1 unless @needed; - open(MANIFEST, ">>$MANIFEST") or + open(MANIFEST, ">>$MANIFEST") or die "maniadd() could not open $MANIFEST: $!"; foreach my $file (_sort @needed) { diff --git a/cpan/ExtUtils-Manifest/t/Manifest.t b/dist/ExtUtils-Manifest/t/Manifest.t similarity index 97% rename from cpan/ExtUtils-Manifest/t/Manifest.t rename to dist/ExtUtils-Manifest/t/Manifest.t index 3aca61d..91b126b 100644 --- a/cpan/ExtUtils-Manifest/t/Manifest.t +++ b/dist/ExtUtils-Manifest/t/Manifest.t @@ -29,7 +29,7 @@ if ($Is_VMS) { $vms_efs = VMS::Feature::current("efs_charset"); } else { my $efs_charset = $ENV{'DECC$EFS_CHARSET'} || ''; - $vms_efs = $efs_charset =~ /^[ET1]/i; + $vms_efs = $efs_charset =~ /^[ET1]/i; } $Is_VMS_noefs = 0 if $vms_efs; } @@ -70,10 +70,10 @@ sub remove_dir { } # use module, import functions -BEGIN { - use_ok( 'ExtUtils::Manifest', - qw( mkmanifest manicheck filecheck fullcheck - maniread manicopy skipcheck maniadd maniskip) ); +BEGIN { + use_ok( 'ExtUtils::Manifest', + qw( mkmanifest manicheck filecheck fullcheck + maniread manicopy skipcheck maniadd maniskip) ); } my $cwd = Cwd::getcwd(); @@ -94,7 +94,7 @@ chmod( 0744, 'foo') if $Config{'chmod'}; # there shouldn't be a MANIFEST there my ($res, $warn) = catch_warning( \&mkmanifest ); # Canonize the order. -$warn = join("", map { "$_|" } +$warn = join("", map { "$_|" } sort { lc($a) cmp lc($b) } split /\r?\n/, $warn); is( $warn, "Added to MANIFEST: foo|Added to MANIFEST: MANIFEST|", "mkmanifest() displayed its additions" ); @@ -144,14 +144,14 @@ is( join( ' ', @skipped ), 'MANIFEST.SKIP', 'listed skipped files' ); # add a subdirectory and a file there that should be found ok( mkdir( 'moretest', 0777 ), 'created moretest directory' ); add_file( File::Spec->catfile('moretest', 'quux'), 'quux' ); -ok( exists( ExtUtils::Manifest::manifind()->{'moretest/quux'} ), +ok( exists( ExtUtils::Manifest::manifind()->{'moretest/quux'} ), "manifind found moretest/quux" ); # only MANIFEST and foo are in the manifest $_ = 'foo'; my $files = maniread(); is( keys %$files, 2, 'two files found' ); -is( join(' ', sort { lc($a) cmp lc($b) } keys %$files), 'foo MANIFEST', +is( join(' ', sort { lc($a) cmp lc($b) } keys %$files), 'foo MANIFEST', 'both files found' ); is( $_, 'foo', q{maniread() doesn't clobber $_} ); @@ -178,13 +178,13 @@ rmtree('copy'); # poison the manifest, and add a comment that should be reported add_file( 'MANIFEST', 'none #none' ); -is( ExtUtils::Manifest::maniread()->{none}, '#none', +is( ExtUtils::Manifest::maniread()->{none}, '#none', 'maniread found comment' ); ok( mkdir( 'copy', 0777 ), 'made copy directory' ); $files = maniread(); eval { (undef, $warn) = catch_warning( sub { - manicopy( $files, 'copy', 'cp' ) }) + manicopy( $files, 'copy', 'cp' ) }) }; # a newline comes through, so get rid of it @@ -196,7 +196,7 @@ like($warn, qr/^Skipping MANIFEST.SKIP/i, 'warned about MANIFEST.SKIP' ); # tell ExtUtils::Manifest to use a different file { - local $ExtUtils::Manifest::MANIFEST = 'albatross'; + local $ExtUtils::Manifest::MANIFEST = 'albatross'; ($res, $warn) = catch_warning( \&mkmanifest ); like( $warn, qr/Added to albatross: /, 'using a new manifest file' ); @@ -399,7 +399,7 @@ SKIP: { eval { maniadd({ 'grrrwoof' => 'yippie' }); }; - like( $@, qr/^\Qmaniadd() could not open MANIFEST:\E/, + like( $@, qr/^\Qmaniadd() could not open MANIFEST:\E/, "maniadd() dies if it can't open the MANIFEST" ); chmod( 0600, 'MANIFEST' ); @@ -414,4 +414,3 @@ END { ok( chdir( $cwd ), 'return to parent directory' ); remove_dir( 'mantest' ); } - diff --git a/make_ext.pl b/make_ext.pl index 3c25b28..34ff212 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -32,7 +32,7 @@ my @toolchain = qw(cpan/AutoLoader/lib cpan/ExtUtils-Command/lib dist/ExtUtils-Install/lib cpan/ExtUtils-MakeMaker/lib - cpan/ExtUtils-Manifest/lib + dist/ExtUtils-Manifest/lib cpan/File-Path/lib ); diff --git a/t/TEST b/t/TEST index 9ae25d3..6bcaa41 100755 --- a/t/TEST +++ b/t/TEST @@ -38,7 +38,6 @@ my %abs = ( '../cpan/ExtUtils-Command' => 1, '../cpan/ExtUtils-Constant' => 1, '../cpan/ExtUtils-MakeMaker' => 1, - '../cpan/ExtUtils-Manifest' => 1, '../cpan/File-Fetch' => 1, '../cpan/IPC-Cmd' => 1, '../cpan/IPC-SysV' => 1, @@ -58,6 +57,7 @@ my %abs = ( '../cpan/podlators' => 1, '../dist/Cwd' => 1, '../dist/ExtUtils-Install' => 1, + '../dist/ExtUtils-Manifest' => 1, '../dist/ExtUtils-ParseXS' => 1, ); -- 2.7.4