Author: leo
Date: Wed Jul 13 22:38:55 2005
New Revision: 8625
Modified:
branches/leo-ctx5/docs/submissions.pod
branches/leo-ctx5/t/src/manifest.t
branches/leo-ctx5/tools/dev/gen_manifest_skip.pl
branches/leo-ctx5/tools/dev/manicheck.pl
Log:
oops -merge -r8618:8621 from trunk
Modified: branches/leo-ctx5/docs/submissions.pod
==============================================================================
--- branches/leo-ctx5/docs/submissions.pod (original)
+++ branches/leo-ctx5/docs/submissions.pod Wed Jul 13 22:38:55 2005
@@ -123,6 +123,26 @@ run:
cd parrotdev
patch -p0 < recursive.patch
+=head2 Configuration of to be ignored files
+
+Sometimes new files will be created in the configuration and build process
+of Parrot. These files should not show up when checking the distribution with
+
+ svn status
+
+or
+
+ perl tools/dev/manicheck.pl
+
+The list of these ignore files can be set up with:
+
+ svn propedit svn:ignore <PATH>
+
+In order to keep the two different checks synchronized, the MANIFEST.SKIP file
+should be regenerated with:
+
+ perl tools/dev/gen_manifest_skip.pl > MANIFEST.SKIP
+
=head1 How To Submit Something New
If you have a new feature to add to Parrot, such as a new test.
Modified: branches/leo-ctx5/t/src/manifest.t
==============================================================================
--- branches/leo-ctx5/t/src/manifest.t (original)
+++ branches/leo-ctx5/t/src/manifest.t Wed Jul 13 22:38:55 2005
@@ -66,8 +66,8 @@ SKIP:
ok([EMAIL PROTECTED], 'all files in MANIFEST.SKIP are also in svn:ignore')
or diag("Missing files in MANIFEST.SKIP:[EMAIL PROTECTED]");
- ok([EMAIL PROTECTED], 'all files in svn:ignore are in MANIFEST.SKIP')
- or diag("Missing files in svn:ignore:[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]");
$ExtUtils::Manifest::Quiet = 1;
Modified: branches/leo-ctx5/tools/dev/gen_manifest_skip.pl
==============================================================================
--- branches/leo-ctx5/tools/dev/gen_manifest_skip.pl (original)
+++ branches/leo-ctx5/tools/dev/gen_manifest_skip.pl Wed Jul 13 22:38:55 2005
@@ -28,9 +28,7 @@ my $dist = Parrot::Distribution->new();
my $skip = $dist->gen_manifest_skip();
-
-my $header = << 'END_HEADER';
-# $Id$
+my $header = '# $' . 'Id' . '$' . "\n" . << 'END_HEADER'; # confuse SVN
# generated by gen_manifest_skip.pl NOW
#
# Please update t/src/manifest.t when adding patterns here
Modified: branches/leo-ctx5/tools/dev/manicheck.pl
==============================================================================
--- branches/leo-ctx5/tools/dev/manicheck.pl (original)
+++ branches/leo-ctx5/tools/dev/manicheck.pl Wed Jul 13 22:38:55 2005
@@ -16,9 +16,12 @@ tools/dev/manicheck.pl - Check the MANIF
Check the contents of the F<MANIFEST> file against the files present in
this directory tree, accounting for .svn dirs. Prints out the
-number of I<missing>, I<expected>, I<ignored> and I<extra> files, and
+number of I<missing>, I<expected> and I<extra> files, and
then any extra files are listed.
+Files that match the patterns in MANIFEST.SKIP are not reported as extra
+files.
+
=cut
################################################################################
@@ -41,7 +44,6 @@ printf "Found %d distinct files among MA
scalar( keys %{$file_list} );
printf " %5d missing\n", scalar @missing;
-# printf " %5d ignored\n", scalar @ignored;
printf " %5d extra\n", scalar @extra;
# TODO: Use Data::Dumper
