Strawberry perl 5.40.2.1, 5.38.4.1, 5.34.3.1

devel.utils/_build-5.38.4.1_local_mscvrt.bat

@@ -0,0 +1,26 @@
+::@cls
+::call ..\build.bat test
+
+::set PERL_USE_UNSAFE_INC=1
+
+subst Z: C:\shawn\sp_repos
+
+set SP=c:\perls\5.38.2.2_PDL
+set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
+set PERLEXE=%SP%\perl\bin\perl
+
+:: update blib - requires Build.PL to have been run
+call ..\build.bat test
+
+::set MAKEFLAGS=-j12
+set TEST_JOBS=8
+
+:: tests take a long time
+set TEST_CORE=-test_core
+#set TEST_CORE=-notest_core
+
+::set SKIP_MSI_STEP=1
+::set SKIP_PDL_STEP=1
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.38.4.1.pp %TEST_CORE% -beta=2 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+
+

devel.utils/_build-5.40.2_local_ucrt.bat

@@ -0,0 +1,26 @@
+::@cls
+::call ..\build.bat test
+
+::set PERL_USE_UNSAFE_INC=1
+
+subst Z: C:\shawn\sp_repos
+
+set SP=c:\perls\5.38.2.2_PDL
+set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
+set PERLEXE=%SP%\perl\bin\perl
+
+:: update blib - requires Build.PL to have been run
+call ..\build.bat test
+
+::set MAKEFLAGS=-j12
+set TEST_JOBS=8
+
+:: tests take a long time
+set TEST_CORE=-test_core
+#set TEST_CORE=-notest_core
+
+::set SKIP_MSI_STEP=1
+::set SKIP_PDL_STEP=1
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.40.2.1.pp %TEST_CORE% -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+
+

devel.utils/build-5.34.3.1_local.bat

@@ -0,0 +1,26 @@
+::@cls
+::call ..\build.bat test
+
+::set PERL_USE_UNSAFE_INC=1
+
+subst Z: C:\shawn\sp_repos
+
+set SP=c:\perls\5.38.2.2_PDL
+set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
+set PERLEXE=%SP%\perl\bin\perl
+
+:: update blib - requires Build.PL to have been run
+call ..\build.bat test
+
+:: set MAKEFLAGS=-j20
+:: set TEST_JOBS=8
+
+:: tests take a long time
+set TEST_CORE=-test_core
+set TEST_CORE=-notest_core
+
+::set SKIP_MSI_STEP=1
+::set SKIP_PDL_STEP=1
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.34.3.1.pp %TEST_CORE% -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+
+

devel.utils/build-5.38.3.1_local_ucrt.bat

@@ -0,0 +1,26 @@
+::@cls
+::call ..\build.bat test
+
+::set PERL_USE_UNSAFE_INC=1
+
+subst Z: C:\shawn\sp_repos
+
+set SP=c:\perls\5.38.2.2_PDL
+set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
+set PERLEXE=%SP%\perl\bin\perl
+
+:: update blib - requires Build.PL to have been run
+call ..\build.bat test
+
+set MAKEFLAGS=-j20
+set TEST_JOBS=8
+
+:: tests take a long time
+set TEST_CORE=-test_core
+::set TEST_CORE=-notest_core
+
+::set SKIP_MSI_STEP=1
+::set SKIP_PDL_STEP=1
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.38.3.1.pp %TEST_CORE% -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+
+

lib/Perl/Dist/Strawberry/Step/CreateReleaseNotes.pm

