Author: bernhard
Date: Sat Jul 30 12:24:43 2005
New Revision: 8751
Modified:
trunk/MANIFEST.SKIP
trunk/lib/Parrot/Distribution.pm
trunk/t/src/manifest.t
Log:
gen_manifest_skip.pl missed some directories when executed
right after 'make realclean'
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Sat Jul 30 12:24:43 2005
@@ -1,5 +1,5 @@
# $Id$
-# generated by gen_manifest_skip.pl Sat Jul 30 20:40:26 2005
+# generated by gen_manifest_skip.pl Sat Jul 30 21:20:21 2005
#
# Please update t/src/manifest.t when adding patterns here
\B\.svn\b
@@ -71,7 +71,6 @@
^ast/.*\.flag/
^ast/.*\.o$
^ast/.*\.o/
-# generated from svn:ignore of 'blib/lib/'
# generated from svn:ignore of 'build_tools/'
^build_tools/build_dynclasses\.pl$
^build_tools/build_dynclasses\.pl/
@@ -93,6 +92,7 @@
^classes/.*\.dump/
^classes/.*\.str$
^classes/.*\.str/
+# generated from svn:ignore of 'compilers/'
# generated from svn:ignore of 'compilers/pge/'
^compilers/pge/.*\.dylib$
^compilers/pge/.*\.dylib/
@@ -103,6 +103,7 @@
^compilers/pge/PGE\.pbc$
^compilers/pge/PGE\.pbc/
# generated from svn:ignore of 'compilers/pge/PGE/'
+# generated from svn:ignore of 'config/'
# generated from svn:ignore of 'config/auto/'
# generated from svn:ignore of 'config/auto/aio/'
# generated from svn:ignore of 'config/auto/alignptrs/'
@@ -130,6 +131,7 @@
# generated from svn:ignore of 'config/gen/'
# generated from svn:ignore of 'config/gen/config_h/'
# generated from svn:ignore of 'config/gen/config_pm/'
+# generated from svn:ignore of 'config/gen/cpu/'
# generated from svn:ignore of 'config/gen/cpu/i386/'
# generated from svn:ignore of 'config/gen/cpu/x86_64/'
# generated from svn:ignore of 'config/gen/makefiles/'
@@ -285,6 +287,7 @@
# generated from svn:ignore of 'encodings/'
^encodings/.*\.o$
^encodings/.*\.o/
+# generated from svn:ignore of 'examples/'
# generated from svn:ignore of 'examples/assembly/'
^examples/assembly/.*\.pbc$
^examples/assembly/.*\.pbc/
@@ -334,6 +337,7 @@
^imcc/CFLAGS/
# generated from svn:ignore of 'imcc/docs/'
# generated from svn:ignore of 'imcc/examples/'
+# generated from svn:ignore of 'imcc/t/'
# generated from svn:ignore of 'imcc/t/imcpasm/'
^imcc/t/imcpasm/.*\.pir$
^imcc/t/imcpasm/.*\.pir/
@@ -349,6 +353,7 @@
^imcc/t/syn/.*\.pir/
^imcc/t/syn/const_8\.pasm$
^imcc/t/syn/const_8\.pasm/
+# generated from svn:ignore of 'include/'
# generated from svn:ignore of 'include/parrot/'
^include/parrot/config\.h$
^include/parrot/config\.h/
@@ -384,6 +389,7 @@
# generated from svn:ignore of 'io/'
^io/.*\.o$
^io/.*\.o/
+# generated from svn:ignore of 'jit/'
# generated from svn:ignore of 'jit/alpha/'
# generated from svn:ignore of 'jit/arm/'
# generated from svn:ignore of 'jit/hppa/'
@@ -397,6 +403,7 @@
^languages/Makefile/
^languages/.*\.tmp$
^languages/.*\.tmp/
+# generated from svn:ignore of 'languages/BASIC/'
# generated from svn:ignore of 'languages/BASIC/compiler/'
# generated from svn:ignore of 'languages/BASIC/compiler/samples/'
# generated from svn:ignore of 'languages/BASIC/interpreter/'
@@ -405,7 +412,11 @@
^languages/bc/Makefile/
# generated from svn:ignore of 'languages/bc/docs/'
# generated from svn:ignore of 'languages/bc/grammar/'
+# generated from svn:ignore of 'languages/bc/lib/'
+# generated from svn:ignore of 'languages/bc/lib/Parrot/'
# generated from svn:ignore of 'languages/bc/lib/Parrot/Test/'
+# generated from svn:ignore of 'languages/bc/python/'
+# generated from svn:ignore of 'languages/bc/python/lib/'
# generated from svn:ignore of 'languages/bc/python/lib/antlr/'
^languages/bc/python/lib/antlr/.*\.pyc$
^languages/bc/python/lib/antlr/.*\.pyc/
@@ -486,6 +497,7 @@
^languages/jako/examples/.*\.pasm/
^languages/jako/examples/.*\.pbc$
^languages/jako/examples/.*\.pbc/
+# generated from svn:ignore of 'languages/jako/lib/'
# generated from svn:ignore of 'languages/jako/lib/Jako/'
# generated from svn:ignore of 'languages/jako/lib/Jako/Construct/'
# generated from svn:ignore of 'languages/jako/lib/Jako/Construct/Block/'
@@ -521,8 +533,11 @@
^languages/m4/m4\.pbc/
^languages/m4/runtime$
^languages/m4/runtime/
+# generated from svn:ignore of 'languages/m4/M4/'
# generated from svn:ignore of 'languages/m4/doc/'
# generated from svn:ignore of 'languages/m4/examples/'
+# generated from svn:ignore of 'languages/m4/lib/'
+# generated from svn:ignore of 'languages/m4/lib/Parrot/'
# generated from svn:ignore of 'languages/m4/lib/Parrot/Test/'
# generated from svn:ignore of 'languages/m4/src/'
^languages/m4/src/m4\.pbc$
@@ -568,6 +583,8 @@
^languages/parrot_compiler/.*\.pbc/
^languages/parrot_compiler/parrot_compiler\.pasm$
^languages/parrot_compiler/parrot_compiler\.pasm/
+# generated from svn:ignore of 'languages/parrot_compiler/lib/'
+# generated from svn:ignore of 'languages/parrot_compiler/lib/Parrot/'
# generated from svn:ignore of 'languages/parrot_compiler/lib/Parrot/Test/'
# generated from svn:ignore of 'languages/parrot_compiler/t/'
# generated from svn:ignore of 'languages/parrot_compiler/t/basic/'
@@ -628,6 +645,7 @@
^languages/perl6/t/compiler/.*\.warn/
^languages/perl6/t/compiler/.*\.test$
^languages/perl6/t/compiler/.*\.test/
+# generated from svn:ignore of 'languages/perl6/t/op/'
# generated from svn:ignore of 'languages/perl6/t/op/common/'
^languages/perl6/t/op/common/.*\.p6$
^languages/perl6/t/op/common/.*\.p6/
@@ -672,6 +690,8 @@
^languages/perl6/t/rx/.*\.test$
^languages/perl6/t/rx/.*\.test/
# generated from svn:ignore of 'languages/perl6/t/subs/'
+# generated from svn:ignore of 'languages/perl6/t/var/'
+# generated from svn:ignore of 'languages/perl6/t/var/scalar/'
# generated from svn:ignore of 'languages/perl6/t/var/scalar/string/'
^languages/perl6/t/var/scalar/string/.*\.p6$
^languages/perl6/t/var/scalar/string/.*\.p6/
@@ -706,6 +726,7 @@
# generated from svn:ignore of 'languages/regex/lib/Regex/CodeGen/'
# generated from svn:ignore of 'languages/regex/lib/Regex/Ops/'
# generated from svn:ignore of 'languages/regex/lib/Regex/Parse/'
+# generated from svn:ignore of 'languages/regex/t/'
# generated from svn:ignore of 'languages/regex/t/basic/'
# generated from svn:ignore of 'languages/ruby/'
^languages/ruby/blib$
@@ -785,6 +806,7 @@
^languages/urm/Makefile$
^languages/urm/Makefile/
# generated from svn:ignore of 'languages/urm/examples/'
+# generated from svn:ignore of 'languages/urm/lib/'
# generated from svn:ignore of 'languages/urm/lib/URM/'
# generated from svn:ignore of 'languages/urm/t/'
^languages/urm/t/.*\.pasm$
@@ -795,7 +817,9 @@
^languages/urm/t/.*\.urm/
^languages/urm/t/testpars\.pasm$
^languages/urm/t/testpars\.pasm/
+# generated from svn:ignore of 'lib/'
# generated from svn:ignore of 'lib/Class/'
+# generated from svn:ignore of 'lib/Digest/'
# generated from svn:ignore of 'lib/Digest/Perl/'
# generated from svn:ignore of 'lib/Parrot/'
^lib/Parrot/PMC\.pm$
@@ -839,6 +863,8 @@
# generated from svn:ignore of 'pf/'
^pf/.*\.o$
^pf/.*\.o/
+# generated from svn:ignore of 'runtime/'
+# generated from svn:ignore of 'runtime/parrot/'
# generated from svn:ignore of 'runtime/parrot/dynext/'
^runtime/parrot/dynext/.*\.dylib$
^runtime/parrot/dynext/.*\.dylib/
@@ -877,6 +903,7 @@
# generated from svn:ignore of 'runtime/parrot/library/Stream/'
^runtime/parrot/library/Stream/.*\.pbc$
^runtime/parrot/library/Stream/.*\.pbc/
+# generated from svn:ignore of 'runtime/parrot/library/YAML/'
# generated from svn:ignore of 'runtime/parrot/library/YAML/Parser/'
^runtime/parrot/library/YAML/Parser/.*\.pbc$
^runtime/parrot/library/YAML/Parser/.*\.pbc/
@@ -964,6 +991,7 @@
^t/src/.*_.*$
^t/src/.*_.*/
# generated from svn:ignore of 't/stress/'
+# generated from svn:ignore of 'tools/'
# generated from svn:ignore of 'tools/dev/'
# generated from svn:ignore of 'tools/docs/'
# generated from svn:ignore of 'types/'
Modified: trunk/lib/Parrot/Distribution.pm
==============================================================================
--- trunk/lib/Parrot/Distribution.pm (original)
+++ trunk/lib/Parrot/Distribution.pm Sat Jul 30 12:24:43 2005
@@ -235,10 +235,11 @@ sub gen_manifest_skip {
# Checkout is done either with svn or svk
my $svn_cmd = $Parrot::Revision::svn_entries =~ m/\.svn/ ? 'svn' : 'svk';
- # cd to the distribution root first
- my $file_list = ExtUtils::Manifest::manifind();
- my %dir_list = map { ( File::Spec->splitpath( $_ ) )[1] => 1 } keys
%{$file_list};
-
+ # Find all directories in the Parrot distribution
+ my %dir_list = map { my $dir = ( File::Spec->splitpath( $_ ) )[1];
+ $dir =~ s!\.svn/$!!;
+ $dir => 1
+ } keys %{ ExtUtils::Manifest::manifind() };
my @skip; # regular expressions for files to skip
foreach my $dir ( sort keys %dir_list ) {
next if $dir =~ m/\.svn/;
Modified: trunk/t/src/manifest.t
==============================================================================
--- trunk/t/src/manifest.t (original)
+++ trunk/t/src/manifest.t Sat Jul 30 12:24:43 2005
@@ -64,10 +64,10 @@ SKIP:
local $" = "\n\t";
ok([EMAIL PROTECTED], 'all files in MANIFEST.SKIP are also in svn:ignore')
- or diag("Missing files in MANIFEST.SKIP:[EMAIL PROTECTED]");
+ or diag("File in MANIFEST.SKIP but not ignored by SVN:[EMAIL
PROTECTED]");
ok([EMAIL PROTECTED], 'all svn:ignore files are in MANIFEST.SKIP')
- or diag("Files ignored by svn:ignore but not in MANIFEST.SKIP:[EMAIL
PROTECTED]");
+ or diag("Files ignored by SVN but not in MANIFEST.SKIP:[EMAIL
PROTECTED]");
$ExtUtils::Manifest::Quiet = 1;
