X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=f36b4c0d0543ead98b1b3d0eed0823dac0375e7b;hb=a7b657eec5c9a956f5411ffb5c1dacbd8d5b6c1b;hp=ac2cf82241fd1d12a7a79ba5b21dbc836ca1b2fc;hpb=360aca433d51a01ddd748b8606c6c288bdb2f7fc;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index ac2cf82..f36b4c0 100755 --- a/installperl +++ b/installperl @@ -8,12 +8,17 @@ BEGIN { } use strict; -use vars qw($Is_VMS $Is_W32 $Is_OS2 $nonono $versiononly $depth); +my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin, + $nonono, $dostrip, $versiononly, $silent, $verbose, + $otherperls, $archname,$Is_NetWare, $nwinstall, $nopods); +use vars qw /$depth/; BEGIN { $Is_VMS = $^O eq 'VMS'; $Is_W32 = $^O eq 'MSWin32'; $Is_OS2 = $^O eq 'os2'; + $Is_Cygwin = $^O eq 'cygwin'; + $Is_Darwin = $^O eq 'darwin'; if ($Is_VMS) { eval 'use VMS::Filespec;' } } @@ -26,7 +31,16 @@ use File::Path (); use ExtUtils::Packlist; use Config; use subs qw(unlink link chmod); -use vars qw($packlist); + +if ($Config{d_umask}) { + umask(022); # umasks like 077 aren't that useful for installations +} + +$Is_NetWare = $Config{osname} eq 'NetWare'; +if ($Is_NetWare) { + $Is_W32 = 0; + $scr_ext = '.pl'; +} # override the ones in the rest of the script sub mkpath { @@ -39,32 +53,78 @@ 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.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.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'; + $nwinstall = 1 if $ARGV[0] eq '-netware'; + $nopods = 1 if $ARGV[0] eq '-p'; + if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) { + print <<"EOT"; +Usage $0: [switches] + -n Don't actually run any commands; just print them. + -s Run strip on installed binaries. + -v Only install perl as a binary with the version number in the name. + (Override whatever config.sh says) + +v Install perl as "perl" and as a binary with the version number in + the name. (Override whatever config.sh says) + -S Silent mode. + -o Skip checking for other copies of perl in your PATH. + -V Verbose mode. + -A Also install perl with the architecture's name in the perl binary's + name. + -p Don't install the pod files. [This will break use diagnostics;] + -netware Install correctly on a Netware server. +EOT + exit; + } shift; } -umask 022 unless $Is_VMS; - -my @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 - pod/pod2usage pod/podchecker pod/podselect); +$versiononly = 1 if $Config{versiononly} && !defined $versiononly; +my (@scripts, @tolink); +open SCRIPTS, "utils.lst" or die "Can't open utils.lst: $!"; +while () { + next if /^#/; + next if /#\s*pod\s*=/; # Binary programs need separate treatment + chomp; + if (/(\S*)\s*#\s*link\s*=\s*(\S*)/) { + push @scripts, $1; + push @tolink, [$1, $2]; + } else { + push @scripts, $_; + } +} +close SCRIPTS; if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; } -my @pods = (); +my @pods = $nopods ? () : (); # Specify here any .pm files that are actually architecture-dependent. # (Those included with XS extensions under ext/ are automatically # added later.) # Now that the default privlib has the full perl version number included, -# we no longer have to play the trick of sticking version-specific .pm +# we no longer have to play the trick of sticking version-specific .pm # files under the archlib directory. my %archpms = ( - Config => 1, + Config => 1, + lib => 1, + Cwd => 1, ); if ($^O eq 'dos') { @@ -78,15 +138,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'}; @@ -104,6 +180,24 @@ my $libperl = $Config{libperl}; # Shared library and dynamic loading suffixes. 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`; + } +} + +if ($nwinstall) { + # This is required only if we are installing on a NetWare server + $installscript = $Config{installnwscripts}; + $installprivlib = $Config{installnwlib}; + $installarchlib = $Config{installnwlib}; + $installsitelib = $Config{installnwlib}; +} my $d_dosuid = $Config{d_dosuid}; my $binexp = $Config{binexp}; @@ -121,31 +215,62 @@ 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; +if (!$Is_NetWare) { -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"; - -if ($Is_W32) { - -my $perldll = 'perl.' . $dlext; -$perldll = 'perlcore.' . $dlext if $Config{'ccflags'} =~ /PERL_OBJECT/i; +-f 't/rantests' || $Is_W32 + || warn "WARNING: You've never run 'make test' or", + " some tests failed! (Installing anyway.)\n"; +} #if (!$Is_NetWare) + +if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { + my $perldll; + + if ($Is_Cygwin) { + $perldll = $libperl; + my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/; + $perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/; + $perldll =~ s/^lib/cyg/; + if ($Config{useshrplib} eq 'true') { + # install ld2 and perlld as well + foreach ('ld2', 'perlld') { + safe_unlink("$installbin/$_"); + copy("$_", "$installbin/$_"); + chmod(0755, "$installbin/$_"); + }; + { + open (LD2, ">$installbin/ld2"); + print LD2 "#!/bin/sh\n#\n# ld wrapper, passes all args to perlld;\n#\n" + . "for trythis in $installbin/perl\ndo\n if [ -x \$trythis ]\n" + . " then\n \$trythis $installbin/perlld \"\$\@\"\n" + . " exit \$?\n fi\ndone\n# hard luck!\necho i see no perl" + . " executable around there\necho perl is required to build " + . "dynamic libraries\necho look if the path to perl in /bin/ld2" + . " is correct\nexit 1\n"; + close LD2; + }; + chmod(0755, "$installbin/ld2"); + }; + } else { + $perldll = 'perl57.' . $dlext; + } --f $perldll || die "No perl DLL built\n"; + if ($dlsrc ne "dl_none.xs") { + -f $perldll || die "No perl DLL built\n"; + } + # Install the DLL -# Install the DLL + safe_unlink("$installbin/$perldll"); + copy("$perldll", "$installbin/$perldll"); + chmod(0755, "$installbin/$perldll"); -safe_unlink("$installbin/$perldll"); -copy("$perldll", "$installbin/$perldll"); -chmod(0755, "$installbin/$perldll"); -} +} # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) # This will be used to store the packlist my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); @@ -171,34 +296,51 @@ elsif ($^O eq 'mpeix') { link($Config{perlpath}, "$installbin/perl$ver$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"); + if (!$Is_NetWare) { + 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"); + chmod(0755, "$installbin/$perl_verbase$ver$exe_ext"); + } + else { + # If installing onto a NetWare server + if ($nwinstall) { + # Copy perl.nlm, echo.nlm, type.nlm, a2p.nlm & cgi2perl.nlm + mkpath($Config{installnwsystem}, 1, 0777); + copy("netware\\".$ENV{'MAKE_TYPE'}."\\perl.nlm", $Config{installnwsystem}); + copy("netware\\testnlm\\echo\\echo.nlm", $Config{installnwsystem}); + copy("netware\\testnlm\\type\\type.nlm", $Config{installnwsystem}); + copy("x2p\\a2p.nlm", $Config{installnwsystem}); + chmod(0755, "$Config{installnwsystem}\\perl.nlm"); + mkpath($Config{installnwlcgi}, 1, 0777); + copy("lib\\auto\\cgi2perl\\cgi2perl.nlm", $Config{installnwlcgi}); + } + } #if (!$Is_NetWare) } else { safe_unlink("$installbin/$perl.exe"); copy("perl.exe", "$installbin/$perl.exe"); } -safe_unlink("$installbin/s$perl$ver$exe_ext"); +safe_unlink("$installbin/s$perl_verbase$ver$exe_ext"); if ($d_dosuid) { - copy("suidperl$exe_ext", "$installbin/s$perl$ver$exe_ext"); - chmod(04711, "$installbin/s$perl$ver$exe_ext"); + copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext"); + chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext"); } # Install library files. 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, '.'); @@ -210,20 +352,22 @@ 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! @corefiles = <*.h libperl*.*>; + # AIX needs perl.exp installed as well. 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... @@ -232,33 +376,63 @@ else { foreach my $file (@corefiles) { # HP-UX (at least) needs to maintain execute permissions # on dynamically-loadable libraries. So we do it for all. - copy_if_diff($file,"$installarchlib/CORE/$file") - and chmod($file =~ /\.(so|\Q$dlext\E)$/ ? 0555 : 0444, - "$installarchlib/CORE/$file"); + if (copy_if_diff($file,"$installarchlib/CORE/$file")) { + if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) { + strip("-S", "$installarchlib/CORE/$file") if $^O =~ /^(rhapsody|darwin)$/; + chmod(0555, "$installarchlib/CORE/$file"); + } else { + chmod(0444, "$installarchlib/CORE/$file"); + } + } } # Install main perl executables # Make links to ordinary names if installbin directory isn't current directory. -if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { +if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS && ! $Is_NetWare) { safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext"); 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/perl$exe_ext"); + } elsif ($^O eq 'vos') { + # VOS doesn't support hard links, so use a symlink. + symlink("$installbin/$perl_verbase$ver$exe_ext", + "$installbin/$perl$exe_ext"); } else { - link("$installbin/$perl$ver$exe_ext", "$installbin/$perl$exe_ext"); + link("$installbin/$perl_verbase$ver$exe_ext", + "$installbin/$perl$exe_ext"); } - link("$installbin/s$perl$ver$exe_ext", "$installbin/suid$perl$exe_ext") + link("$installbin/s$perl_verbase$ver$exe_ext", + "$installbin/suid$perl$exe_ext") 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"); + } elsif ($^O eq 'vos') { + # VOS doesn't support hard links, so use a symlink. + symlink("$installbin/$perl_verbase$ver$exe_ext", + "$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' && - !$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR +if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && + !$versiononly && !$nonono && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR && -w $mainperldir && ! samepath($mainperldir, $installbin)) { my($usrbinperl) = "$mainperldir/$perl$exe_ext"; my($instperl) = "$installbin/$perl$exe_ext"; @@ -276,11 +450,7 @@ if ($Config{installusrbinperl} eq 'define' && (-l $usrbinperl) && ((readlink $usrbinperl) eq $expinstperl)); } - if ((! $mainperl_is_instperl) && - (yn("Many scripts expect perl to be installed as $usrbinperl.\n" . - "Do you wish to have $usrbinperl be the same as\n" . - "$expinstperl? [y] "))) - { + if (! $mainperl_is_instperl) { unlink($usrbinperl); ( $Config{'d_link'} eq 'define' && eval { CORE::link $instperl, $usrbinperl } ) || @@ -292,11 +462,13 @@ if ($Config{installusrbinperl} eq 'define' && } # Make links to ordinary names if installbin directory isn't current directory. - -if (!$versiononly && ! samepath($installbin, 'x2p')) { - safe_unlink("$installbin/a2p$exe_ext"); - copy("x2p/a2p$exe_ext", "$installbin/a2p$exe_ext"); - chmod(0755, "$installbin/a2p$exe_ext"); +if (!$Is_NetWare) { + if (!$versiononly && ! samepath($installbin, 'x2p')) { + safe_unlink("$installbin/a2p$exe_ext"); + copy("x2p/a2p$exe_ext", "$installbin/a2p$exe_ext"); + strip("$installbin/a2p$exe_ext"); + chmod(0755, "$installbin/a2p$exe_ext"); + } } # cppstdin is just a script, but it is architecture-dependent, so @@ -309,52 +481,79 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) { chmod(0755, "$installbin/cppstdin"); } -# Install scripts. +sub script_alias { + my ($installscript, $orig, $alias, $scr_ext) = @_; -mkpath($installscript, 1, 0777); + safe_unlink("$installscript/$alias$scr_ext"); + if ($^O eq 'dos' or $Is_VMS or $^O eq 'transit') { + copy("$installscript/$orig$scr_ext", + "$installscript/$alias$scr_ext"); + } elsif ($^O eq 'vos') { + symlink("$installscript/$orig$scr_ext", + "$installscript/$alias$scr_ext"); + } else { + link("$installscript/$orig$scr_ext", + "$installscript/$alias$scr_ext"); + } +} -if (! $versiononly) { +# Install scripts. +mkpath($installscript, $verbose, 0777); +if ($versiononly) { for (@scripts) { (my $base = $_) =~ s#.*/##; - copy($_, "$installscript/$base"); + $base .= $ver; + copy($_, "$installscript/$base"); chmod(0755, "$installscript/$base"); } -} -# pstruct should be a link to c2ph + for (@tolink) { + my ($from, $to) = map { "$_$ver" } @$_; + (my $frbase = $from) =~ s#.*/##; + (my $tobase = $to) =~ s#.*/##; + script_alias($installscript, $frbase, $tobase, $scr_ext); + } +} else { + for (@scripts) { + (my $base = $_) =~ s#.*/##; + copy($_, "$installscript/$base"); + chmod(0755, "$installscript/$base"); + } -if (! $versiononly) { - 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$scr_ext", "$installscript/pstruct$scr_ext"); + for (@tolink) { + my ($from, $to) = @$_; + (my $frbase = $from) =~ s#.*/##; + (my $tobase = $to) =~ s#.*/##; + script_alias($installscript, $frbase, $tobase, $scr_ext); } } -# Install pod pages. Where? I guess in $installprivlib/pod. +# Install pod pages. Where? I guess in $installprivlib/pod +# ($installprivlib/pods for cygwin). -unless ( $versiononly && !($installprivlib =~ m/\Q$]/)) { - mkpath("${installprivlib}/pod", 1, 0777); +my $pod = ($Is_Cygwin || $Is_Darwin) ? 'pods' : 'pod'; +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") { + if (open POD, "${installprivlib}/$pod/perldiag.pod") { read POD, $_, 4000; close POD; # Some of Perl 5.003's diagnostic messages ended with periods. if (/^=.*\.$/m) { - my ($from, $to) = ("${installprivlib}/pod/perldiag.pod", - "${installprivlib}/pod/perldiag-5.003.pod"); - print STDERR " rename $from $to"; + my ($from, $to) = ("${installprivlib}/$pod/perldiag.pod", + "${installprivlib}/$pod/perldiag-5.003.pod"); + print " rename $from $to"; rename($from, $to) or warn "Couldn't rename $from to $to: $!\n" unless $nonono; } } - foreach my $file (@pods) { - # $file is a name like pod/perl.pod - copy_if_diff($file, "${installprivlib}/${file}"); + for (@pods) { + # $_ is a name like pod/perl.pod + (my $base = $_) =~ s#.*/##; + copy_if_diff($_, "${installprivlib}/$pod/${base}"); } } @@ -365,9 +564,9 @@ 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); - my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ; +if (!$versiononly && $otherperls) { + my ($path, @path); + my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ; ($path = $ENV{"PATH"}) =~ s:\\:/:g ; @path = split(/$dirsep/, $path); if ($Is_VMS) { @@ -378,28 +577,31 @@ if (!$versiononly) { } } my @otherperls; + my %otherperls; for (@path) { next unless m,^/,; # Use &samepath here because some systems have other dirs linked # 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"); + my $otherperl = "$_/$perl$exe_ext"; + next if $otherperls{$otherperl}++; + push(@otherperls, $otherperl) + 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 STDERR " Installation complete\n"; +print " Installation complete\n" if $verbose; exit 0; @@ -423,9 +625,9 @@ sub unlink { foreach my $name (@names) { next unless -e $name; - chmod 0777, $name if ($Is_OS2 || $Is_W32); - print STDERR " unlink $name\n"; - ( CORE::unlink($name) and ++$cnt + chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin || $Is_NetWare); + print " unlink $name\n" if $verbose; + ( CORE::unlink($name) and ++$cnt or warn "Couldn't unlink $name: $!\n" ) unless $nonono; } return $cnt; @@ -436,12 +638,12 @@ sub safe_unlink { my @names = @_; foreach my $name (@names) { next unless -e $name; - chmod 0777, $name if ($Is_OS2 || $Is_W32); - print STDERR " unlink $name\n"; + chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_NetWare); + print " unlink $name\n" if $verbose; next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; if ($! =~ /busy/i) { - print STDERR " 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"; } @@ -455,7 +657,7 @@ sub safe_rename { for ($i = 1; $i < 50; $i++) { last if rename($to, "$to.$i"); } - warn("Cannot rename to `$to.$i': $!"), return 0 + warn("Cannot rename to `$to.$i': $!"), return 0 if $i >= 50; # Give up! } link($from,$to) || return 0; @@ -466,18 +668,21 @@ sub link { my($from,$to) = @_; my($success) = 0; - print STDERR " 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 STDERR " 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" @@ -491,7 +696,7 @@ sub chmod { my($mode,$name) = @_; return if ($^O eq 'dos'); - printf STDERR " 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; @@ -500,8 +705,8 @@ sub chmod { 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; + 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; @@ -511,7 +716,7 @@ sub copy { sub samepath { my($p1, $p2) = @_; - return (lc($p1) eq lc($p2)) if $Is_W32; + return (lc($p1) eq lc($p2)) if ($Is_W32 || $Is_NetWare); if ($p1 ne $p2) { my($dev1, $ino1, $dev2, $ino2); @@ -531,20 +736,22 @@ sub installlib { my $name = $_; - if ($name eq 'CVS' && -d $name) { + # Ignore RCS and CVS directories. + if (($name eq 'CVS' or $name eq 'RCS') and -d $name) { $File::Find::prune = 1; return; } - - # ignore patch backups and the .exists files. - return if $name =~ m{\.orig$|~$|^\.exists}; + + # ignore patch backups, RCS files, emacs backup & temp files and the + # .exists files, .PL files, and .t files. + return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$}; $name = "$dir/$name" if $dir ne ''; my $installlib = $installprivlib; if ($dir =~ /^auto/ || ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || - ($name =~ /^(.*)\.(?:h|lib)$/i && $Is_W32) + ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ) { $installlib = $installarchlib; return unless $do_installarchlib; @@ -564,12 +771,31 @@ 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") - and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444, - "$installlib/$name"); + if ($Is_NetWare && !$nwinstall) { + # Don't copy .nlp,.nlm files, doesn't make sense on Windows and also + # if copied will give problems when building new extensions. + # Has to be copied if we are installing on a NetWare server and hence + # the check !$nwinstall + if (!(/\.(?:nlp|nlm|bs)$/)) { + copy_if_diff($_, "$installlib/$name") + and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444, + "$installlib/$name"); + } + } else { + if (copy_if_diff($_, "$installlib/$name")) { + if ($name =~ /\.(so|$dlext)$/o) { + strip("-S", "$installlib/$name") if $^O =~ /^(rhapsody|darwin)$/; + chmod(0555, "$installlib/$name"); + } else { + strip("-S", "$installlib/$name") + if ($name =~ /\.a$/o and $^O =~ /^(rhapsody|darwin)$/); + chmod(0444, "$installlib/$name"); + } + } + } #if ($Is_NetWare) } } } @@ -587,7 +813,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. @@ -603,3 +829,28 @@ sub copy_if_diff { 1; } } + +sub strip +{ + my(@args) = @_; + + return unless $dostrip; + + my @opts; + while (@args && $args[0] =~ /^(-\w+)$/) { + push @opts, shift @args; + } + + foreach my $file (@args) { + if (-f $file) { + if ($verbose) { + print " strip " . join(' ', @opts); + print " " if (@opts); + print "$file\n"; + } + system("strip", @opts, $file); + } else { + print "# file '$file' skipped\n" if $verbose; + } + } +}