X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=a58f8e5a5363b82de7e2f37b3b0b01d34a8b4284;hb=2986a63f7e513cf37f46db9f211b77071260031f;hp=84e51f4c3d4496cde9442c4b90e21cacb825639c;hpb=03284eb6ec827d07c030082154485bd4c4cf4a37;p=p5sagit%2Fp5-mst-13.2.git diff --git a/installperl b/installperl index 84e51f4..a58f8e5 100755 --- a/installperl +++ b/installperl @@ -9,7 +9,7 @@ BEGIN { use strict; my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $nonono, $dostrip, - $versiononly, $silent, $verbose, $otherperls); + $versiononly, $silent, $verbose, $otherperls, $archname,$Is_NetWare, $nwinstall); use vars qw /$depth/; BEGIN { @@ -30,6 +30,12 @@ use ExtUtils::Packlist; use Config; use subs qw(unlink link chmod); +$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 { File::Path::mkpath(@_) unless $nonono; @@ -54,17 +60,30 @@ 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'; + $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'; shift; } -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 - 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; } @@ -78,6 +97,7 @@ my @pods = (); # files under the archlib directory. my %archpms = ( Config => 1, + lib => 1, ); if ($^O eq 'dos') { @@ -114,7 +134,7 @@ find(sub { # print "[$_]\n" for sort keys %archpms; my $ver = $Config{version}; -my $release = substr($],0,3); # Not used presently. +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" @@ -134,6 +154,23 @@ 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`; + } +} + +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}; @@ -156,14 +193,16 @@ if ($d_dosuid && $>) { die "You must run as root to install suidperl\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; --f 't/ran_tests' || $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_NetWare) -if ($Is_W32 or $Is_Cygwin) { +if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { my $perldll; if ($Is_Cygwin) { @@ -178,7 +217,7 @@ if ($Is_W32 or $Is_Cygwin) { }; }; } else { - $perldll = 'perl56.' . $dlext; + $perldll = 'perl57.' . $dlext; } if ($dlsrc ne "dl_none.xs") { @@ -190,7 +229,7 @@ if ($Is_W32 or $Is_Cygwin) { copy("$perldll", "$installbin/$perldll"); chmod(0755, "$installbin/$perldll"); -} # if ($Is_W32 or $Is_Cygwin) +} # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) # This will be used to store the packlist my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); @@ -216,10 +255,26 @@ elsif ($^O eq 'mpeix') { link($Config{perlpath}, "$installbin/perl$ver$exe_ext"); } 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"); - chmod(0755, "$installbin/$perl_verbase$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"); @@ -293,7 +348,7 @@ foreach my $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') && ! $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. @@ -308,12 +363,27 @@ 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} && $Config{installusrbinperl} eq 'define' && - !$versiononly && !$nonono && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR + !$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"; @@ -347,11 +417,12 @@ if ($Config{installusrbinperl} && $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"); + chmod(0755, "$installbin/a2p$exe_ext"); + } } # cppstdin is just a script, but it is architecture-dependent, so @@ -364,26 +435,47 @@ if (! $versiononly && (-f 'cppstdin') && (! samepath($installbin, '.'))) { chmod(0755, "$installbin/cppstdin"); } -# Install scripts. +sub script_alias { + my ($installscript, $orig, $alias, $scr_ext) = @_; + 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"); + } else { + link("$installscript/$orig$scr_ext", + "$installscript/$alias$scr_ext"); + } +} + +# Install scripts. mkpath($installscript, $verbose, 0777); +if ($versiononly) { + for (@scripts) { + (my $base = $_) =~ s#.*/##; + $base .= $ver; + copy($_, "$installscript/$base"); + chmod(0755, "$installscript/$base"); + } -if (! $versiononly) { + 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"); } -} -# pstruct should be a link to c2ph - -if (! $versiononly) { - safe_unlink("$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"); + for (@tolink) { + my ($from, $to) = @$_; + (my $frbase = $from) =~ s#.*/##; + (my $tobase = $to) =~ s#.*/##; + script_alias($installscript, $frbase, $tobase, $scr_ext); } } @@ -391,7 +483,7 @@ if (! $versiononly) { # ($installprivlib/pods for cygwin). my $pod = $Is_Cygwin ? 'pods' : 'pod'; -unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) { +if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) { mkpath("${installprivlib}/$pod", $verbose, 0777); # If Perl 5.003's perldiag.pod is there, rename it. @@ -425,7 +517,7 @@ unless ( $versiononly && !($installprivlib =~ m/\Q$ver/)) { if (!$versiononly && $otherperls) { my ($path, @path); - my $dirsep = ($Is_OS2 || $Is_W32) ? ';' : ':' ; + my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ; ($path = $ENV{"PATH"}) =~ s:\\:/:g ; @path = split(/$dirsep/, $path); if ($Is_VMS) { @@ -470,7 +562,7 @@ sub yn { my($prompt) = @_; my($answer); my($default) = $prompt =~ m/\[([yn])\]\s*$/i; - warn $prompt; + print STDERR $prompt; chop($answer = ); $answer = $default if $answer =~ m/^\s*$/; ($answer =~ m/^[yY]/); @@ -484,7 +576,7 @@ sub unlink { foreach my $name (@names) { next unless -e $name; - chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin); + 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; @@ -497,7 +589,7 @@ sub safe_unlink { my @names = @_; foreach my $name (@names) { next unless -e $name; - chmod 0777, $name if ($Is_OS2 || $Is_W32); + 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"; @@ -575,7 +667,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); @@ -602,15 +694,15 @@ 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 ''; 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; @@ -633,9 +725,21 @@ sub installlib { 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, + 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 { + copy_if_diff($_, "$installlib/$name") + and chmod($name =~ /\.(so|$dlext)$/o ? 0555 : 0444, "$installlib/$name"); + } #if ($Is_NetWare) } } }