Skip to content

Commit c6ac38e

Browse files
authored
Merge pull request #171 from StrawberryPerl/build_local
Build scripts for recent releases (5.38.2, 5.36.3)
2 parents 427b956 + 09bf10c commit c6ac38e

11 files changed

+4889
-2
lines changed

devel.utils/_build-5.36_local.bat

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
::@cls
2+
::call ..\build.bat test
3+
4+
::set PERL_USE_UNSAFE_INC=1
5+
6+
subst Z: C:\spbuild
7+
8+
set SP=d:\berrybrew\5.32.1.1_64bit
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+
::set OLD_CD=%cd%
14+
::cd ..
15+
::call Build
16+
::cd %OLD_CD%
17+
18+
call ..\build.bat test
19+
20+
set MAKEFLAGS=-j8
21+
set TEST_JOBS=8
22+
23+
24+
::set SKIP_MSI_STEP=1
25+
::set SKIP_PDL_STEP=1
26+
%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.36.3.1.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
27+
28+

devel.utils/_build-5.38_local.bat

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
::@cls
2+
::call ..\build.bat test
3+
4+
::set PERL_USE_UNSAFE_INC=1
5+
6+
subst Z: C:\spbuild
7+
8+
set SP=d:\berrybrew\5.32.1.1_64bit
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+
::set OLD_CD=%cd%
14+
::cd ..
15+
::call Build
16+
::cd %OLD_CD%
17+
18+
call ..\build.bat test
19+
20+
set MAKEFLAGS=-j8
21+
set TEST_JOBS=8
22+
23+
24+
::set SKIP_MSI_STEP=1
25+
::set SKIP_PDL_STEP=1
26+
%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.38.2.2.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
27+
28+
+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@cls
2+
call ..\build.bat test
3+
4+
subst Z: C:\spbuild
5+
6+
set SP=d:\berrybrew\5.32.0_64_PDL
7+
set PATH=%SP%\c\bin;%SP%\perl\bin;%SP%\perl\site\bin;Z:\sw\wix311;%PATH%
8+
::set PERLEXE=%SP%\perl\bin\perl
9+
10+
11+
set PERL_USE_UNSAFE_INC=1
12+
13+
set SKIP_MSI_STEP=
14+
set SKIP_PDL_STEP=1
15+
perl -Mblib ..\script\perldist_strawberry -job ..\share\32bit-5.38.2.1.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
16+

lib/Perl/Dist/Strawberry/Step.pm

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ sub _patch_file {
291291
$self->boss->message(5, "PATCHING '$new' '$dst' '$dir' $tt_vars " . ($no_backup||'') . "\n");
292292

293293
if ($dst =~ /\*$/) {
294-
warn "WE IS PATCHIN '$new'";
294+
warn "WE ARE PATCHIN '$new'";
295295
}
296296
if ($new eq 'config_H.gc' and ref($dst) =~ /HASH/) {
297297
$self->boss->message(5, "_patch_file: using hash of values to update config_H.gc'\n");
@@ -324,7 +324,7 @@ if ($dst =~ /\*$/) {
324324
#$self->_apply_patch($dir, $new);
325325
{
326326
my $wd = $self->_push_dir($dir);
327-
system("patch -i $new -p1") == 0 or die "patch '$new' FAILED";
327+
system("patch --binary -i $new -p1") == 0 or die "patch '$new' FAILED";
328328
}
329329
}
330330
elsif ($new =~ /\.(diff|patch)$/) {

share/32bit-5.38.2.1.pp

+547
Large diffs are not rendered by default.

share/64bit-5.36.3.1.pp

+612
Large diffs are not rendered by default.

share/64bit-5.38.0.2.pp

+524
Large diffs are not rendered by default.

share/64bit-5.38.2.1.pp

+597
Large diffs are not rendered by default.

share/64bit-5.38.2.2.pp

+607
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)