X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=44e5d1b49318db5fa85da4c48f74b066a379637a;hb=2d259d9294e79c03b1a69d3eaac3d6e5647468d7;hp=6197e92b1ddd999d85ee46b05d0de7ca9968eae9;hpb=156620fa44a712d84367040dea35ac6eae776347;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index 6197e92..44e5d1b 100755 --- a/installperl +++ b/installperl @@ -5,14 +5,22 @@ BEGIN { chdir '..' if !-d 'lib' and -d '..\lib'; @INC = 'lib'; $ENV{PERL5LIB} = 'lib'; + $Is_VMS = $^O eq 'VMS'; + $Is_W32 = $^O eq 'MSWin32'; + $Is_OS2 = $^O eq 'os2'; + if ($Is_VMS) { eval 'use VMS::Filespec;' } } +$scr_ext = ($Is_VMS ? '.Com' : $Is_W32 ? '.bat' : ''); + use File::Find; use File::Compare; use File::Copy (); use File::Path (); +use ExtUtils::Packlist; use Config; use subs qw(unlink link chmod); +use vars qw($packlist); # override the ones in the rest of the script sub mkpath { @@ -22,28 +30,40 @@ sub mkpath { $mainperldir = "/usr/bin"; $exe_ext = $Config{exe_ext}; +# Allow ``make install PERLNAME=something_besides_perl'': +$perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl'; + while (@ARGV) { $nonono = 1 if $ARGV[0] eq '-n'; $versiononly = 1 if $ARGV[0] eq '-v'; shift; } -umask 022; +umask 022 unless $Is_VMS; -@scripts = qw( utils/c2ph utils/h2ph utils/h2xs - utils/perlbug utils/perldoc utils/pl2pm utils/splain - x2p/s2p x2p/find2perl +@scripts = qw( utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc + utils/pl2pm utils/splain utils/perlcc + x2p/s2p x2p/find2perl pod/pod2man pod/pod2html pod/pod2latex pod/pod2text); +if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; } + @pods = (); -%archpms = (Config => 1, FileHandle => 1, overload => 1); +%archpms = ( + Config => 1, FileHandle => 1, overload => 1, +); if ($^O eq 'dos') { push(@scripts,'djgpp/fixpmain'); $archpms{config} = $archpms{filehand} = 1; } +if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) +{ + push(@scripts, map("$_.exe", @scripts)); +} + find(sub { if ("$File::Find::dir/$_" =~ m{^ext/[^/]+/(.*)\.pm$}) { (my $pm = $1) =~ s{^lib/}{}; @@ -75,6 +95,14 @@ $dlext = $Config{dlext}; $d_dosuid = $Config{d_dosuid}; $binexp = $Config{binexp}; +if ($Is_VMS) { # Hang in there until File::Spec hits the big time + foreach ( \$installbin, \$installscript, \$installprivlib, + \$installarchlib, \$installsitelib, \$installsitearch, + \$installman1dir ) { + $$_ = unixify($$_); $$_ =~ s:/$::; + } +} + # Do some quick sanity checks. if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; } @@ -88,36 +116,50 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\n"; } -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' || $^O eq 'MSWin32' +-x 't/TEST' || $Is_W32 || warn "WARNING: You've never run 'make test'!!!", " (Installing anyway.)\n"; -if ($^O eq 'MSWin32') { +if ($Is_W32) { + +$perldll = 'perl.' . $dlext; +$perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i; --f 'perl.' . $dlext || die "No perl DLL built\n"; +-f $perldll || die "No perl DLL built\n"; # Install the DLL -safe_unlink("$installbin/perl.$dlext"); -copy("perl.$dlext", "$installbin/perl.$dlext"); -chmod(0755, "$installbin/perl.$dlext"); +safe_unlink("$installbin/$perldll"); +copy("$perldll", "$installbin/$perldll"); +chmod(0755, "$installbin/$perldll"); } +# This will be used to store the packlist +$packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); + # First we install the version-numbered executables. -if ($^O ne 'dos') { - safe_unlink("$installbin/perl$ver$exe_ext"); - copy("perl$exe_ext", "$installbin/perl$ver$exe_ext"); - chmod(0755, "$installbin/perl$ver$exe_ext"); +if ($Is_VMS) { + safe_unlink("$installbin/$perl$exe_ext"); + copy("perl$exe_ext", "$installbin/$perl$exe_ext"); + chmod(0755, "$installbin/$perl$exe_ext"); + safe_unlink("$installbin/${perl}shr$exe_ext"); + copy("perlshr$exe_ext", "$installbin/${perl}shr$exe_ext"); + chmod(0755, "$installbin/${perl}shr$exe_ext"); +} +elsif ($^O ne 'dos') { + safe_unlink("$installbin/$perl$ver$exe_ext"); + copy("perl$exe_ext", "$installbin/$perl$ver$exe_ext"); + chmod(0755, "$installbin/$perl$ver$exe_ext"); } else { - safe_unlink("$installbin/perl.exe"); - copy("perl.exe", "$installbin/perl.exe"); + safe_unlink("$installbin/$perl.exe"); + copy("perl.exe", "$installbin/$perl.exe"); } -safe_unlink("$installbin/sperl$ver$exe_ext"); +safe_unlink("$installbin/s$perl$ver$exe_ext"); if ($d_dosuid) { - copy("suidperl$exe_ext", "$installbin/sperl$ver$exe_ext"); - chmod(04711, "$installbin/sperl$ver$exe_ext"); + copy("suidperl$exe_ext", "$installbin/s$perl$ver$exe_ext"); + chmod(04711, "$installbin/s$perl$ver$exe_ext"); } # Install library files. @@ -145,11 +187,18 @@ else { # Install header files and libraries. mkpath("$installarchlib/CORE", 1, 0777); -@corefiles = <*.h libperl*.*>; -# AIX needs perl.exp installed as well. -push(@corefiles,'perl.exp') if $^O eq 'aix'; -# If they have built sperl.o... -push(@corefiles,'sperl.o') if -f 'sperl.o'; +if ($Is_VMS) { # We did core file selection during build + my $coredir = "lib/$Config{'arch'}/$]"; + $coredir =~ tr/./_/; + @corefiles = <$coredir/*.*>; +} +else { + @corefiles = <*.h libperl*.*>; + # AIX needs perl.exp installed as well. + push(@corefiles,'perl.exp') if $^O eq 'aix'; + # If they have built sperl.o... + push(@corefiles,'sperl.o') if -f 'sperl.o'; +} foreach $file (@corefiles) { # HP-UX (at least) needs to maintain execute permissions # on dynamically-loadable libraries. So we do it for all. @@ -161,10 +210,10 @@ foreach $file (@corefiles) { # Install main perl executables # Make links to ordinary names if installbin directory isn't current directory. -if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos')) { - 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 (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { + safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext"); + link("$installbin/$perl$ver$exe_ext", "$installbin/$perl$exe_ext"); + link("$installbin/s$perl$ver$exe_ext", "$installbin/suid$perl$exe_ext") if $d_dosuid; } @@ -172,11 +221,11 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos')) { $mainperl_is_instperl = 0; -if (!$versiononly && !$nonono && $^O ne 'MSWin32' && -t STDIN && -t STDERR +if (!$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -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"; + 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. @@ -236,11 +285,11 @@ if (! $versiononly) { # pstruct should be a link to c2ph if (! $versiononly) { - safe_unlink("$installscript/pstruct"); - if ($^O eq 'dos') { - copy("$installscript/c2ph","$installscript/pstruct"); + safe_unlink("$installscript/pstruct$scr_ext"); + if ($^O eq 'dos' or $Is_VMS) { + copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); } else { - link("$installscript/c2ph","$installscript/pstruct"); + link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); } } @@ -272,6 +321,7 @@ if (! $versiononly || !($installprivlib =~ m/\Q$]/)) { # Link perldiag.pod into archlib my ($from, $to) = ("${installprivlib}/pod/perldiag.pod", "${installarchlib}/pod/perldiag.pod"); + $packlist->{$to} = { from => $from, type => 'link' }; if (compare($from, $to) || $nonono) { mkpath("${installarchlib}/pod", 1, 0777); unlink($to); @@ -287,9 +337,16 @@ if (! $versiononly || !($installprivlib =~ m/\Q$]/)) { if (!$versiononly) { - $dirsep = ($^O eq 'os2' || $^O eq 'MSWin32') ? ';' : ':' ; + $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ; ($path = $ENV{"PATH"}) =~ s:\\:/:g ; @path = split(/$dirsep/, $path); + if ($Is_VMS) { + my $i = 0; + while (exists $ENV{'DCL$PATH' . $i}) { + $dir = unixpath($ENV{'DCL$PATH' . $i}); $dir =~ s-/$--; + push(@path,$dir); + } + } @otherperls = (); for (@path) { next unless m,^/,; @@ -297,11 +354,11 @@ if (!$versiononly) { # to $mainperldir (like SunOS) next if samepath($_, $binexp); next if ($mainperl_is_instperl && samepath($_, $mainperldir)); - push(@otherperls, "$_/perl$exe_ext") - if (-x "$_/perl$exe_ext" && ! -d "$_/perl$exe_ext"); + 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 " . + print STDERR "\nWarning: $perl appears in your path in the following " . "locations beyond where\nwe just installed it:\n"; for (@otherperls) { print STDERR " ", $_, "\n"; @@ -311,6 +368,7 @@ if (!$versiononly) { } +$packlist->write() unless $nono; print STDERR " Installation complete\n"; exit 0; @@ -331,9 +389,11 @@ sub unlink { local(@names) = @_; my($cnt) = 0; + return scalar(@names) if $Is_VMS; + foreach $name (@names) { next unless -e $name; - chmod 0777, $name if ($^O eq 'os2' || $^O eq 'MSWin32'); + chmod 0777, $name if ($Is_OS2 || $Is_W32); print STDERR " unlink $name\n"; ( CORE::unlink($name) and ++$cnt or warn "Couldn't unlink $name: $!\n" ) unless $nonono; @@ -342,11 +402,11 @@ sub unlink { } sub safe_unlink { - return if $nonono; + return if $nonono or $Is_VMS; local @names = @_; foreach $name (@names) { next unless -e $name; - chmod 0777, $name if ($^O eq 'os2' || $^O eq 'MSWin32'); + chmod 0777, $name if ($Is_OS2 || $Is_W32); print STDERR " unlink $name\n"; next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; @@ -384,12 +444,15 @@ sub link { ? die "AFS" # okay inside eval {} : warn "Couldn't link $from to $to: $!\n" unless $nonono; + $packlist->{$to} = { from => $from, type => 'link' }; }; if ($@) { + print STDERR " creating new version of $to\n" if $Is_VMS and -e $to; File::Copy::copy($from, $to) ? $success++ : warn "Couldn't copy $from to $to: $!\n" unless $nonono; + $packlist->{$to} = { type => 'file' }; } $success; } @@ -408,15 +471,17 @@ sub copy { my($from,$to) = @_; print STDERR " cp $from $to\n"; + print STDERR " creating new version of $to\n" if $Is_VMS and -e $to; File::Copy::copy($from, $to) || warn "Couldn't copy $from to $to: $!\n" unless $nonono; + $packlist->{$to} = { type => 'file' }; } sub samepath { local($p1, $p2) = @_; - return (lc($p1) eq lc($p2)) if ($^O eq 'MSWin32'); + return (lc($p1) eq lc($p2)) if $Is_W32; if ($p1 ne $p2) { local($dev1, $ino1, $dev2, $ino2); @@ -449,7 +514,7 @@ sub installlib { my $installlib = $installprivlib; if ($dir =~ /^auto/ || ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || - ($name =~ /^(.*)\.(?:h|lib)$/i && $^O eq 'MSWin32') + ($name =~ /^(.*)\.(?:h|lib)$/i && $Is_W32) ) { $installlib = $installarchlib; return unless $do_installarchlib; @@ -466,6 +531,7 @@ sub installlib { #This might not work because $archname might have changed. unlink("$installarchlib/$name"); } + $packlist->{"$installlib/$name"} = { type => 'file' }; if (compare($_, "$installlib/$name") || $nonono) { unlink("$installlib/$name"); mkpath("$installlib/$dir", 1, 0777); @@ -492,7 +558,9 @@ sub installlib { sub copy_if_diff { my($from,$to)=@_; + return 1 if (($^O eq 'VMS') && (-d $from)); -f $from || die "$0: $from not found"; + $packlist->{$to} = { type => 'file' }; if (compare($from, $to) || $nonono) { safe_unlink($to); # In case we don't have write permissions. if ($nonono) { @@ -500,7 +568,7 @@ sub copy_if_diff { } copy($from, $to); # Restore timestamps if it's a .a library or for OS/2. - if (!$nonono && ($^O eq 'os2' || $to =~ /\.a$/)) { + if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) { my ($atime, $mtime) = (stat $from)[8,9]; utime $atime, $mtime, $to; }