diff options
14 files changed, 59 insertions, 61 deletions
diff --git a/Master/source/tlperl/HTTP-Cookies-6.01.tar.gz b/Master/source/tlperl/HTTP-Cookies-6.01.tar.gz Binary files differdeleted file mode 100644 index 364eebfd5b9..00000000000 --- a/Master/source/tlperl/HTTP-Cookies-6.01.tar.gz +++ /dev/null diff --git a/Master/source/tlperl/HTTP-Cookies-6.03.tar.gz b/Master/source/tlperl/HTTP-Cookies-6.03.tar.gz Binary files differnew file mode 100644 index 00000000000..1cadd35ffb7 --- /dev/null +++ b/Master/source/tlperl/HTTP-Cookies-6.03.tar.gz diff --git a/Master/source/tlperl/Net-HTTP-6.09.tar.gz b/Master/source/tlperl/Net-HTTP-6.09.tar.gz Binary files differdeleted file mode 100644 index 465180081cc..00000000000 --- a/Master/source/tlperl/Net-HTTP-6.09.tar.gz +++ /dev/null diff --git a/Master/source/tlperl/Net-HTTP-6.13.tar.gz b/Master/source/tlperl/Net-HTTP-6.13.tar.gz Binary files differnew file mode 100644 index 00000000000..41f0281ef59 --- /dev/null +++ b/Master/source/tlperl/Net-HTTP-6.13.tar.gz diff --git a/Master/source/tlperl/Socket-2.021.tar.gz b/Master/source/tlperl/Socket-2.021.tar.gz Binary files differdeleted file mode 100644 index 893ddf682d4..00000000000 --- a/Master/source/tlperl/Socket-2.021.tar.gz +++ /dev/null diff --git a/Master/source/tlperl/Socket-2.024.tar.gz b/Master/source/tlperl/Socket-2.024.tar.gz Binary files differnew file mode 100644 index 00000000000..3b55d757c9d --- /dev/null +++ b/Master/source/tlperl/Socket-2.024.tar.gz diff --git a/Master/source/tlperl/Test-Fatal-0.014.tar.gz b/Master/source/tlperl/Test-Fatal-0.014.tar.gz Binary files differnew file mode 100644 index 00000000000..9b94591359f --- /dev/null +++ b/Master/source/tlperl/Test-Fatal-0.014.tar.gz diff --git a/Master/source/tlperl/Test-RequiresInternet-0.05.tar.gz b/Master/source/tlperl/Test-RequiresInternet-0.05.tar.gz Binary files differnew file mode 100644 index 00000000000..cdcdce94df6 --- /dev/null +++ b/Master/source/tlperl/Test-RequiresInternet-0.05.tar.gz diff --git a/Master/source/tlperl/Try-Tiny-0.28.tar.gz b/Master/source/tlperl/Try-Tiny-0.28.tar.gz Binary files differnew file mode 100644 index 00000000000..f22765cfd95 --- /dev/null +++ b/Master/source/tlperl/Try-Tiny-0.28.tar.gz diff --git a/Master/source/tlperl/libwww-perl-6.15.tar.gz b/Master/source/tlperl/libwww-perl-6.15.tar.gz Binary files differdeleted file mode 100644 index 1256e610e65..00000000000 --- a/Master/source/tlperl/libwww-perl-6.15.tar.gz +++ /dev/null diff --git a/Master/source/tlperl/libwww-perl-6.25.tar.gz b/Master/source/tlperl/libwww-perl-6.25.tar.gz Binary files differnew file mode 100644 index 00000000000..0ec837f2702 --- /dev/null +++ b/Master/source/tlperl/libwww-perl-6.25.tar.gz diff --git a/Master/source/tlperl/makefile.mk.diff b/Master/source/tlperl/makefile.mk.diff index 97d63575fdd..9d42beabe40 100644 --- a/Master/source/tlperl/makefile.mk.diff +++ b/Master/source/tlperl/makefile.mk.diff @@ -6,15 +6,15 @@ < #WIN64 *= undef --- > WIN64 *= undef -148c148 +115c115 +< #USE_NO_REGISTRY *=define +--- +> USE_NO_REGISTRY *=define +155c155 < #GCCWRAPV *= define --- > GCCWRAPV *= define -230c230 +237c237 < CCHOME *= C:\MinGW --- -> CCHOME *= X:\mingw -499c499 -< OPTIMIZE = -s -O2 ---- -> OPTIMIZE = -s -O0 +> CCHOME *= X:\wprogs\mingw diff --git a/Master/source/tlperl/perl-5.22.1.tar.gz b/Master/source/tlperl/perl-5.24.1.tar.gz Binary files differindex 5e1e7ca1ad1..bc620904e2d 100644 --- a/Master/source/tlperl/perl-5.22.1.tar.gz +++ b/Master/source/tlperl/perl-5.24.1.tar.gz diff --git a/Master/source/tlperl/tlperl.README b/Master/source/tlperl/tlperl.README index 1ca3911431d..da4b332acd1 100644 --- a/Master/source/tlperl/tlperl.README +++ b/Master/source/tlperl/tlperl.README @@ -1,26 +1,24 @@ -NOTES ON BUILDING TLPERL 2016 +NOTES ON BUILDING TLPERL 2017 BUILD PLATFORM -32-bits Windows 7 SP1 running under VirtualBox on +64-bits Windows 7 SP1 running under VirtualBox on Linux. GETTING THE PERL SOURCE -I downloaded the latest stable Perl source 5.22.1 from CPAN. +I downloaded the latest stable Perl source 5.24.1 from CPAN. THE COMPILER The file README.win32 in the root of the distribution contains compilation instructions, which lists various supported MinGW -distributions, including a trimmed-down version of MinGW64 offered -by the Strawberry Perl project. I downloaded -mingw64-w32-gcc4.9.2_20150513.zip and +distributions. I used mingw64-w32-gcc4.9.2_20150513.zip from +https://sourceforge.net/projects/mingw-w64/ and 32bit_dmake-4.12.2-bin_20140810.zip from -http://strawberryperl.com/package/kmx/32_gcctoolchain/ and -http://strawberryperl.com/package/kmx/32_tools/ respectively, -unzipped mingw and put dmake.exe and the dmake startup subdirectory -in the bin subdirectory of mingw. +http://strawberryperl.com/package/kmx/32_tools/ +respectively. dmake.exe and the dmake startup subdirectory are in +the bin subdirectory of the unpacked mingw. This MinGW compiler does not require installation; it is sufficient to prepend <root>\bin to the searchpath before use. @@ -28,20 +26,44 @@ to prepend <root>\bin to the searchpath before use. BUILDING PERL I went to the win32 subdirectory of the Perl source. In makefile.mk -I adjusted relevant settings to my build environment. As in the -previous release, I turned off optimization in the hope to avoid -some intractable failures. A diff for makefile.mk is included. +I adjusted relevant settings to my build environment. A diff for +this makefile.mk is included. I compiled with - dmake && dmake test + dmake + dmake test (Result: PASS) -There were no test errors. I installed with +I installed with dmake installbare `installbare' omits the generation of html. +MAKING PERL PORTABLE + +There were hard-coded paths in lib/Config.pm and +lib/Config_heavy.pl, which were likely to cause problems. + +I edited lib/Config.pm and lib/Config_heavy.pl to compute Perl's +location dynamically. To both I add the code + + my $rootdir = __FILE__; + $rootdir =~ s![\\/][^\\/]*[\\/][^\\/]*$!!; + $rootdir =~ s!/!\\!g; + +and used this in Config.pm for the definition of %Config, taking +care to replace single-quoted strings with double-quoted ones and +escaping backslashes and other characters where necessary. I also +parameterized the location of the mingw compiler. + +Config_heavy.pl got a similar treatment, in particular the +single-quoted here-documents with markers !END! (very long) and +EOVIRTUAL. + +The original versions are still present in the lib directory under +the names Config.pm.orig and Config_heavy.pl.orig. + INSTALLING MODULES When adding modules, I added the new Perl bin directory to the @@ -50,7 +72,8 @@ with perl Makefile.PL && dmake && dmake test && dmake install -They are, in order of processing: +All modules for which tests were defined got a pass. They are, in +order of processing: Math::Int64 0.54 IO::String 1.08 @@ -66,13 +89,14 @@ Win32::WinError 0.04 (just copying WinError.pm to site/lib/Win32) Win32API::Registry 0.33 Win32::Console 0.10 (no tests) -Win32::TieRegistry 0.30 (tests ok, for once) +Win32::TieRegistry 0.30 Win32::Shortcut 0.08 (no tests) Win32::OLE 0.1712 +Win32-Process-0.16 LWP and dependencies, in order of compilation/installation: -Socket 2.021 +Socket 2.024 Date::Parse 2.30 (file TimeDate-2.30.tar.gz) HTTP::Date 6.02 File::Listing 6.04 @@ -84,11 +108,14 @@ HTML::Tagset 3.20 HTML::Parser 3.72 WWW::RobotRules 6.02 HTTP::Negotiate 6.01 -Net::HTTP 6.09 +Net::HTTP 6.13 Mozilla::CA 20160104 HTTP::Daemon 6.01 -HTTP::Cookies 6.01 -LWP 6.15 (file libwww-perl-6.15.tar.gz) +HTTP::Cookies 6.03 +Try::Tiny 0.28 +Test::Fatal 0.014 +Test::RequiresInternet 0.05 +LWP 6.25 (file libwww-perl-6.15.tar.gz) Perl/Tk: @@ -97,7 +124,8 @@ Tk 804.033 This module did not compile rightaway: 1. In Tk-804.033/PNG/zlib/win32/zlib.def I had to comment out the - LIBRARY line at the start. + LIBRARY line at the start of the file. It might be well to do + this before running 'perl Makefile.PL'. 2. An entry '-limm32' somehow did not make it into LDLOADLIBS in the generated Makefile in the Tk source root directory. After @@ -106,34 +134,6 @@ This module did not compile rightaway: Tk-DirSelect 1.12 -And another Windows module, not previously included: - -Win32-Process-0.16 - -MAKING PERL PORTABLE - -There were hard-coded paths in lib/Config.pm and -lib/Config_heavy.pl, which were likely to cause problems. - -I edited lib/Config.pm and lib/Config_heavy.pl to compute Perl's -location dynamically. To both I add the code - - my $rootdir = __FILE__; - $rootdir =~ s![\\/][^\\/]*[\\/][^\\/]*$!!; - $rootdir =~ s!/!\\!g; - -and used this in Config.pm for the definition of %Config, taking -care to replace single-quoted strings with double-quoted ones and -escaping backslashes and other characters where necessary. I also -parameterized the location of the mingw compiler. - -Config_heavy.pl got a similar treatment, in particular the -single-quoted here-documents with markers !END! (very long) and -EOVIRTUAL. - -The original versions are still present in the lib directory under -the names Config.pm.orig and Config_heavy.pl.orig. - MODIFICATIONS FOR TEXLIVE - As explained above: our versions of lib/Config.pm and lib/Config_heavy.pl @@ -143,9 +143,7 @@ MODIFICATIONS FOR TEXLIVE - The bin subdirectory now only contains exe- and dll files; batch files and Perl scripts have been removed. - Copied from mingw/bin to tlperl/bin: - libgcc_s_sjlj_1.dll, libstdc++-6.dll and libwinpthread-1.dll - -This time around, I kept the site directory tree separate. + libgcc_s_dw2-1.dll, libstdc++-6.dll and libwinpthread-1.dll TESTING WITH TEXLIVE @@ -163,4 +161,4 @@ uninstaller. Siep Kroonenberg -Last revision: April 2016 +Last revision: April 2017 |