X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=d4cb71185ac5ab3aa8fef0f73bae51fa54f82488;hb=dfa3a3d32f999ad1e84b6c1f00ad651a83b7102c;hp=d60a4ddaecbd42b2b5f474c3f46ae6d6d300978f;hpb=fcbdbaa8f122796fcc7f463951ee05e814c042e2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index d60a4dd..d4cb711 100755 --- a/installperl +++ b/installperl @@ -1,10 +1,19 @@ #!./perl BEGIN { @INC=('./lib', '../lib') } use File::Find; -use File::Path qw(mkpath); +use File::Compare; +use File::Path (); use Config; +use subs qw(unlink rename link chmod); + +# override the ones in the rest of the script +sub mkpath +{ + File::Path::mkpath(@_) unless $nonono; +} $mainperldir = "/usr/bin"; +$exe_ext = $Config{exe_ext}; while (@ARGV) { $nonono = 1 if $ARGV[0] eq '-n'; @@ -14,18 +23,21 @@ while (@ARGV) { umask 022; -@scripts = qw(cppstdin - utils/c2ph utils/h2ph utils/h2xs utils/pstruct - utils/perlbug utils/perldoc +@scripts = qw( utils/c2ph utils/h2ph utils/h2xs + utils/perlbug utils/perldoc utils/pl2pm utils/splain x2p/s2p x2p/find2perl pod/pod2man pod/pod2html pod/pod2latex pod/pod2text); -# pod documentation now handled by separate installman script. -# These two are archaic leftovers. -@manpages = qw(x2p/a2p.man x2p/s2p.man); - @pods = (); +%archpms = (Config => 1, FileHandle => 1, overload => 1); +find(sub { + if ("$File::Find::dir/$_" =~ m{^ext/[^/]+/(.*)\.pm$}) { + (my $pm = $1) =~ s{^lib/}{}; + $archpms{$pm} = 1; + } + }, 'ext'); + $ver = $]; $release = substr($ver,0,3); # Not used presently. $patchlevel = substr($ver,3,2); @@ -42,16 +54,13 @@ $installsitelib = $Config{installsitelib}; $installsitearch = $Config{installsitearch}; $installman1dir = $Config{installman1dir}; $man1ext = $Config{man1ext}; -# Did we build libperl as a shared library? -$d_shrplib = $Config{d_shrplib}; -$shrpdir = $Config{shrpdir}; +$libperl = $Config{libperl}; # Shared library and dynamic loading suffixes. $so = $Config{so}; $dlext = $Config{dlext}; $d_dosuid = $Config{d_dosuid}; $binexp = $Config{binexp}; -$osname = $Config{osname}; # Do some quick sanity checks. @@ -59,36 +68,26 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; } $installbin || die "No installbin directory in config.sh\n"; -d $installbin || mkpath($installbin, 1, 0777); --d $installbin || die "$installbin is not a directory\n"; --w $installbin || die "$installbin is not writable by you\n" +-d $installbin || $nonono || die "$installbin is not a directory\n"; +-w $installbin || $nonono || die "$installbin is not writable by you\n" unless $installbin =~ m#^/afs/# || $nonono; --x 'perl' || die "perl isn't executable!\n"; --x 'suidperl' || die "suidperl isn't executable!\n" if $d_dosuid; +-x 'perl' . $exe_ext || die "perl isn't executable!\n"; +-x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid; -x 't/TEST' || warn "WARNING: You've never run 'make test'!!!", " (Installing anyway.)\n"; -if ($d_shrplib) { - if (!) { - warn "WARNING: Can't find libperl*.$so* to install into $shrpdir.", - " (Installing other things anyway.)\n"; - } else { - mkpath($shrpdir, 1, 0777); - -w $shrpdir || die "$shrpdir is not writable by you\n"; - &cmd("cp libperl*.$so* $shrpdir"); - } -} - # First we install the version-numbered executables. -&safe_unlink("$installbin/perl$ver"); -&cmd("cp perl $installbin/perl$ver"); +&safe_unlink("$installbin/perl$ver$exe_ext"); +&cmd("cp perl$exe_ext $installbin/perl$ver$exe_ext"); +&chmod(0755, "$installbin/perl$ver$exe_ext"); -&safe_unlink("$installbin/sperl$ver"); +&safe_unlink("$installbin/sperl$ver$exe_ext"); if ($d_dosuid) { - &cmd("cp suidperl $installbin/sperl$ver"); - &chmod(04711, "$installbin/sperl$ver"); + &cmd("cp suidperl$exe_ext $installbin/sperl$ver$exe_ext"); + &chmod(04711, "$installbin/sperl$ver$exe_ext"); } exit 0 if $versiononly; @@ -96,15 +95,26 @@ exit 0 if $versiononly; # Make links to ordinary names if installbin directory isn't current directory. if (! &samepath($installbin, '.')) { - &safe_unlink("$installbin/perl", "$installbin/suidperl"); - &link("$installbin/perl$ver", "$installbin/perl"); - &link("$installbin/sperl$ver", "$installbin/suidperl") if $d_dosuid; + &safe_unlink("$installbin/perl$exe_ext", "$installbin/suidperl$exe_ext"); + &link("$installbin/perl$ver$exe_ext", "$installbin/perl$exe_ext"); + &link("$installbin/sperl$ver$exe_ext", "$installbin/suidperl$exe_ext") + if $d_dosuid; } if (! &samepath($installbin, 'x2p')) { - &safe_unlink("$installbin/a2p"); - &cmd("cp x2p/a2p $installbin/a2p"); - &chmod(0755, "$installbin/a2p"); + &safe_unlink("$installbin/a2p$exe_ext"); + &cmd("cp x2p/a2p$exe_ext $installbin/a2p$exe_ext"); + &chmod(0755, "$installbin/a2p$exe_ext"); +} + +# cppstdin is just a script, but it is architecture-dependent, so +# it can't safely be shared. Place it in $installbin. +# Note that Configure doesn't build cppstin if it isn't needed, so +# we skip this if cppstdin doesn't exist. +if ((-f cppstdin) && (! &samepath($installbin, '.'))) { + &safe_unlink("$installbin/cppstdin"); + &cmd("cp cppstdin $installbin/cppstdin"); + &chmod(0755, "$installbin/cppstdin"); } # Install scripts. @@ -112,12 +122,15 @@ if (! &samepath($installbin, 'x2p')) { mkpath($installscript, 1, 0777); for (@scripts) { - if (-f $_) { # cppstdin might not exist on this system. - &cmd("cp $_ $installscript"); - s#.*/##; &chmod(0755, "$installscript/$_"); - } + &cmd("cp $_ $installscript"); + s#.*/##; &chmod(0755, "$installscript/$_"); } +# pstruct should be a link to c2ph + +&safe_unlink("$installscript/pstruct"); +&link("$installscript/c2ph","$installscript/pstruct"); + # Install pod pages. Where? I guess in $installprivlib/pod. mkpath("${installprivlib}/pod", 1, 0777); foreach $file (@pods) { @@ -125,30 +138,6 @@ foreach $file (@pods) { cp_if_diff($file, "${installprivlib}/${file}"); } -# Install old man pages. - -if ($installman1dir ne '') { - mkpath($installman1dir, 1, 0777); - - if (! &samepath($installman1dir, '.')) { - for (@manpages) { - ($new = $_) =~ s/man$/$man1ext/; - $new =~ s#.*/##; - print STDERR " Installing $installman1dir/$new\n"; - next if $nonono; - open(MI,$_) || warn "Can't open $_: $!\n"; - open(MO,">$installman1dir/$new") || - warn "Can't install $installman1dir/$new: $!\n"; - print MO ".ds RP Release $release Patchlevel $patchlevel\n"; - while () { - print MO; - } - close MI; - close MO; - } - } -} - # Install library files. $do_installarchlib = $do_installprivlib = 0; @@ -173,42 +162,50 @@ else { # Install header files and libraries. mkpath("$installarchlib/CORE", 1, 0777); -foreach $file (<*.h libperl*.*>) { - cp_if_diff($file,"$installarchlib/CORE/$file"); -} +@corefiles = <*.h libperl*.*>; # AIX needs perl.exp installed as well. -cp_if_diff("perl.exp" ,"$installarchlib/CORE/perl.exp") if ($osname eq 'aix'); - +push(@corefiles,'perl.exp') if $^O eq 'aix'; # If they have built sperl.o... -cp_if_diff("sperl.o" ,"$installarchlib/CORE/sperl.o") if (-f 'sperl.o'); - +push(@corefiles,'sperl.o') if -f 'sperl.o'; +foreach $file (@corefiles) { + # HP-UX (at least) needs to maintain execute permissions + # on dynamically-loaded libraries. + cp_if_diff($file,"$installarchlib/CORE/$file") + and &chmod($file =~ /^\.(so|$dlext)$/ ? 0555 : 0444, + "$installarchlib/CORE/$file"); +} # Offer to install perl in a "standard" location $mainperl_is_instperl = 0; -if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) { - # First make sure $mainperldir/perl is not already the same as - # the perl we just installed - if (-x "$mainperldir/perl") { +if (!$nonono && -t STDIN && -t STDERR + && -w $mainperldir && ! &samepath($mainperldir, $installbin)) { + local($usrbinperl) = "$mainperldir/perl$exe_ext"; + local($instperl) = "$installbin/perl$exe_ext"; + local($expinstperl) = "$binexp/perl$exe_ext"; + + # First make sure $usrbinperl is not already the same as the perl we + # just installed. + if (-x $usrbinperl) { # Try to be clever about mainperl being a symbolic link # to binexp/perl if binexp and installbin are different. $mainperl_is_instperl = - &samepath("$mainperldir/perl", "$installbin/perl") || + &samepath($usrbinperl, $instperl) || + &samepath($usrbinperl, $expinstperl) || (($binexp ne $installbin) && - (-l "$mainperldir/perl") && - ((readlink "$mainperldir/perl") eq "$binexp/perl")); + (-l $usrbinperl) && + ((readlink $usrbinperl) eq $expinstperl)); } if ((! $mainperl_is_instperl) && - (&yn("Many scripts expect perl to be installed as " . - "$mainperldir/perl.\n" . - "Do you wish to have $mainperldir/perl be the same as\n" . - "$binexp/perl? [y] "))) + (&yn("Many scripts expect perl to be installed as $usrbinperl.\n" . + "Do you wish to have $usrbinperl be the same as\n" . + "$expinstperl? [y] "))) { - unlink("$mainperldir/perl"); - eval 'link("$installbin/perl", "$mainperldir/perl")' || - eval 'symlink("$binexp/perl", "$mainperldir/perl")' || - &cmd("cp $installbin/perl $mainperldir"); + unlink($usrbinperl); + eval { CORE::link $instperl, $usrbinperl } || + eval { symlink $expinstperl, $usrbinperl } || + cmd("cp $instperl $usrbinperl"); $mainperl_is_instperl = 1; } } @@ -219,7 +216,9 @@ if (-w $mainperldir && ! &samepath($mainperldir, $installbin) && !$nonono) { # Also skip $mainperl if the user opted to have it be a link to the # installed perl. -@path = split(/:/, $ENV{"PATH"}); +$dirsep = ($^O eq 'os2') ? ';' : ':' ; +($path = $ENV{"PATH"}) =~ s:\\:/:g ; +@path = split(/$dirsep/, $path); @otherperls = (); for (@path) { next unless m,^/,; @@ -227,7 +226,8 @@ for (@path) { # Use &samepath here because some systems have other dirs linked # to $mainperldir (like SunOS) next if ($mainperl_is_instperl && &samepath($_, $mainperldir)); - push(@otherperls, "$_/perl") if (-x "$_/perl" && ! -d "$_/perl"); + push(@otherperls, "$_/perl$exe_ext") + if (-x "$_/perl$exe_ext" && ! -d "$_/perl$exe_ext"); } if (@otherperls) { print STDERR "\nWarning: perl appears in your path in the following " . @@ -256,12 +256,16 @@ sub yn { sub unlink { local(@names) = @_; + my($cnt) = 0; foreach $name (@names) { next unless -e $name; + chmod 0777, $name if $^O eq 'os2'; print STDERR " unlink $name\n"; - unlink($name) || warn "Couldn't unlink $name: $!\n" unless $nonono; + ( CORE::unlink($name) and ++$cnt + or warn "Couldn't unlink $name: $!\n" ) unless $nonono; } + return $cnt; } sub safe_unlink { @@ -269,9 +273,10 @@ sub safe_unlink { foreach $name (@names) { next unless -e $name; - print STDERR " unlink $name\n"; next if $nonono; - next if unlink($name); + chmod 0777, $name if $^O eq 'os2'; + print STDERR " unlink $name\n"; + next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; if ($! =~ /busy/i) { print STDERR " mv $name $name.old\n"; @@ -291,29 +296,38 @@ sub cmd { sub rename { local($from,$to) = @_; - unless (unlink($to)) { + if (-f $to and not unlink($to)) { my($i); for ($i = 1; $i < 50; $i++) { - last if rename($to, "$to.$i"); + last if CORE::rename($to, "$to.$i"); } - return 0 if $i >= 50; # Give up! + warn("Cannot rename to `$to.$i': $!"), return 0 + if $i >= 50; # Give up! } link($from,$to) || return 0; unlink($from); } sub link { - local($from,$to) = @_; + my($from,$to) = @_; + my($success) = 0; print STDERR " ln $from $to\n"; - link($from,$to) || warn "Couldn't link $from to $to: $!\n" unless $nonono; + eval { + CORE::link($from,$to) ? $success++ : warn "Couldn't link $from to $to: $!\n" unless $nonono; + }; + if ($@) { + system( $cp, $from, $to )==0 ? $success++ : + warn "Couldn't copy $from to $to: $!\n" unless $nonono; + } + $success; } sub chmod { local($mode,$name) = @_; printf STDERR " chmod %o %s\n", $mode, $name; - chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name) + CORE::chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n",$mode,$name) unless $nonono; } @@ -334,6 +348,7 @@ sub samepath { sub installlib { my $dir = $File::Find::dir; $dir =~ s#^\.(?![^/])/?##; + local($depth) = $dir ? "lib/$dir" : "lib"; my $name = $_; @@ -343,7 +358,8 @@ sub installlib { $name = "$dir/$name" if $dir ne ''; my $installlib = $installprivlib; - if ((substr($dir, 0, 4) eq 'auto') || ($name eq 'Config.pm')) { + if ($dir =~ /^auto/ || + ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1})) { $installlib = $installarchlib; return unless $do_installarchlib; } else { @@ -359,19 +375,14 @@ sub installlib { #This might not work because $archname might have changed. &unlink("$installarchlib/$name"); } - system "cmp", "-s", $_, "$installlib/$name"; - if ($?) { + if (compare($_, "$installlib/$name") || $nonono) { &unlink("$installlib/$name"); mkpath("$installlib/$dir", 1, 0777); - cp_if_diff($_, "$installlib/$name"); # HP-UX (at least) needs to maintain execute permissions # on dynamically-loaded libraries. - if ($name =~ /\.(so|$dlext)$/o) { - &chmod(0555, "$installlib/$name"); - } - else { - &chmod(0444, "$installlib/$name"); - } + cp_if_diff($_, "$installlib/$name") + and &chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444, + "$installlib/$name"); } } elsif (-d $_) { mkpath("$installlib/$name", 1, 0777); @@ -386,18 +397,22 @@ sub installlib { # and then try to link against the installed libperl.a, you might # get an error message to the effect that the symbol table is older # than the library. +# Return true if copying occurred. sub cp_if_diff { my($from,$to)=@_; -f $from || die "$0: $from not found"; - system "cmp", "-s", $from, $to; - if ($?) { + if (compare($from, $to) || $nonono) { my ($atime, $mtime); unlink($to); # In case we don't have write permissions. + if ($nonono) { + $from = $depth . "/" . $from if $depth; + } cmd("cp $from $to"); # Restore timestamps if it's a .a library. - if ($to =~ /\.a$/) { + if ($to =~ /\.a$/ or $^O eq 'os2') { # For binary install ($atime, $mtime) = (stat $from)[8,9]; utime $atime, $mtime, $to; } + 1; } }