Create regeneration files in final directory

Prior to this commit, the files for what happened when were placed in
the parts/todo directory, then moved to parts/base.  Now they go
directly into their final resting place

(cherry picked from commit 18edcc361cd5a2a208ae85a627c3c861c5ce3d74)
Signed-off-by: Nicolas R <atoomic@cpan.org>

diff --git a/dist/Devel-PPPort/devel/mktodo b/dist/Devel-PPPort/devel/mktodo
index 40e3467..d3eba62 100755 (executable)
--- a/dist/Devel-PPPort/devel/mktodo
+++ b/dist/Devel-PPPort/devel/mktodo
@@ -57,8 +57,6 @@ GetOptions(\%opt, qw( base check! verbose install=s blead=s blead-version=s
 
 identify();
 
-my $outdir = 'parts/todo';
-
 my $perls_ref = get_and_sort_perls(\%opt);
 
 # Go through all the perls, creating a todo file for it.
@@ -66,7 +64,7 @@ for (my $i = 0; $i < @$perls_ref; $i++) {
   my $this_perl = @{$perls_ref}[$i];
   my @args = ('--perl',     $this_perl->{path},
               '--version',  $this_perl->{version},
-              '--todo-dir', $outdir
+              '--todo-dir', (($opt{base}) ? 'parts/base' : 'parts/todo')
              );
 
   push @args, '--blead' if $i == 0; # First one is blead

diff --git a/dist/Devel-PPPort/devel/mktodo.pl b/dist/Devel-PPPort/devel/mktodo.pl
index 05b9002..53a2cad 100644 (file)
--- a/dist/Devel-PPPort/devel/mktodo.pl
+++ b/dist/Devel-PPPort/devel/mktodo.pl
@@ -51,7 +51,8 @@ if ($opt{todo}) {
     $todo_version = format_version_line($opt{todo});
 }
 
-$ENV{'DPPP_ARGUMENTS'} = "--todo=$todo_version";
+# Pass this through the Make, to apicheck.pl
+$ENV{'DPPP_ARGUMENTS'} = "--todo-dir=$opt{'todo-dir'} --todo=$todo_version";
 
 print "\n", ident_str(), "\n\n";
 

diff --git a/dist/Devel-PPPort/devel/regenerate b/dist/Devel-PPPort/devel/regenerate
index 5348277..1005519 100755 (executable)
--- a/dist/Devel-PPPort/devel/regenerate
+++ b/dist/Devel-PPPort/devel/regenerate
@@ -99,15 +99,6 @@ unless (runperl('devel/mktodo', '--base', @args)) {
   quit_now();
 }
 
-# Move them to parts/base
-print "\nMoving baseline files...\n\n";
-
-for my $src (glob 'parts/todo/5*') {
-  my $dst = $src;
-  $dst =~ s/todo/base/ or die "Ooops!";
-  move($src, $dst) or die "Moving $src to $dst failed: $!\n";
-}
-
 # Then find out what ppport.h buys us by repeating the process above, but
 # using ppport.h
 print "\nBuilding todo files...\n\n";

diff --git a/dist/Devel-PPPort/parts/apicheck.pl b/dist/Devel-PPPort/parts/apicheck.pl
index 080612c..79ee89c 100644 (file)
--- a/dist/Devel-PPPort/parts/apicheck.pl
+++ b/dist/Devel-PPPort/parts/apicheck.pl
@@ -42,7 +42,7 @@ my @f = parse_embed(qw( parts/embed.fnc parts/apidoc.fnc parts/ppport.fnc ));
 #                               'version' => '5.025007'
 #                           },
 # We don't care here about other subkeys
-my %todo = %{&parse_todo};
+my %todo = %{&parse_todo($script_args{'--todo-dir'})};
 
 # We convert these types into these other types
 my %tmap = (
@@ -361,7 +361,7 @@ for $f (@f) {   # Loop through all the tests to add
 /******************************************************************************
 *
 
-*  $f->{'name'}     $script_args{'--todo'}
+*  $f->{'name'}  $script_args{'--todo-dir'}  $script_args{'--todo'}
 *
 ******************************************************************************/