Merge pull request #197 from StrawberryPerl/build_5.40.0

Build 5.40.0

Author: shawnlaffan

devel.utils/_build-5.39_local_ucrt.bat

@@ -0,0 +1,28 @@
+::@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
+::set OLD_CD=%cd%
+::cd ..
+::call Build
+::cd %OLD_CD%
+
+call ..\build.bat test
+
+set MAKEFLAGS=-j8
+set TEST_JOBS=8
+
+
+::set SKIP_MSI_STEP=1
+::set SKIP_PDL_STEP=1
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.39.10.2.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+
+

devel.utils/_build-5.40_local_ucrt.bat

@@ -0,0 +1,28 @@
+::@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
+::set OLD_CD=%cd%
+::cd ..
+::call Build
+::cd %OLD_CD%
+
+call ..\build.bat test
+
+set MAKEFLAGS=-j8
+set TEST_JOBS=8
+
+
+::set SKIP_MSI_STEP=1
+::set SKIP_PDL_STEP=1
+%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.40.0.1.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
+
+

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

@@ -77,9 +77,9 @@ sub _uninstall_module {
   # resolve macros in module name
   $args{module} = $self->boss->resolve_name($args{module});
   my %params;
-  $params{--url}     = $self->global->{cpan_url};
-  $params{--module}  = $args{module}; #XXX-TODO multiple modules?
-  $params{--verbose} = $args{verbose} if defined $args{verbose};
+  $params{'--url'}     = $self->global->{cpan_url};
+  $params{'--module'}  = $args{module}; #XXX-TODO multiple modules?
+  $params{'--verbose'} = $args{verbose} if defined $args{verbose};
   # Execute the module uninstall script
   my $rv = $self->execute_special(['perl', $script_pl, %params], $log, $log, $env);
   unless(defined $rv && $rv == 0) {