Skip to content

Commit

Permalink
Build scripts for 5.38.2.1 64-bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@shawnlaffan
shawnlaffan committed Dec 5, 2023
1 parent 8bec3ce commit 1c941f1
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 9 deletions.
14 changes: 8 additions & 6 deletions devel.utils/_build-5.38_local.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@

subst Z: C:\spbuild

set SP=d:\berrybrew\5.38.0_64_PDL
set SP=d:\berrybrew\5.32.1.1_64bit
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%
::set OLD_CD=%cd%
::cd ..
::call Build
::cd %OLD_CD%

call ..\build.bat test

set MAKEFLAGS=-j8
set TEST_JOBS=8
::set LC_ALL=C

::set SKIP_MSI_STEP=1
::set SKIP_PDL_STEP=1
%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.38.0.2.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org
%PERLEXE% -Mblib ..\script\perldist_strawberry -job ..\share\64bit-5.38.2.1.pp -test_core -beta=0 -interactive -restorepoints -wixbin_dir=z:\sw\wix311 -cpan_url https://cpan.metacpan.org


24 changes: 21 additions & 3 deletions share/64bit-5.38.2.1.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
libgd => 'https://github.com/StrawberryPerl/build-extlibs/releases/download/dev_gcc13.1_20230502/64bit_libgd-2.3.2-bin_20230502.zip',
zgdb => 'https://github.com/StrawberryPerl/build-extlibs/releases/download/dev_gcc13.1_20230606/64bit_gdb-13.1-bin_20230626.zip',
termcap => 'https://github.com/StrawberryPerl/build-extlibs/releases/download/dev_gcc13.1_20230606/64bit_termcap-1.3.1-bin_20230606.zip',
libfribidi => 'https://github.com/StrawberryPerl/build-extlibs/releases/download/dev_gcc13.1_20230606/64bit_fribidi-1.0.12-bin_20230606.zip',
},
},
### NEXT STEP ###########################
Expand Down Expand Up @@ -172,7 +173,8 @@
# File-Remove has symlink test failures under 5.38, is needed by Win32-File-Object
{ module=>'File-Remove', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/05_links.t' } },
qw/ Win32-Daemon Win32-EventLog Win32-Process Win32-File-Object Win32-WinError Win32-UTCFileTime /,
qw/ Win32-ShellQuote Win32::Console Win32::Console::ANSI Win32::Job Win32::ServiceManager Win32::Service Win32::Clipboard /,
qw/ Win32-ShellQuote Win32::Console Win32::Console::ANSI Win32::Job Win32::ServiceManager Win32::Service /,
{ module => 'Win32-Clipboard', ignore_testfailure=>1 }, # inconsistent failures of tests 7 & 9
{ module=>'<package_url>/kmx/perl-modules-patched/Win32-SerialPort-0.22_patched.tar.gz', skiptest=>1 },
qw/ Sys::Syslog /,

Expand All @@ -197,7 +199,7 @@
qw/ File-HomeDir File-Listing File-ShareDir File-Which File::Map /,
{ module=>'File::Slurp', ignore_testfailure=>1 },
qw/ File::Slurper /,
{ module=>'IO::All', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/link.t' } }, # https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/67
{ module=>'IO::All', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/link.t' } }, # https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/67
{ module=>'Path::Class', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/01-basic.t' } }, # https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/65
qw/ Path::Tiny /,
# math related
Expand Down Expand Up @@ -241,14 +243,21 @@
{ module=>'IO::Stringy', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/IO_InnerFile.t' } }, #https://rt.cpan.org/Public/Bug/Display.html?id=103895
qw/ Text-Diff Text-Patch Text::CSV Text::CSV_XS Tie::Array::CSV Excel::Writer::XLSX Spreadsheet::ParseXLSX Spreadsheet::WriteExcel Spreadsheet::ParseExcel /,

]
},
### NEXT STEP ###########################
{
plugin => 'Perl::Dist::Strawberry::Step::InstallModules',
modules => [

# database stuff
{ module=>'Module::Find', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/07-symlinks.t' } }, # https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/67

{ module=>'Config::Any', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/10-branches.t' } }, # https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/73 needed for DBIx::Class
{ module=>'DBD::SQLite', env=>{ 'HARNESS_SUBCLASS'=>'TAP::Harness::Restricted', 'HARNESS_SKIP'=>'t/33_non_latin_path.t' } }, # https://github.com/StrawberryPerl/Perl-Dist-Strawberry/issues/68
qw/ DBI DBD-ODBC DBD-CSV DBD-ADO DBIx-Class DBIx-Simple /,
'https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-3.8.0.tar.gz', ###{ module=>'DBD::Pg' },
{ module=>'DBD::mysql' },
#{ module=>'DBD::mysql' }, # disable until we sort out more recent mysql (but see https://github.com/StrawberryPerl/Perl-Dist-Strawberry/discussions/157 )
# SKIP DBD::Oracle for 5.36 until we can sort out what files to use
# { module=>'DBD::Oracle', makefilepl_param=>'-V 12.2.0.1.0', env=>{ ORACLE_HOME=>'c:\ora122instant64' }, skiptest=>1 }, ## requires Oracle Instant Client 64bit!!!

Expand Down Expand Up @@ -535,12 +544,21 @@
{ module => 'Astro::FITS::CFITSIO', ignore_testfailure => 1}, # only needed for createfile test
{ module => 'Inline::C', ignore_testfailure => 1 },
{ module => 'Module::Compile', ignore_testfailure => 1 }, #XXX-TODO-5.28 / PREREQ-ONLY
],
},
### NEXT STEP ###########################
{
disable => $ENV{SKIP_PDL_STEP}, ### hack
plugin => 'Perl::Dist::Strawberry::Step::InstallModules',
# modules specific to PDL edition
modules => [
{ module => 'PDL',
#makefilepl_param => 'PDLCONF=<dist_sharedir>\pdl\perldl2.conf',
ignore_testfailure => 1,
env => {
PLPLOT_LIB => '<image_dir>\c\share\plplot',
PLPLOT_DRV_DIR => '<image_dir>\c\share\plplot',
MAKEFLAGS => '',
},
},
qw/ PDL::IO::CSV PDL::IO::DBI PDL::DateTime PDL::Stats /, # PDL::IO::Image
Expand Down

0 comments on commit 1c941f1

Please sign in to comment.