@@ -15,8 +15,13 @@ sub run {
   my $self = shift;
 
   $self->boss->message(2, "Creating Release Notes");
+
+  my $suffix = $self->{config}->{suffix} // '';
+  if ($suffix) {
+      $self->boss->message(2, "Appending suffix ${suffix}");
+  }
 
-  my $html_file = catfile($self->global->{output_dir}, $self->global->{output_basename} .".html");
+  my $html_file = catfile($self->global->{output_dir}, $self->global->{output_basename} . $suffix . ".html");
   my $tt_file = catfile($self->global->{dist_sharedir}, qw/extra-files release_notes.html.tt/);
 
   # get release date

lib/Perl/Dist/Strawberry/Step/InstallPerlCore.pm

@@ -112,6 +112,11 @@ sub run {
   my $u64 = defined $self->global->{perl_64bitint} ? $self->global->{perl_64bitint} : ($self->{config}->{perl_64bitint} // $self->{config}->{use_64_bit_int} // 0);
   # XXX use_64_bit_int is for backwards compatibility
 
+  #  Optionally override the default optimization settings.
+  #  This hack is needed as some perls need -Os to build but then modules need -O2.  
+  my $optimize_core = $self->global->{optimize_core} // $self->{config}->{optimize_core};
+  my $optimize_cpan = $self->global->{optimize_cpan} // $self->{config}->{optimize_cpan};
+
   # Build win32 perl
   SCOPE: {
     my $wd = $self->_push_dir( $unpack_to, $perlsrc, 'win32' );
@@ -160,6 +165,10 @@ sub run {
       $new_env->{PROCESSOR_ARCHITECTURE} = 'x86';
       push @make_args, 'WIN64=undef';
     }
+    if ($optimize_core) {
+        push @make_args, "OPTIMIZE=${optimize_core}";
+        $self->boss->message(3, "Building core using OPTIMIZE=${optimize_core}");
+    }
 
     my $maketool = $self->global->{maketool} || 'dmake';
     #create debuging build scripts in 'win32' subdir
@@ -256,6 +265,28 @@ sub run {
 
   die "FATAL: perl.exe not properly installed" unless -f catfile($image_dir, qw/perl bin perl.exe/);
 
+  if ($optimize_cpan) {
+      my $config_heavy = catfile($image_dir, qw/perl lib Config_heavy.pl/);
+      if (-e $config_heavy) {  #  it should always be there
+          $self->boss->message(3, "Updating optimize settings in Config_heavy.pl");
+          #use File::Copy qw /copy/;
+          #my $bk = "${config_heavy}.orig";
+          #copy $config_heavy, $bk;  #  directory rw probs - disable for now
+          local $/ = undef;
+          open my $fh, $config_heavy or die "Unable to open $config_heavy for reading, $?";
+          my $data = <$fh>;
+          $fh->close;
+          #  now update the file
+          $data =~ s/^optimize=(.+)$/my_optimize_core_build=$1\noptimize='$optimize_cpan'/m;
+          my $ro_flag = $self->_unset_ro($config_heavy);
+          open my $ofh, '>', $config_heavy or die "Unable to open $config_heavy for writing, $?";
+          print {$ofh} $data;
+          $ofh->close;
+          $self->_restore_ro($config_heavy, $ro_flag);
+          #$self->_restore_ro($bk, $ro_flag);
+      }
+  };
+
   # Create some missing directories
   my @d = ( catdir($image_dir, qw/perl vendor lib/),
             catdir($image_dir, qw/perl site bin/),

share/64bit-5.32.1.1.pp

@@ -86,7 +86,7 @@
             '<dist_sharedir>/perl-5.32/win32_config.gc.tt'      => 'win32/config.gc',
             '<dist_sharedir>/perl-5.32/perlexe.rc.tt'           => 'win32/perlexe.rc',
             '<dist_sharedir>/perl-5.32/win32_config_H.gc'       => 'win32/config_H.gc', # enables gdbm/ndbm/odbm
-            '<dist_sharedir>/perl-5.32/win32_FindExt.pm'        => 'win32/FindExt.pm',
+            '<dist_sharedir>/perl-5.32/win32_FindExt.pm'        => 'win32/FindExt.pm',  #  needed?
         },
         license => { #SRC paths are relative to the perl src root
             'Readme'   => '<image_dir>/licenses/perl/Readme',