Skip to content

Commit 654d5bd

Browse files
authored
Merge pull request #233 from StrawberryPerl/sp5.40.1
Strawberry perl 5.40.2.1, 5.38.4.1, 5.34.3.1
2 parents e673d86 + 7218006 commit 654d5bd

25 files changed

+6925
-4
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
::@cls
2+
::call ..\build.bat test
3+
4+
::set PERL_USE_UNSAFE_INC=1
5+
6+
subst Z: C:\shawn\sp_repos
7+
8+
set SP=c:\perls\5.38.2.2_PDL
9+
set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
10+
set PERLEXE=%SP%\perl\bin\perl
11+
12+
:: update blib - requires Build.PL to have been run
13+
call ..\build.bat test
14+
15+
::set MAKEFLAGS=-j12
16+
set TEST_JOBS=8
17+
18+
:: tests take a long time
19+
set TEST_CORE=-test_core
20+
#set TEST_CORE=-notest_core
21+
22+
::set SKIP_MSI_STEP=1
23+
::set SKIP_PDL_STEP=1
24+
%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.38.4.1.pp %TEST_CORE% -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
25+
26+
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
::@cls
2+
::call ..\build.bat test
3+
4+
::set PERL_USE_UNSAFE_INC=1
5+
6+
subst Z: C:\shawn\sp_repos
7+
8+
set SP=c:\perls\5.38.2.2_PDL
9+
set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
10+
set PERLEXE=%SP%\perl\bin\perl
11+
12+
:: update blib - requires Build.PL to have been run
13+
call ..\build.bat test
14+
15+
::set MAKEFLAGS=-j12
16+
set TEST_JOBS=8
17+
18+
:: tests take a long time
19+
set TEST_CORE=-test_core
20+
#set TEST_CORE=-notest_core
21+
22+
::set SKIP_MSI_STEP=1
23+
::set SKIP_PDL_STEP=1
24+
%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.40.2.2.pp %TEST_CORE% -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
25+
26+
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
::@cls
2+
::call ..\build.bat test
3+
4+
::set PERL_USE_UNSAFE_INC=1
5+
6+
subst Z: C:\shawn\sp_repos
7+
8+
set SP=c:\perls\5.38.2.2_PDL
9+
set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
10+
set PERLEXE=%SP%\perl\bin\perl
11+
12+
:: update blib - requires Build.PL to have been run
13+
call ..\build.bat test
14+
15+
:: set MAKEFLAGS=-j20
16+
:: set TEST_JOBS=8
17+
18+
:: tests take a long time
19+
set TEST_CORE=-test_core
20+
set TEST_CORE=-notest_core
21+
22+
::set SKIP_MSI_STEP=1
23+
::set SKIP_PDL_STEP=1
24+
%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
25+
26+
File renamed without changes.
File renamed without changes.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
::@cls
2+
::call ..\build.bat test
3+
4+
::set PERL_USE_UNSAFE_INC=1
5+
6+
subst Z: C:\shawn\sp_repos
7+
8+
set SP=c:\perls\5.38.2.2_PDL
9+
set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;Z:\winlibs\bin;%PATH%
10+
set PERLEXE=%SP%\perl\bin\perl
11+
12+
:: update blib - requires Build.PL to have been run
13+
call ..\build.bat test
14+
15+
set MAKEFLAGS=-j20
16+
set TEST_JOBS=8
17+
18+
:: tests take a long time
19+
set TEST_CORE=-test_core
20+
::set TEST_CORE=-notest_core
21+
22+
::set SKIP_MSI_STEP=1
23+
::set SKIP_PDL_STEP=1
24+
%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
25+
26+
File renamed without changes.
File renamed without changes.
File renamed without changes.

lib/Perl/Dist/Strawberry/Step.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ sub _patch_file {
291291
my ($self, $new, $dst, $dir, $tt_vars, $no_backup) = @_;
292292
$self->boss->message(5, "PATCHING '$new' '$dst' '$dir' $tt_vars " . ($no_backup||'') . "\n");
293293

294-
if ($dst =~ /\*$/) {
295-
warn "WE ARE PATCHIN '$new'";
294+
if (1 or $dst =~ /\*$/) {
295+
warn "WE ARE PATCHING '$new' onto $dst";
296296
}
297297
if ($new eq 'config_H.gc' and ref($dst) =~ /HASH/) {
298298
$self->boss->message(5, "_patch_file: using hash of values to update config_H.gc'\n");

0 commit comments

Comments
 (0)