X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/de35015f267ee44f8399bcbd9a5a555bd4d5e711..HEAD:/installperl diff --git a/installperl b/installperl index a5df4d6..3c8af53 100755 --- a/installperl +++ b/installperl @@ -11,8 +11,8 @@ BEGIN { } use strict; -use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare $Is_AmigaOS - %opts $packlist); +our ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin, $Is_AmigaOS, + %opts, $packlist); my $versiononly; BEGIN { @@ -39,11 +39,6 @@ use Getopt::Long qw(:config nogetopt_compat no_auto_abbrev noignorecase); require './Porting/pod_lib.pl'; -if ($Is_NetWare) { - $Is_W32 = 0; - $scr_ext = '.pl'; -} - my $mainperldir = "/usr/bin"; my $exe_ext = $Config{exe_ext}; @@ -77,7 +72,7 @@ $opts{destdir} = ''; my $usage = 0; if (!GetOptions(\%opts, 'notify|n', 'strip|s', 'silent|S', 'skip-otherperls|o', 'force|f', 'verbose|V', 'archname|A', - 'netware', 'nopods|p', 'destdir:s', 'help|h|?', + 'nopods|p', 'destdir:s', 'help|h|?', 'versiononly|v' => \$versiononly, '<>' => sub { if ($_[0] eq '+v') { $versiononly = 0; @@ -107,7 +102,6 @@ Usage $0: [switches] -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. -destdir Prefix installation directories by this string. -h Display this help message. EOT @@ -143,11 +137,6 @@ my %archpms = ( lib => 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)); } @@ -216,14 +205,6 @@ if ($^O eq 'os390') { } } -if ($opts{netware}) { - # 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 $binexp = $Config{binexp}; if ($Is_VMS) { # Hang in there until File::Spec hits the big time @@ -242,7 +223,6 @@ if ($Is_VMS) { # Hang in there until File::Spec hits the big time -w $installbin || $opts{notify} || die "$installbin is not writable by you\n" unless $installbin =~ m#^/afs/# || $opts{notify}; -if (!$Is_NetWare) { if (!$Is_VMS) { -x 'perl' . $exe_ext || die "perl isn't executable!\n"; } @@ -256,12 +236,11 @@ else { -f 't/rantests' || $Is_W32 || warn "WARNING: You've never run 'make test' or", " some tests failed! (Installing anyway.)\n"; -} #if (!$Is_NetWare) # This will be used to store the packlist $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist"); -if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { +if ($Is_W32 or $Is_Cygwin) { my $perldll; if ($Is_Cygwin) { @@ -279,7 +258,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { copy("$perldll", "$installbin/$perldll"); chmod(0755, "$installbin/$perldll"); $packlist->{"$Config{installbin}/$perldll"} = { type => 'file' }; -} # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) +} # if ($Is_W32 or $Is_Cygwin) # First we install the version-numbered executables. @@ -299,30 +278,13 @@ if ($Is_VMS) { chmod(0755, "$installbin/$ndbg$perl$exe_ext"); } } -elsif ($^O ne 'dos') { - 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 ($opts{netware}) { - # Copy perl.nlm, echo.nlm, type.nlm & cgi2perl.nlm - mkpath($Config{installnwsystem}); - 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}); - chmod(0755, "$Config{installnwsystem}\\perl.nlm"); - mkpath($Config{installnwlcgi}); - 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/$perl_verbase$ver$exe_ext"); + copy("perl$exe_ext", "$installbin/$perl_verbase$ver$exe_ext"); + strip("$installbin/$perl_verbase$ver$exe_ext"); + fix_dep_names("$installbin/$perl_verbase$ver$exe_ext"); + chmod(0755, "$installbin/$perl_verbase$ver$exe_ext"); + `chtag -r "$installbin/$perl_verbase$ver$exe_ext"` if ($^O eq 'os390'); } # Install library files. @@ -373,6 +335,8 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy ( copy("$installbin/$libperl", $coredll) && push(@corefiles, $instcoredll) ) +} elsif ($Is_W32) { + @corefiles = <*.h>; } else { # [als] hard-coded 'libperl' name... not good! @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>; @@ -386,17 +350,26 @@ foreach my $file (@corefiles) { if (copy_if_diff($file,"$installarchlib/CORE/$file")) { if ($file =~ /\.(\Q$so\E|\Q$dlext\E)$/) { strip("-S", "$installarchlib/CORE/$file") if $^O eq 'darwin'; + fix_dep_names("$installarchlib/CORE/$file"); chmod($SO_MODE, "$installarchlib/CORE/$file"); } else { chmod($NON_SO_MODE, "$installarchlib/CORE/$file"); } + `chtag -r "$installarchlib/CORE/$file"` if ($^O eq 'os390'); } } +if ($Is_W32) { #linking lib isn't made in root but in CORE on Win32 + @corefiles = ; + my $dest; + copy_if_diff($_,($dest = $installarchlib.substr($_,3))) && + chmod($NON_SO_MODE, $dest) foreach @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 && ! $Is_NetWare) { +if (! $versiononly && ! samepath($installbin, '.') && ! $Is_VMS) { safe_unlink("$installbin/$perl$exe_ext", "$installbin/suid$perl$exe_ext"); if ($^O eq 'vos') { # VOS doesn't support hard links, so use a symlink. @@ -410,7 +383,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM # For development purposes it can be very useful to have multiple perls # build for different "architectures" (eg threading or not) simultaneously. -if ($opts{archname} && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) { +if ($opts{archname} && ! samepath($installbin, '.') && ! $Is_VMS) { my $archperl = "$perl_verbase$ver-$Config{archname}$exe_ext"; safe_unlink("$installbin/$archperl"); if ($^O eq 'vos') { @@ -427,7 +400,7 @@ if ($opts{archname} && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_V my $mainperl_is_instperl = 0; if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && - !$versiononly && !$opts{notify} && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR + !$versiononly && !$opts{notify} && !$Is_W32 && !$Is_VMS && -t STDIN && -t STDERR && -w $mainperldir && ! samepath($mainperldir, $installbin)) { my($usrbinperl) = "$mainperldir/$perl$exe_ext"; my($instperl) = "$installbin/$perl$exe_ext"; @@ -451,6 +424,7 @@ if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' && eval { CORE::link $instperl, $usrbinperl } ) || eval { symlink $expinstperl, $usrbinperl } || copy($instperl, $usrbinperl); + `chtag -r "$usrbinperl"` if ($^O eq 'os390'); $mainperl_is_instperl = 1; } @@ -470,7 +444,7 @@ 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') { + if ($Is_VMS or $^O eq 'transit') { copy("$installscript/$orig$scr_ext", "$installscript/$alias$scr_ext"); } elsif ($^O eq 'vos') { @@ -532,49 +506,6 @@ if (!$opts{nopods} && (!$versiononly || ($installprivlib =~ m/\Q$vershort/))) { } -# Check to make sure there aren't other perls around in installer's -# path. This is probably UNIX-specific. Check all absolute directories -# in the path except for where public executables are supposed to live. -# Also skip $mainperl if the user opted to have it be a link to the -# installed perl. - -if (!$versiononly && !$opts{'skip-otherperls'}) { - my ($path, @path); - my $dirsep = ($Is_OS2 || $Is_W32 || $Is_NetWare) ? ';' : ':' ; - ($path = $ENV{"PATH"}) =~ s:\\:/:g ; - @path = split(/$dirsep/, $path); - if ($Is_VMS) { - my $i = 0; - while (exists $ENV{'DCL$PATH' . $i}) { - my $dir = unixpath($ENV{'DCL$PATH' . $i}); $dir =~ s-/$--; - push(@path,$dir); - } - } - my @otherperls; - my %otherperls; - for (@path) { - next unless m,^/,; - # Use &samepath here because some systems have other dirs linked - # to $mainperldir (like SunOS) - next unless -d; - next if samepath($_, $binexp); - next if samepath($_, cwd()); - next if ($mainperl_is_instperl && samepath($_, $mainperldir)); - my $otherperl = "$_/$perl$exe_ext"; - next if $otherperls{$otherperl}++; - push(@otherperls, $otherperl) - if (-x $otherperl && ! -d $otherperl); - } - if (@otherperls) { - warn "\nWarning: $perl appears in your path in the following " . - "locations beyond where\nwe just installed it:\n"; - for (@otherperls) { - warn " ", $_, "\n"; - } - warn "\n"; - } - -} $packlist->write() unless $opts{notify}; print " Installation complete\n" if $opts{verbose}; @@ -601,7 +532,7 @@ sub safe_unlink { my @names = @_; foreach my $name (@names) { next unless -e $name; - chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_NetWare); + chmod 0777, $name if ($Is_OS2 || $Is_W32); print " unlink $name\n" if $opts{verbose}; next if CORE::unlink($name); warn "Couldn't unlink $name: $!\n"; @@ -671,8 +602,8 @@ sub installlib { return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|ptardiff|ptargrep|zipdetails)\z/; # ignore the Makefiles return if $name =~ /^makefile$/i; - # ignore the test extensions - return if $dir =~ m{\bXS/(?:APItest|Typemap)\b}; + # ignore the test extensions, dont install PPPort.so/.dll + return if $dir =~ m{\b(?:XS/(?:APItest|Typemap)|Devel/PPPort)\b}; return if $name =~ m{\b(?:APItest|Typemap)\.pm$}; # ignore the build support code return if $name =~ /\bbuildcustomize\.pl$/; @@ -715,10 +646,13 @@ sub installlib { return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS; + #blead comes with version, blead isn't 5.8/5.6 + return if $name eq 'ExtUtils/MakeMaker/version/regex.pm'; + my $installlib = $installprivlib; if ($dir =~ /^auto\// || ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || - ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) || + ($name =~ /^(.*)\.(?:h|lib)$/i && $Is_W32) || $name=~/^Config_(heavy|git)\.pl\z/ ) { $installlib = $installarchlib; @@ -727,14 +661,6 @@ sub installlib { return unless $do_installprivlib; } - if ($Is_NetWare && !$opts{netware} && /\.(?:nlp|nlm|bs)$/) { - # 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 !$opts{netware} - return; - } - if (-f $_) { my $xname = "$installlib/$name"; $xname =~ s/^\Q$opts{destdir}\E//; @@ -793,6 +719,7 @@ sub copy_if_diff { my ($atime, $mtime) = (stat $from)[8,9]; utime $atime, $mtime, $to; } + `chtag -r "$to"` if ($^O eq "os390"); 1; } } @@ -822,4 +749,27 @@ sub strip } } +sub fix_dep_names { + my $file = shift; + + $^O eq "darwin" && $Config{osvers} =~ /^(1[5-9]|[2-9])/ + && $Config{useshrplib} + or return; + + my @opts; + my $so = $Config{so}; + my $libperl = "$Config{archlibexp}/CORE/libperl.$Config{so}"; + if ($file =~ /\blibperl.\Q$Config{so}\E$/a) { + push @opts, -id => $libperl; + } + else { + push @opts, -change => getcwd . "/libperl.$so", $libperl; + } + push @opts, $file; + + $opts{verbose} and print " install_name_tool @opts\n"; + system "install_name_tool", @opts + and die "Cannot update $file dependency paths\n"; +} + # ex: set ts=8 sts=4 sw=4 et: