general neatness for 5.36 work

Author: shawnlaffan

devel.utils/_build-5.36.bat

@@ -6,8 +6,8 @@
 set SP=z:\sp532
 set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;%PATH%
 
-set SKIP_MSI_STEP=
-set SKIP_PDL_STEP=
+set SKIP_MSI_STEP=1
+set SKIP_PDL_STEP=1
 perl -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.36.0.1.pp -test_core -beta=0 -nointeractive -norestorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
 
 

lib/Perl/Dist/Strawberry/Step.pm

@@ -288,7 +288,11 @@ sub backup_file {
 
 sub _patch_file {
   my ($self, $new, $dst, $dir, $tt_vars, $no_backup) = @_;
+$self->boss->message(5, "PATCHING '$new' '$dst' '$dir' $tt_vars $no_backup\n");
 
+if ($dst =~ /\*$/) {
+    warn "WE IS PATCHIN '$new'";
+}
   if (!-f $new) {
     warn "ERROR: non-existing file '$new'";
   }
@@ -462,7 +466,7 @@ sub _install_module {
   # Execute the module install script
   my $rv = $self->execute_special(['perl', $script_pl, %params], $log, $log, $env);
   unless(defined $rv && $rv == 0) {
-    rename $log, catfile($self->global->{debug_dir}, "mod_install_FAIL_".$now."_".$shortname.".log.txt");
+    rename $log, catfile($self->global->{debug_dir}, "mod_install_${shortname}_FAIL_${now}.log.txt");
     return [], $rv;
   }
   my $data = retrieve($nstore_file) or die "ERROR: retrieve failed";
@@ -515,4 +519,5 @@ sub _apply_patch {
   }
 }
 
-1;
+1;
+