X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=4a77415d91b005298e1e80ae5e9714b196b32a25;hb=218659229ea7e7f2d98c1a7697e6218c585dfb37;hp=1bc5a8e9d221aad1f3237aaf320b5c6bb08ff2bc;hpb=4fabb5965cb13ba2085b455bf751c89110c43659;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index 1bc5a8e..4a77415 100755 --- a/installperl +++ b/installperl @@ -8,7 +8,9 @@ BEGIN { } use strict; -use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $nonono $versiononly $depth); +my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip, + $versiononly, $silent, $verbose, $otherperls, $archname); +use vars qw /$depth/; BEGIN { $Is_VMS = $^O eq 'VMS'; @@ -27,7 +29,6 @@ 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 { @@ -40,20 +41,29 @@ my $exe_ext = $Config{exe_ext}; # Allow ``make install PERLNAME=something_besides_perl'': my $perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl'; -# This is the base used for versioned names, like "perl5.005". +# This is the base used for versioned names, like "perl5.6.0". # It's separate because a common use of $PERLNAME is to install # perl as "perl5", if that's used as base for versioned files you -# get "perl55.005". +# get "perl55.6.0". my $perl_verbase = defined($ENV{PERLNAME_VERBASE}) ? $ENV{PERLNAME_VERBASE} : $perl; +$otherperls = 1; while (@ARGV) { $nonono = 1 if $ARGV[0] eq '-n'; + $dostrip = 1 if $ARGV[0] eq '-s'; $versiononly = 1 if $ARGV[0] eq '-v'; + $versiononly = 0 if $ARGV[0] eq '+v'; + $silent = 1 if $ARGV[0] eq '-S'; + $otherperls = 0 if $ARGV[0] eq '-o'; + $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n'; + $archname = 1 if $ARGV[0] eq '-A'; shift; } +$versiononly = 1 if $Config{versiononly} && !defined $versiononly; + my @scripts = qw(utils/c2ph utils/h2ph utils/h2xs utils/perlbug utils/perldoc utils/pl2pm utils/splain utils/perlcc utils/dprofpp x2p/s2p x2p/find2perl @@ -72,6 +82,7 @@ my @pods = (); # files under the archlib directory. my %archpms = ( Config => 1, + lib => 1, ); if ($^O eq 'dos') { @@ -85,15 +96,31 @@ if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) } find(sub { - if ("$File::Find::dir/$_" =~ m{^ext/[^/]+/(.*)\.pm$}) { - (my $pm = $1) =~ s{^lib/}{}; - $archpms{$pm} = 1; + if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) { + my($path, $modname) = ($1,$2); + + # strip trailing component first + $path =~ s{/[^/]*$}{}; + + # strip optional "/lib"; + $path =~ s{/lib\b}{}; + + # strip any leading / + $path =~ s{^/}{}; + + # reconstitute canonical module name + $modname = "$path/$modname" if length $path; + + # remember it + $archpms{$modname} = 1; } }, 'ext'); -my $ver = $]; -my $release = substr($ver,0,3); # Not used presently. -my $patchlevel = substr($ver,3,2); +# print "[$_]\n" for sort keys %archpms; + +my $ver = $Config{version}; +my $release = substr($],0,3); # Not used currently. +my $patchlevel = substr($],3,2); die "Patchlevel of perl ($patchlevel)", "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n" if $patchlevel != $Config{'PERL_VERSION'}; @@ -112,6 +139,15 @@ my $libperl = $Config{libperl}; my $so = $Config{so}; my $dlext = $Config{dlext}; my $dlsrc = $Config{dlsrc}; +if ($^O eq 'os390') { + my $pwd; + chomp($pwd=`pwd`); + my $archlibexp = $Config{archlibexp}; + my $usedl = $Config{usedl}; + if ($usedl eq 'define') { + `./$^X -pibak -e 's{$pwd\/libperl.x}{$archlibexp/CORE/libperl.x}' lib/Config.pm`; + } +} my $d_dosuid = $Config{d_dosuid}; my $binexp = $Config{binexp}; @@ -129,7 +165,7 @@ if ($Is_VMS) { # Hang in there until File::Spec hits the big time 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 || mkpath($installbin, $verbose, 0777); -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; @@ -137,37 +173,36 @@ 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' || $Is_W32 - || warn "WARNING: You've never run 'make test'!!!", - " (Installing anyway.)\n"; +-f 't/rantests' || $Is_W32 + || warn "WARNING: You've never run 'make test' or", + " some tests failed! (Installing anyway.)\n"; if ($Is_W32 or $Is_Cygwin) { my $perldll; -if ($Is_Cygwin) { - $perldll = $libperl; - $perldll =~ s/(\..*)?$/.$dlext/; - if ($Config{useshrplib} eq 'true') { - # install ld2 and perlld as well - foreach ('ld2', 'perlld') { - safe_unlink("$installbin/$_"); - copy("$_", "$installbin/$_"); - chmod(0755, "$installbin/$_"); + if ($Is_Cygwin) { + $perldll = $libperl; + $perldll =~ s/(\..*)?$/.$dlext/; + if ($Config{useshrplib} eq 'true') { + # install ld2 and perlld as well + foreach ('ld2', 'perlld') { + safe_unlink("$installbin/$_"); + copy("$_", "$installbin/$_"); + chmod(0755, "$installbin/$_"); + }; }; - }; -} else { - $perldll = 'perl.' . $dlext; - $perldll = 'perl56.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i; -} - - if ($dlsrc ne "dl_none.xs") { - -f $perldll || die "No perl DLL built\n"; - } -# Install the DLL - - safe_unlink("$installbin/$perldll"); - copy("$perldll", "$installbin/$perldll"); - chmod(0755, "$installbin/$perldll"); + } else { + $perldll = 'perl57.' . $dlext; + } + + if ($dlsrc ne "dl_none.xs") { + -f $perldll || die "No perl DLL built\n"; + } + # Install the DLL + + safe_unlink("$installbin/$perldll"); + copy("$perldll", "$installbin/$perldll"); + chmod(0755, "$installbin/$perldll"); } # if ($Is_W32 or $Is_Cygwin) @@ -197,7 +232,7 @@ elsif ($^O eq 'mpeix') { elsif ($^O ne 'dos') { safe_unlink("$installbin/$perl_verbase$ver$exe_ext"); copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext"); - strip("$installbin/$perl_verbase$ver$exe_ext") if $^O =~ /^(rhapsody)$/; + strip("$installbin/$perl_verbase$ver$exe_ext"); chmod(0755, "$installbin/$perl_verbase$ver$exe_ext"); } else { @@ -215,15 +250,15 @@ if ($d_dosuid) { my ($do_installarchlib, $do_installprivlib) = (0, 0); -mkpath($installprivlib, 1, 0777); -mkpath($installarchlib, 1, 0777); -mkpath($installsitelib, 1, 0777) if ($installsitelib); -mkpath($installsitearch, 1, 0777) if ($installsitearch); +mkpath($installprivlib, $verbose, 0777); +mkpath($installarchlib, $verbose, 0777); +mkpath($installsitelib, $verbose, 0777) if ($installsitelib); +mkpath($installsitearch, $verbose, 0777) if ($installsitearch); if (chdir "lib") { $do_installarchlib = ! samepath($installarchlib, '.'); $do_installprivlib = ! samepath($installprivlib, '.'); - $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$]/); + $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$ver/); if ($do_installarchlib || $do_installprivlib) { find(\&installlib, '.'); @@ -235,12 +270,12 @@ else { } # Install header files and libraries. -mkpath("$installarchlib/CORE", 1, 0777); +mkpath("$installarchlib/CORE", $verbose, 0777); my @corefiles; if ($Is_VMS) { # We did core file selection during build - my $coredir = "lib/$Config{'arch'}/$]"; + my $coredir = "lib/$Config{archname}/$ver/CORE"; $coredir =~ tr/./_/; - @corefiles = <$coredir/*.*>; + map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>; } else { # [als] hard-coded 'libperl' name... not good! @@ -250,7 +285,7 @@ else { push(@corefiles,'perl.exp') if $^O eq 'aix'; if ($^O eq 'mpeix') { # MPE needs mpeixish.h installed as well. - mkpath("$installarchlib/CORE/mpeix", 1, 0777); + mkpath("$installarchlib/CORE/mpeix", $verbose, 0777); push(@corefiles,'mpeix/mpeixish.h'); } # If they have built sperl.o... @@ -260,9 +295,9 @@ foreach my $file (@corefiles) { # HP-UX (at least) needs to maintain execute permissions # on dynamically-loadable libraries. So we do it for all. if (copy_if_diff($file,"$installarchlib/CORE/$file")) { - if ($file =~ /\.(so|\Q$dlext\E)$/) { + if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) { chmod(0555, "$installarchlib/CORE/$file"); - strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody)$/; + strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/; } else { chmod(0444, "$installarchlib/CORE/$file"); } @@ -287,11 +322,26 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM if $d_dosuid; } +# For development purposes it can be very useful to have multiple perls +# build for different "architectures" (eg threading or not) simultaneously. +if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { + my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext"; + safe_unlink("$installbin/$archperl"); + if ($^O eq 'mpeix') { + # MPE doesn't support hard links, so use a symlink. + # We don't want another cloned copy. + symlink($Config{perlpath}, "$installbin/$archperl"); + } else { + link("$installbin/$perl_verbase$ver$exe_ext", + "$installbin/$archperl"); + } +} + # Offer to install perl in a "standard" location my $mainperl_is_instperl = 0; -if ($Config{installusrbinperl} eq 'define' && +if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && !$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR && -w $mainperldir && ! samepath($mainperldir, $installbin)) { my($usrbinperl) = "$mainperldir/$perl$exe_ext"; @@ -343,26 +393,25 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) { chmod(0755, "$installbin/cppstdin"); } -# Install scripts. +if (! $versiononly) { + # Install scripts. -mkpath($installscript, 1, 0777); + mkpath($installscript, $verbose, 0777); -if (! $versiononly) { for (@scripts) { (my $base = $_) =~ s#.*/##; copy($_, "$installscript/$base"); chmod(0755, "$installscript/$base"); } -} -# pstruct should be a link to c2ph - -if (! $versiononly) { + # pstruct should be a link to c2ph safe_unlink("$installscript/pstruct$scr_ext"); - if ($^O eq 'dos' or $Is_VMS) { - copy("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); + if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') { + copy("$installscript/c2ph$scr_ext", + "$installscript/pstruct$scr_ext"); } else { - link("$installscript/c2ph$scr_ext", "$installscript/pstruct$scr_ext"); + link("$installscript/c2ph$scr_ext", + "$installscript/pstruct$scr_ext"); } } @@ -370,8 +419,8 @@ if (! $versiononly) { # ($installprivlib/pods for cygwin). my $pod = $Is_Cygwin ? 'pods' : 'pod'; -unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) { - mkpath("${installprivlib}/$pod", 1, 0777); +if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) { + mkpath("${installprivlib}/$pod", $verbose, 0777); # If Perl 5.003's perldiag.pod is there, rename it. if (open POD, "${installprivlib}/$pod/perldiag.pod") { @@ -402,8 +451,8 @@ unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) { # Also skip $mainperl if the user opted to have it be a link to the # installed perl. -if (!$versiononly) { - my ($path, @path); +if (!$versiononly && $otherperls) { + my ($path, @path); my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ; ($path = $ENV{"PATH"}) =~ s:\\:/:g ; @path = split(/$dirsep/, $path); @@ -428,18 +477,18 @@ if (!$versiononly) { if (-x $otherperl && ! -d $otherperl); } if (@otherperls) { - print STDERR "\nWarning: $perl appears in your path in the following " . + warn "\nWarning: $perl appears in your path in the following " . "locations beyond where\nwe just installed it:\n"; for (@otherperls) { - print STDERR " ", $_, "\n"; + warn " ", $_, "\n"; } - print STDERR "\n"; + warn "\n"; } } $packlist->write() unless $nonono; -print " Installation complete\n"; +print " Installation complete\n" if $verbose; exit 0; @@ -449,7 +498,7 @@ sub yn { my($prompt) = @_; my($answer); my($default) = $prompt =~ m/\[([yn])\]\s*$/i; - print $prompt; + print STDERR $prompt; chop($answer = ); $answer = $default if $answer =~ m/^\s*$/; ($answer =~ m/^[yY]/); @@ -464,7 +513,7 @@ sub unlink { foreach my $name (@names) { next unless -e $name; chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin); - print " unlink $name\n"; + print " unlink $name\n" if $verbose; ( CORE::unlink($name) and ++$cnt or warn "Couldn't unlink $name: $!\n" ) unless $nonono; } @@ -477,11 +526,11 @@ sub safe_unlink { foreach my $name (@names) { next unless -e $name; chmod 0777, $name if ($Is_OS2 || $Is_W32); - print " unlink $name\n"; + print " unlink $name\n" if $verbose; next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; if ($! =~ /busy/i) { - print " mv $name $name.old\n"; + print " mv $name $name.old\n" if $verbose; safe_rename($name, "$name.old") or warn "Couldn't rename $name: $!\n"; } @@ -506,18 +555,21 @@ sub link { my($from,$to) = @_; my($success) = 0; - print " ln $from $to\n"; + print $verbose ? " ln $from $to\n" : " $to\n" unless $silent; eval { CORE::link($from, $to) ? $success++ : ($from =~ m#^/afs/# || $to =~ m#^/afs/#) ? die "AFS" # okay inside eval {} - : warn "Couldn't link $from to $to: $!\n" + : die "Couldn't link $from to $to: $!\n" unless $nonono; $packlist->{$to} = { from => $from, type => 'link' }; }; if ($@) { - print " creating new version of $to\n" if $Is_VMS and -e $to; + warn $@; + print $verbose ? " cp $from $to\n" : " $to\n" unless $silent; + print " creating new version of $to\n" + if $Is_VMS and -e $to and !$silent; File::Copy::copy($from, $to) ? $success++ : warn "Couldn't copy $from to $to: $!\n" @@ -531,7 +583,7 @@ sub chmod { my($mode,$name) = @_; return if ($^O eq 'dos'); - printf " chmod %o %s\n", $mode, $name; + printf " chmod %o %s\n", $mode, $name if $verbose; CORE::chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name) unless $nonono; @@ -540,8 +592,8 @@ sub chmod { sub copy { my($from,$to) = @_; - print " cp $from $to\n"; - print " creating new version of $to\n" if $Is_VMS and -e $to; + print $verbose ? " cp $from $to\n" : " $to\n" unless $silent; + print " creating new version of $to\n" if $Is_VMS and -e $to and !$silent; File::Copy::copy($from, $to) || warn "Couldn't copy $from to $to: $!\n" unless $nonono; @@ -578,8 +630,8 @@ sub installlib { } # ignore patch backups, RCS files, emacs backup & temp files and the - # .exists files. - return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists}; + # .exists files, and .PL files. + return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$}; $name = "$dir/$name" if $dir ne ''; @@ -606,7 +658,7 @@ sub installlib { $packlist->{"$installlib/$name"} = { type => 'file' }; if (compare($_, "$installlib/$name") || $nonono) { unlink("$installlib/$name"); - mkpath("$installlib/$dir", 1, 0777); + mkpath("$installlib/$dir", $verbose, 0777); # HP-UX (at least) needs to maintain execute permissions # on dynamically-loaded libraries. copy_if_diff($_, "$installlib/$name") @@ -629,7 +681,7 @@ sub installlib { sub copy_if_diff { my($from,$to)=@_; return 1 if (($^O eq 'VMS') && (-d $from)); - -f $from || die "$0: $from not found"; + -f $from || warn "$0: $from not found"; $packlist->{$to} = { type => 'file' }; if (compare($from, $to) || $nonono) { safe_unlink($to); # In case we don't have write permissions. @@ -650,6 +702,8 @@ sub strip { my(@args) = @_; + return unless $dostrip; + my @opts; while (@args && $args[0] =~ /^(-\w+)$/) { push @opts, shift @args; @@ -657,10 +711,10 @@ sub strip foreach my $file (@args) { if (-f $file) { - print " strip $file\n"; + print " strip $file\n" if $verbose; system("strip", @opts, $file); } else { - print "# file '$file' skipped\n"; + print "# file '$file' skipped\n" if $verbose; } } }