Stas Bekman wrote:
It seems that svn changes have borked 'make dist'. Currently getting:

That's cauz we used to build MANIFEST on the fly.

/home/stas/perl/5.8.6-ithread/bin/perl5.8.6 -Ilib "-MModPerl::Manifest=mkmanifest" -e mkmanifest
Apache-Test/META.yml
MANIFEST
rm -rf mod_perl-1.99_18-dev
/home/stas/perl/5.8.6-ithread/bin/perl5.8.6 "-MExtUtils::Manifest=manicopy,maniread" \
-e "manicopy(maniread(),'mod_perl-1.99_18-dev', 'best');"
mkdir mod_perl-1.99_18-dev
mkdir mod_perl-1.99_18-dev/Apache-Test
tar cvf mod_perl-1.99_18-dev.tar mod_perl-1.99_18-dev
mod_perl-1.99_18-dev/
mod_perl-1.99_18-dev/MANIFEST
mod_perl-1.99_18-dev/Apache-Test/
mod_perl-1.99_18-dev/Apache-Test/META.yml
rm -rf mod_perl-1.99_18-dev
gzip -9f mod_perl-1.99_18-dev.tar



-------------------------------------------------------------------------------- Philippe M. Chiasson m/gozer\@(apache|cpan|ectoplasm)\.org/ GPG KeyID : 88C3A5A5 http://gozer.ectoplasm.org/ F9BF E0C2 480E 7680 1AE5 3631 CB32 A107 88C3A5A5
Index: lib/ModPerl/Manifest.pm
===================================================================
--- lib/ModPerl/Manifest.pm     (revision 109735)
+++ lib/ModPerl/Manifest.pm     (working copy)
@@ -34,32 +34,19 @@
     Apache-Test/META.yml
 };
 
-sub get_cvs_files {
+sub get_svn_files {
     my @files;
 
-    my $cwd = Cwd::cwd();
+    foreach my $ent (`svn ls -R`) {
+        chomp($ent);
+        push @files, $ent if -f $ent;
+    }
 
-    finddepth({ follow => 1, wanted => sub {
-        return unless $_ eq 'Entries';
-
-        my $dir = dirname $File::Find::dir;
-        $dir =~ s,^$cwd/?,,;
-
-        open my $fh, $_ or die "open $_: $!";
-        while (my $line = <$fh>) {
-            my $file = (split '/', $line)[1];
-            next if !$file or -d "../$file" or $file =~ /^\./;
-
-            push @files, $dir ? "$dir/$file" : $file;
-        }
-        close $fh;
-    }}, $cwd);
-
     return @files;
 }
 
 sub mkmanifest {
-    my @files = (@add_files, get_cvs_files());
+    my @files = (@add_files, get_svn_files());
 
     my $matches = maniskip();
     open my $fh, '>', 'MANIFEST' or die "open MANIFEST: $!";

Attachment: signature.asc
Description: OpenPGP digital signature



Reply via email to