In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2793ad9736be7d9f8d4be845ec4a4ebbc25cb516?hp=6f87f404fa51739971a4068da1f11443024f3fc4>
- Log ----------------------------------------------------------------- commit 2793ad9736be7d9f8d4be845ec4a4ebbc25cb516 Author: Steve Hay <[email protected]> Date: Wed Jun 6 19:17:16 2012 +0100 Remove Win9x hangover from win32/config_sh.PL We no longer support Win9x so there is no need to undef d_flock and d_link in that case. M win32/config_sh.PL commit 8876bcbbbc74834fd90d897e87cc5952ac1532da Author: Steve Hay <[email protected]> Date: Wed Jun 6 19:15:25 2012 +0100 Remove redundant substitution from win32/config_sh.PL INST_VER doesn't contain a ~VERSION~ placeholder. M win32/config_sh.PL commit c01b38767d2fcc35abf9ff59a9b5d6b03f55f5ca Author: Steve Hay <[email protected]> Date: Wed Jun 6 19:13:28 2012 +0100 perldelta for c2f56b9483 and a970290aa9. M pod/perldelta.pod ----------------------------------------------------------------------- Summary of changes: pod/perldelta.pod | 7 +++++++ win32/config_sh.PL | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 75cc98c..afa6406 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -103,6 +103,13 @@ XXX =item * +L<ExtUtils::CBuilder> has been upgraded from version 0.280206 to 0.280208. + +Manifest files are now correctly embedded for those versions of VC++ which +make use of them. + +=item * + L<File::DosGlob> has been upgraded from version 1.07 to 1.08. There are no visible changes, only minor internal refactorings. diff --git a/win32/config_sh.PL b/win32/config_sh.PL index 9b26027..fb23ee7 100644 --- a/win32/config_sh.PL +++ b/win32/config_sh.PL @@ -77,7 +77,6 @@ if (-e $patch_file) { } $opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}"; -$opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g; $opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion $opt{PERL_SUBVERSION}"; $opt{'version_patchlevel_string'} .= " patch $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL}; @@ -108,12 +107,6 @@ $opt{'usemymalloc'} = 'y' if $opt{'d_mymalloc'} eq 'define'; $opt{libpth} = mungepath($opt{libpth}) if exists $opt{libpth}; $opt{incpath} = mungepath($opt{incpath}) if exists $opt{incpath}; -# some functions are not available on Win9x -unless (defined $ENV{SYSTEMROOT}) { # SystemRoot has been introduced by WinNT - $opt{d_flock} = 'undef'; - $opt{d_link} = 'undef'; -} - # change the lseeksize and lseektype from their canned default values (which # are set-up for a non-uselargefiles build) if we are building with # uselargefiles. -- Perl5 Master Repository
