@@ -32,11 +32,11 @@ ExtUtils::Install - install files from here to there
32
32
33
33
=head1 VERSION
34
34
35
- 2.14
35
+ 2.16_001
36
36
37
37
=cut
38
38
39
- our $VERSION = ' 2.14 ' ; # <-- do not forget to update the POD section just above this line!
39
+ our $VERSION = ' 2.16_001 ' ; # <-- do not forget to update the POD section just above this line!
40
40
$VERSION = eval $VERSION ;
41
41
42
42
=pod
@@ -90,10 +90,10 @@ Dies with a special message.
90
90
=cut
91
91
92
92
BEGIN {
93
- *Is_VMS = $^O eq ' VMS' ? sub (){1 } : sub (){0 };
94
- *Is_Win32 = $^O eq ' MSWin32' ? sub (){1 } : sub (){0 };
95
- *Is_cygwin = $^O eq ' cygwin' ? sub (){1 } : sub (){0 };
96
- *CanMoveAtBoot = ($^O eq ' MSWin32' || $^O eq ' cygwin' ) ? sub (){1 } : sub (){0 };
93
+ *_Is_VMS = $^O eq ' VMS' ? sub (){1 } : sub (){0 };
94
+ *_Is_Win32 = $^O eq ' MSWin32' ? sub (){1 } : sub (){0 };
95
+ *_Is_cygwin = $^O eq ' cygwin' ? sub (){1 } : sub (){0 };
96
+ *_CanMoveAtBoot = ($^O eq ' MSWin32' || $^O eq ' cygwin' ) ? sub (){1 } : sub (){0 };
97
97
}
98
98
99
99
my $Inc_uninstall_warn_handler ;
@@ -184,15 +184,15 @@ If $moan is true then returns 0 on error and warns instead of dies.
184
184
sub _move_file_at_boot { # XXX OS-SPECIFIC
185
185
my ( $file , $target , $moan )= @_ ;
186
186
_confess(" Panic: Can't _move_file_at_boot on this platform!" )
187
- unless CanMoveAtBoot ;
187
+ unless _CanMoveAtBoot ;
188
188
189
189
my $descr = ref $target
190
190
? " '$file ' for deletion"
191
191
: " '$file ' for installation as '$target '" ;
192
192
193
- # *note* CanMoveAtBoot is only incidentally the same condition as below
193
+ # *note* _CanMoveAtBoot is only incidentally the same condition as below
194
194
# this needs not hold true in the future.
195
- $Has_Win32API_File = (Is_Win32 || Is_cygwin )
195
+ $Has_Win32API_File = (_Is_Win32 || _Is_cygwin )
196
196
? (eval {require Win32API::File; 1} || 0)
197
197
: 0 unless defined $Has_Win32API_File ;
198
198
if ( ! $Has_Win32API_File ) {
@@ -282,7 +282,7 @@ sub _unlink_or_rename { #XXX OS-SPECIFIC
282
282
my $error =" $! " ;
283
283
284
284
_choke(" Cannot unlink '$file ': $! " )
285
- unless CanMoveAtBoot && $tryhard ;
285
+ unless _CanMoveAtBoot && $tryhard ;
286
286
287
287
my $tmp = " AAA" ;
288
288
++$tmp while -e " $file .$tmp " ;
@@ -391,7 +391,7 @@ Abstract a -w check that tries to use POSIX::access() if possible.
391
391
sub _have_write_access {
392
392
my $dir =shift ;
393
393
unless (defined $has_posix ) {
394
- $has_posix = (!Is_cygwin && !Is_Win32
394
+ $has_posix = (!_Is_cygwin && !_Is_Win32
395
395
&& eval { local $^W; require POSIX; 1} ) || 0;
396
396
}
397
397
if ($has_posix ) {
@@ -437,7 +437,7 @@ sub _can_write_dir {
437
437
my $path =' ' ;
438
438
my @make ;
439
439
while (@dirs ) {
440
- if (Is_VMS ) {
440
+ if (_Is_VMS ) {
441
441
$dir = File::Spec-> catdir($vol ,@dirs );
442
442
}
443
443
else {
@@ -822,7 +822,7 @@ sub install { #XXX OS-SPECIFIC
822
822
823
823
# XXX OS-SPECIFIC
824
824
print " utime($atime ,$mtime ,$targetfile )\n " if $verbose >1;
825
- utime ($atime ,$mtime + Is_VMS ,$targetfile ) unless $dry_run >1;
825
+ utime ($atime ,$mtime + _Is_VMS ,$targetfile ) unless $dry_run >1;
826
826
827
827
828
828
$mode = 0444 | ( $mode & 0111 ? 0111 : 0 );
@@ -1094,7 +1094,7 @@ sub inc_uninstall {
1094
1094
# warn join "\n","---",@dirs,"---";
1095
1095
my $seen_ours ;
1096
1096
foreach $dir ( @dirs ) {
1097
- my $canonpath = Is_VMS ? $dir : File::Spec-> canonpath($dir );
1097
+ my $canonpath = _Is_VMS ? $dir : File::Spec-> canonpath($dir );
1098
1098
next if $canonpath eq $Curdir ;
1099
1099
next if $seen_dir {$canonpath }++;
1100
1100
my $targetfile = File::Spec-> catfile($canonpath ,$libdir ,$file );
@@ -1232,7 +1232,7 @@ sub pm_to_blib {
1232
1232
print " cp $from $to \n " unless $INSTALL_QUIET ;
1233
1233
}
1234
1234
my ($mode ,$atime ,$mtime ) = (stat $from )[2,8,9];
1235
- utime ($atime ,$mtime +Is_VMS ,$to );
1235
+ utime ($atime ,$mtime +_Is_VMS ,$to );
1236
1236
_chmod(0444 | ( $mode & 0111 ? 0111 : 0 ),$to );
1237
1237
next unless $from =~ / \. pm$ / ;
1238
1238
_autosplit($to ,$autodir ) if defined $autodir ;
@@ -1285,7 +1285,7 @@ sub DESTROY {
1285
1285
$plural = $i >1 ? " all those files" : " this file" ;
1286
1286
my $inst = (_invokant() eq ' ExtUtils::MakeMaker' )
1287
1287
? ( $Config::Config {make } || ' make' ).' install'
1288
- . ( ExtUtils::Install::Is_VMS ? ' /MACRO="UNINST"=1' : ' UNINST=1' )
1288
+ . ( ExtUtils::Install::_Is_VMS ? ' /MACRO="UNINST"=1' : ' UNINST=1' )
1289
1289
: ' ./Build install uninst=1' ;
1290
1290
print " ## Running '$inst ' will unlink $plural for you.\n " ;
1291
1291
}
0 commit comments