r1225@k75: k | 2006-11-05 22:06:12 +0100

 straighten out the test issues we found due to SVK or the last doc patch


git-svn-id: https://pause.perl.org:5460/svn/cpanpm/trunk@1217 81f69c26-07c4-0310-b1c3-f486c8728884

MANIFEST.SKIP

@@ -6,10 +6,10 @@
 ^CPAN-.+/.+
 ^CPAN-.+gz$
 ^CPAN/MakeMaker
+^ChangeLog.*\.svk
 ^DIST
 ^DIST
 ^MANIFEST.bak
-^MANIFEST.*\.svk
 ^MIRRORED.BY
 ^Makefile(.old)?$
 ^TAGS

Makefile.PL

@@ -22,6 +22,14 @@ my $version_from;
   warn "Your MakeMaker is a bit dated[$ExtUtils::MakeMaker::VERSION].\nYou should get a new one\n"
         if $ExtUtils::MakeMaker::VERSION < 6.0;
 }
+our $SVN_RELEASE = 0;
+if (-d ".svn") {
+  $SVN_RELEASE = 1;
+} else {
+  warn "making SVK based release, take care!";
+  @ARGV = ();
+  sleep 2;
+}
 if ($HAVE_FILE_SPEC) {
   $version_from = File::Spec->catfile(qw(lib CPAN.pm));
   my $version_set_manually = 1; # not by SVN
@@ -200,7 +208,8 @@ MEGA_COLLECTION = Bundle::CPANxxl \
 
 sub postamble {
   return "" unless $HAVE_MAKE; # dmake has unknown issues with my Makefile
-  q{
+  my @m;
+  push @m, q{
 # the subdirs on MY OWN BOX are allowed here (only used for make dist!)
 verify-no-subdir:
 	@$(PERL) -e 'my$$s=join",",grep{!/^(CPAN|DIST|bin|blib|cover_db|distroprefs|eg|inc|lib|logs|patches|protocols|related|release-lib|scripts|t)\z/&&-d($$_)}glob"*";die"unexpected dir:$$s"if$$s'
@@ -212,21 +221,23 @@ README: lib/CPAN.pm Makefile
 	-[ -r $@ ] && chmod +w $@
 	-$(PERL) -MPod::Text -e 'Pod::Text->new->parse_from_file(\*ARGV)' lib/CPAN.pm > $@
 
-chlog :: chlog-svk-short
-chlog-oldstyle :: chlog-svn chlog-trad
+chlog-svkstyle :: chlog-svk-short
 
-chlog-svk-short :
-	-LC_ALL=$(LC_ALL_noexport) svk log -v //local/cpanpm > ChangeLogShort.svk
+chlog-svk-short : ChangeLogShort.svk
+ChangeLogShort.svk : 
+	-LC_ALL=$(LC_ALL_noexport) svk log -v //local/cpanpm > $@
 
-chlog-svk-long :
-	-LC_ALL=$(LC_ALL_noexport) svk log -v //mirror/cpanpm > ChangeLogLong.svk
+chlog-svk-long : ChangeLogLong.svk
+ChangeLogLong.svk :
+	-LC_ALL=$(LC_ALL_noexport) svk log -v //mirror/cpanpm > $@
 
 # got this from http://ch.tudelft.nl/~arthur/svn2cl/
 chlog-svn :
 	-LC_ALL=$(LC_ALL_noexport) svn log -v https://pause.perl.org:5460/svn/cpanpm/trunk > ChangeLog.svn
 
-chlog-trad :
-	-/home/src/devel/svn/svn2cl/svn2cl-current/svn2cl.sh --strip-prefix trunk --group-by-day https://pause.perl.org:5460/svn/cpanpm/trunk > ChangeLog
+chlog-trad : ChangeLogTrad.svn
+ChangeLogTrad.svn :
+	-/home/src/devel/svn/svn2cl/svn2cl-current/svn2cl.sh --strip-prefix trunk --group-by-day https://pause.perl.org:5460/svn/cpanpm/trunk > $@
 
 # for debugging
 chlog-xml :
@@ -489,10 +500,28 @@ clean ::
 		t/CPAN/authors/id/A/AN/ANDK/*/META.yml
 	$(RM_RF) t/CPAN/authors/id/A/AN/ANDK/*/_build
 
-no_CR :
+no_CR : ChangeLog META.yml
 	$(PERL) bin/no_CR.pl MANIFEST
 
-}
+};
+  if ($SVN_RELEASE) {
+    push @m, qq{
+chlog :: chlog-svn chlog-trad
+
+ChangeLog : ChangeLogTrad.svn
+	mv ChangeLogTrad.svn ChangeLog
+};
+  } else {
+    push @m, qq{
+chlog :: chlog-svkstyle
+
+ChangeLog : ChangeLogShort.svk
+	mv ChangeLogShort.svk ChangeLog
+
+};
+  }
+
+  join "", @m;
 }
 
 sub dist_ci {
@@ -513,7 +542,7 @@ disttest :
 	cd $(DISTVNAME) && $(MAKE) test $(PASTHRU)
 
 distdir ::
-	$(CP) $(DISTVNAME)/SIGNATURE ./SIGNATURE
+	touch $(DISTVNAME)/SIGNATURE && $(CP) $(DISTVNAME)/SIGNATURE ./SIGNATURE
 	$(CP) $(DISTVNAME)/META.yml  ./META.yml
 	$(CP) $(DISTVNAME)/MANIFEST  ./MANIFEST
 

Todo

@@ -3,6 +3,10 @@
 	* https://rt.cpan.org/Ticket/Attachment/250710/107655/ is a bug in YAML
 	combined with long strings. Would like to see if bleadperl also fails.
 
+	Its parent is https://rt.cpan.org/Ticket/Display.html?id=22134
+
+	I've put my findings in there. FIXED.
+
 	* ALERT! A test in YAML turned red with blead??? It turns out that my
 	YAML crashes bugs-rt when the URI module is installed and passes all
 	tests when the URI module is not installed. The second test in bugs-rt.t

lib/CPAN.pm

@@ -9395,6 +9395,8 @@ issuing the command C< o conf init > in the CPAN shell. A subset of
 the configuration dialog can be run by issuing C<o conf init WORD>
 where WORD is any valid config variable or a regular expression.
 
+=head2 Config Variables
+
 Currently the following keys in the hash reference $CPAN::Config are
 defined:
 

t/51pod.t

@@ -21,7 +21,7 @@ sub _f ($) {File::Spec->catfile(split /\//, shift);}
 open FH, _f"lib/CPAN.pm" or die "Could not open CPAN.pm: $!";
 my $seen;
 while (<FH>) {
-  next if 1../^=head1 CONFIGURATION/;
+  next if 1../^=head2 Config Variables/;
   next if /^(\w|$)/ && !$seen;
   last if /^(\w|$)/ && $seen;
   chomp;

t/52podcover.t

@@ -5,22 +5,21 @@ plan skip_all => "perl 5.00504 required for this test" if $@;
 eval "use Test::Pod::Coverage";
 plan skip_all => "Test::Pod::Coverage required for testing pod coverage" if $@;
 plan tests => 1;
-my $trustme = { trustme => [ eval q{
-  qr/
-     (new
-      |all_objects
-      |checklock
-      |cleanup
-      |delete
-      |exists
-      |find_perl
-      |is_installed
-      |is_tested
-      |new
-      |savehist
-      |set_perl5lib
-      |soft_chdir_with_alternatives
-      |suggest_myconfig
-  )/x
-}]};
+my $trustme = { trustme => [ qw{
+                                all_objects
+                                checklock
+                                cleanup
+                                delete
+                                exists
+                                find_perl
+                                is_installed
+                                is_tested
+                                new
+                                new
+                                savehist
+                                set_perl5lib
+                                soft_chdir_with_alternatives
+                                suggest_myconfig
+                              }]
+              };
 pod_coverage_ok( "CPAN", $trustme );