Change 34289 by [EMAIL PROTECTED] on 2008/09/05 23:04:00
Integrate:
[ 33954]
Integrate:
[ 33859]
$nonono => $opts{notify}
$verbose => $opts{verbose}
$silent => $opts{silent}
to align the code with forked code in installman
[ 33860]
Converge some changes from installperl into installman. I have a
suspicion that installman is only run on *nix and OS/2, not Win32 or
VMS. Specifically
sub unlink - return scalar(@names) if $Is_VMS # from change 854
sub link - change warn to die # from change 4774
sub samepath - case insensitive name comparison # from change 311
(in the ansiperl branch, merged via the win32 branch)
[ 33861]
Change 33859 missed $destdir => $opts{destdir}
[ 33862]
Merge common code from installperl and installman into install_lib.pl
[ 33863]
A couple more installman tidy ups.
[ 33864]
Add -w, tweak some comments.
[ 34259]
Integrate:
[ 34073]
AIX might miss libm
Subject: Re: Closing tickets in RT
From: "H.Merijn Brand" <[EMAIL PROTECTED]>
Date: Tue, 29 Apr 2008 17:49:35 +0200
Message-ID: <[EMAIL PROTECTED]>
[ 34075]
Make the version string more consistent between Windows and other
platforms.
Noticed and reported by Dave Golden.
[ 34162]
Subject: [PATCH] Minor hints/linux.sh patch to allow setting -Doptimize
From: Andrew Dougherty <[EMAIL PROTECTED]>
Date: Tue, 29 Jul 2008 12:00:52 -0400 (EDT)
Message-ID: <[EMAIL PROTECTED]>
[ 34168]
Add d_timegm to uconfig.sh to fix the generated uconfig.h.
[ 34274]
Integrate:
[ 34120]
Subject: [PATCH] Configure - d_sprintf_returns_strlen
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Thu, 19 Jun 2008 11:22:58 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34126]
Subject: [PATCH] Fix to Change 34120
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Fri, 11 Jul 2008 08:59:24 -0400
Message-ID: <[EMAIL PROTECTED]>
[ 34188]
Subject: [perl #24198] Bad default-domainname extraction in
Configure-Script may cause infinite loops in perl-tests
From: "Bram via RT" <[EMAIL PROTECTED]>
Date: Thu, 07 Aug 2008 06:00:47 -0700
Message-ID: <[EMAIL PROTECTED]>
[ 34212]
If I want to build Devel::NYTProf under the core tree, then the
Makefile needs to know to build List::Util first.
[ 34276]
Integrate:
[ 34235]
Silence warnings when -destdir isn't set.
[ 34236]
Subject: [PATCH] Architecture-Independent Non-XS extenstions
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Date: Thu, 28 Aug 2008 08:30:38 -0400
Affected files ...
... //depot/maint-5.8/perl/Configure#96 integrate
... //depot/maint-5.8/perl/MANIFEST#439 integrate
... //depot/maint-5.8/perl/Makefile.SH#76 integrate
... //depot/maint-5.8/perl/hints/aix.sh#25 integrate
... //depot/maint-5.8/perl/hints/linux.sh#17 integrate
... //depot/maint-5.8/perl/install_lib.pl#1 branch
... //depot/maint-5.8/perl/installman#8 integrate
... //depot/maint-5.8/perl/installperl#41 integrate
... //depot/maint-5.8/perl/pod/perltodo.pod#49 integrate
... //depot/maint-5.8/perl/uconfig.sh#25 integrate
... //depot/maint-5.8/perl/win32/config_sh.PL#12 integrate
Differences ...
==== //depot/maint-5.8/perl/Configure#96 (xtext) ====
Index: perl/Configure
--- perl/Configure#95~33736~ 2008-04-23 15:01:52.000000000 -0700
+++ perl/Configure 2008-09-05 16:04:00.000000000 -0700
@@ -26,7 +26,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Sun Sep 9 11:36:23 CEST 2007 [metaconfig 3.0 PL70]
+# Generated on Fri Aug 8 16:16:43 CEST 2008 [metaconfig 3.5 PL0]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -8561,11 +8561,11 @@
echo "(Attempting domain name extraction from
$tans)"
dflt=.`$sed -n -e 's/ / /g' \
-e 's/^search *\([^ ]*\).*/\1/p' $tans \
- | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
+ -e 1q 2>/dev/null`
case "$dflt" in
.) dflt=.`$sed -n -e 's/ / /g' \
-e 's/^domain *\([^ ]*\).*/\1/p' $tans \
- | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
+ -e 1q 2>/dev/null`
;;
esac
fi
@@ -17206,7 +17206,6 @@
EOP
set try
-d_sprintf_returns_strlen="$undef"
if eval $compile; then
xxx="`$run ./try`"
case "$?" in
@@ -17221,6 +17220,9 @@
d_sprintf_returns_strlen="$undef"
;;
esac
+else
+ echo "(I can't seem to compile the test program--assuming it doesn't)" >&4
+ d_sprintf_returns_strlen="$undef"
fi
$rm_try
==== //depot/maint-5.8/perl/MANIFEST#439 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#438~34281~ 2008-09-05 13:42:50.000000000 -0700
+++ perl/MANIFEST 2008-09-05 16:04:00.000000000 -0700
@@ -1243,6 +1243,7 @@
hv.h Hash value header
INSTALL Detailed installation instructions
installhtml Perl script to install html files for pods
+install_lib.pl functions shared between install* scripts
installman Perl script to install man pages for pods
installperl Perl script to do "make install" dirty work
INTERN.h Included before domestic .h files
==== //depot/maint-5.8/perl/Makefile.SH#76 (text) ====
Index: perl/Makefile.SH
--- perl/Makefile.SH#75~33635~ 2008-04-03 03:53:54.000000000 -0700
+++ perl/Makefile.SH 2008-09-05 16:04:00.000000000 -0700
@@ -164,7 +164,7 @@
: Parallel makes reveal that we have some interdependencies
case $f in
- Math/BigInt/FastCalc) extra_dep="$extra_dep
+ Math/BigInt/FastCalc|Devel/NYTProf) extra_dep="$extra_dep
$this_target: lib/auto/List/Util/Util.$dlext" ;;
Unicode/Normalize) extra_dep="$extra_dep
$this_target: uni.data" ;;
==== //depot/maint-5.8/perl/hints/aix.sh#25 (text) ====
Index: perl/hints/aix.sh
--- perl/hints/aix.sh#24~34036~ 2008-06-09 10:51:09.000000000 -0700
+++ perl/hints/aix.sh 2008-09-05 16:04:00.000000000 -0700
@@ -80,6 +80,12 @@
;;
esac
+ s=`lslpp -lc bos.adt.libm >/dev/null`
+if [ $? != 0 ]; then
+ echo "You cannot build perl without the bos.adt.libm package installed" >&4
+ exit
+ fi
+
# uname -m output is too specific and not appropriate here
case "$archname" in
'') archname="$osname" ;;
==== //depot/maint-5.8/perl/hints/linux.sh#17 (text) ====
Index: perl/hints/linux.sh
--- perl/hints/linux.sh#16~32528~ 2007-11-28 04:54:17.000000000 -0800
+++ perl/hints/linux.sh 2008-09-05 16:04:00.000000000 -0700
@@ -94,7 +94,7 @@
esac
;;
*"Sun C"*)
- optimize='-xO2'
+ test "$optimize" || optimize='-xO2'
cccdlflags='-KPIC'
lddlflags='-G -Bdynamic'
# Sun C doesn't support gcc attributes, but, in many cases, doesn't
==== //depot/maint-5.8/perl/install_lib.pl#1 (text) ====
Index: perl/install_lib.pl
--- /dev/null 2008-09-05 13:23:35.473496848 -0700
+++ perl/install_lib.pl 2008-09-05 16:04:00.000000000 -0700
@@ -0,0 +1,129 @@
+#!perl
+
+# Initialisation code and subroutines shared between installperl and installman
+# Probably installhtml needs to join the club.
+
+use strict;
+use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
+ %opts $packlist);
+use subs qw(unlink link chmod);
+
+use Config;
+BEGIN {
+ if ($Config{userelocatableinc}) {
+ # This might be a considered a hack. Need to get information about the
+ # configuration from Config.pm *before* Config.pm expands any .../
+ # prefixes.
+ #
+ # So we set $^X to pretend that we're the already installed perl, so
+ # Config.pm doesits ... expansion off that location.
+
+ my $location = $Config{initialinstalllocation};
+ die <<'OS' unless defined $location;
+$Config{initialinstalllocation} is not defined - can't install a relocatable
+perl without this.
+OS
+ $^X = "$location/perl";
+ # And then remove all trace of ever having loaded Config.pm, so that
+ # it will reload with the revised $^X
+ undef %Config::;
+ delete $INC{"Config.pm"};
+ delete $INC{"Config_heavy.pl"};
+ # You never saw us. We weren't here.
+
+ require Config;
+ Config->import;
+ }
+}
+
+if ($Config{d_umask}) {
+ umask(022); # umasks like 077 aren't that useful for installations
+}
+
+$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';
+$Is_NetWare = $Config{osname} eq 'NetWare';
+
+sub unlink {
+ my(@names) = @_;
+ my($cnt) = 0;
+
+ return scalar(@names) if $Is_VMS;
+
+ foreach my $name (@names) {
+ next unless -e $name;
+ chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin || $Is_NetWare);
+ print " unlink $name\n" if $opts{verbose};
+ ( CORE::unlink($name) and ++$cnt
+ or warn "Couldn't unlink $name: $!\n" ) unless $opts{notify};
+ }
+ return $cnt;
+}
+
+sub link {
+ my($from,$to) = @_;
+ my($success) = 0;
+
+ my $xfrom = $from;
+ $xfrom =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+ my $xto = $to;
+ $xto =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
+ print $opts{verbose} ? " ln $xfrom $xto\n" : " $xto\n"
+ unless $opts{silent};
+ eval {
+ CORE::link($from, $to)
+ ? $success++
+ : ($from =~ m#^/afs/# || $to =~ m#^/afs/#)
+ ? die "AFS" # okay inside eval {}
+ : die "Couldn't link $from to $to: $!\n"
+ unless $opts{notify};
+ $packlist->{$xto} = { from => $xfrom, type => 'link' };
+ };
+ if ($@) {
+ warn "Replacing link() with File::Copy::copy(): $@";
+ print $opts{verbose} ? " cp $from $xto\n" : " $xto\n"
+ unless $opts{silent};
+ print " creating new version of $xto\n"
+ if $Is_VMS and -e $to and !$opts{silent};
+ unless ($opts{notify} or File::Copy::copy($from, $to) and ++$success) {
+ # Might have been that F::C::c can't overwrite the target
+ warn "Couldn't copy $from to $to: $!\n"
+ unless -f $to and (chmod(0666, $to), unlink $to)
+ and File::Copy::copy($from, $to) and ++$success;
+ }
+ $packlist->{$xto} = { type => 'file' };
+ }
+ $success;
+}
+
+sub chmod {
+ my($mode,$name) = @_;
+
+ return if ($^O eq 'dos');
+ printf " chmod %o %s\n", $mode, $name if $opts{verbose};
+ CORE::chmod($mode,$name)
+ || warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
+ unless $opts{notify};
+}
+
+
+sub samepath {
+ my($p1, $p2) = @_;
+
+ return (lc($p1) eq lc($p2)) if ($Is_W32 || $Is_NetWare);
+
+ if ($p1 ne $p2) {
+ my($dev1, $ino1, $dev2, $ino2);
+ ($dev1, $ino1) = stat($p1);
+ ($dev2, $ino2) = stat($p2);
+ ($dev1 == $dev2 && $ino1 == $ino2);
+ }
+ else {
+ 1;
+ }
+}
+
+1;
==== //depot/maint-5.8/perl/installman#8 (xtext) ====
Index: perl/installman
--- perl/installman#7~32380~ 2007-11-17 12:47:39.000000000 -0800
+++ perl/installman 2008-09-05 16:04:00.000000000 -0700
@@ -1,50 +1,23 @@
#!./perl -w
-BEGIN { @INC = qw(lib) }
-use strict;
-
BEGIN {
- use Config;
- if ($Config{userelocatableinc}) {
- # This might be a considered a hack. Need to get information about the
- # configuration from Config.pm *before* Config.pm expands any .../
- # prefixes.
- #
- # So we set $^X to pretend that we're the already installed perl, so
- # Config.pm doesits ... expansion off that location.
-
- my $location = $Config{initialinstalllocation};
- die <<'OS' unless defined $location;
-$Config{initialinstalllocation} is not defined - can't install a relocatable
-perl without this.
-OS
- $^X = "$location/perl";
- # And then remove all trace of ever having loaded Config.pm, so that
- # it will reload with the revised $^X
- undef %Config::;
- delete $INC{"Config.pm"};
- delete $INC{"Config_heavy.pl"};
- # You never saw us. We weren't here.
- }
+ @INC = qw(lib);
+
+ # This needs to be at BEGIN time, before any use of Config
+ require './install_lib.pl';
}
+use strict;
-use Config;
use Getopt::Long;
use File::Find;
use File::Copy;
use File::Path qw(mkpath);
use ExtUtils::Packlist;
use Pod::Man;
-use subs qw(unlink chmod rename link);
-use vars qw($packlist);
-
-if ($Config{d_umask}) {
- umask(022); # umasks like 077 aren't that useful for installations
-}
+use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
+ %opts $packlist);
$ENV{SHELL} = 'sh' if $^O eq 'os2';
-my $ver = $Config{version}; # Not used presently.
-my $release = substr($],0,3); # Not used presently.
my $patchlevel = substr($],3,2);
die "Patchlevel of perl ($patchlevel)",
"and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
@@ -64,21 +37,16 @@
--verbose (or -V) report all progress.
--silent (or -S) be silent. Only report errors.\n";
-my %opts;
GetOptions( \%opts,
qw( man1dir=s man1ext=s man3dir=s man3ext=s batchlimit=i
destdir:s notify n help silent S verbose V))
|| die $usage;
die $usage if $opts{help};
-$opts{man1dir} = "$opts{destdir}$Config{'installman1dir'}"
- unless defined($opts{man1dir});
-$opts{man1ext} = $Config{'man1ext'}
- unless defined($opts{man1ext});
-$opts{man3dir} = "$opts{destdir}$Config{'installman3dir'}"
- unless defined($opts{man3dir});
-$opts{man3ext} = $Config{'man3ext'}
- unless defined($opts{man3ext});
+foreach my $pre (qw(man1 man3)) {
+ $opts{"${pre}dir"} //= $opts{destdir} . $Config{"install${pre}dir"};
+ $opts{"${pre}ext"} //= $Config{"${pre}ext"};
+}
$opts{silent} ||= $opts{S};
$opts{notify} ||= $opts{n};
$opts{verbose} ||= $opts{V} || $opts{notify};
@@ -234,45 +202,6 @@
exit 0;
-###############################################################################
-# Utility subroutines from installperl
-
-sub unlink {
- my(@names) = @_;
- my $cnt = 0;
-
- foreach my $name (@names) {
- next unless -e $name;
- chmod 0777, $name if $^O eq 'os2';
- print " unlink $name\n" if $opts{verbose};
- ( CORE::unlink($name) and ++$cnt
- or warn "Couldn't unlink $name: $!\n" ) unless $opts{notify};
- }
- return $cnt;
-}
-
-sub link {
- my($from,$to) = @_;
- my($success) = 0;
-
- print " ln $from $to\n" if $opts{verbose};
- 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"
- unless $opts{notify};
- };
- if ($@) {
- File::Copy::copy($from, $to)
- ? $success++
- : warn "Couldn't copy $from to $to: $!\n"
- unless $opts{notify};
- }
- $success;
-}
-
sub rename {
my($from,$to) = @_;
if (-f $to and not unlink($to)) {
@@ -286,25 +215,3 @@
link($from,$to) || return 0;
unlink($from);
}
-
-sub chmod {
- my($mode,$name) = @_;
-
- printf " chmod %o %s\n", $mode, $name if $opts{verbose};
- CORE::chmod($mode,$name) || warn sprintf("Couldn't chmod %o %s:
$!\n",$mode,$name)
- unless $opts{notify};
-}
-
-sub samepath {
- my($p1, $p2) = @_;
- my($dev1, $ino1, $dev2, $ino2);
-
- if ($p1 ne $p2) {
- ($dev1, $ino1) = stat($p1);
- ($dev2, $ino2) = stat($p2);
- ($dev1 == $dev2 && $ino1 == $ino2);
- }
- else {
- 1;
- }
-}
==== //depot/maint-5.8/perl/installperl#41 (xtext) ====
Index: perl/installperl
--- perl/installperl#40~33635~ 2008-04-03 03:53:54.000000000 -0700
+++ perl/installperl 2008-09-05 16:04:00.000000000 -0700
@@ -1,49 +1,25 @@
-#!./perl
+#!./perl -w
BEGIN {
require 5.004;
chdir '..' if !-d 'lib' and -d '../lib';
@INC = 'lib';
$ENV{PERL5LIB} = 'lib';
-}
-BEGIN {
- use Config;
- if ($Config{userelocatableinc}) {
- # This might be a considered a hack. Need to get information about the
- # configuration from Config.pm *before* Config.pm expands any .../
- # prefixes.
- #
- # So we set $^X to pretend that we're the already installed perl, so
- # Config.pm doesits ... expansion off that location.
-
- my $location = $Config{initialinstalllocation};
- die <<'OS' unless defined $location;
-$Config{initialinstalllocation} is not defined - can't install a relocatable
-perl without this.
-OS
- $^X = "$location/perl";
- # And then remove all trace of ever having loaded Config.pm, so that
- # it will reload with the revised $^X
- undef %Config::;
- delete $INC{"Config.pm"};
- delete $INC{"Config_heavy.pl"};
- # You never saw us. We weren't here.
- }
+ # This needs to be at BEGIN time, before any use of Config
+ require './install_lib.pl';
}
use strict;
-my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin,
- $nonono, $dostrip, $versiononly, $silent, $verbose, $force,
- $otherperls, $archname, $Is_NetWare, $nwinstall, $nopods);
+use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
+ %opts $packlist);
+my ($dostrip, $versiononly, $force,
+ $otherperls, $archname, $nwinstall, $nopods);
+# Not sure how easy it would be to refactor to remove the need for local $depth
+# below
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;' }
}
@@ -55,14 +31,7 @@
use File::Path ();
use ExtUtils::Packlist;
use Cwd;
-use Config;
-use subs qw(unlink link chmod);
-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';
@@ -70,13 +39,13 @@
# override the ones in the rest of the script
sub mkpath {
- File::Path::mkpath(@_) unless $nonono;
+ File::Path::mkpath(@_) unless $opts{notify};
}
my $mainperldir = "/usr/bin";
my $exe_ext = $Config{exe_ext};
-# Allow ``make install PERLNAME=something_besides_perl'':
+# 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".
@@ -98,20 +67,26 @@
}
$otherperls = 1;
-my $destdir = '';
+# This little hack simplifies making the code after the comment "Fetch some
+# frequently-used items from %Config" warning free. With $opts{destdir} always
+# defined, it's also possible to make the s/\Q$opts{destdir}\E unconditional.
+
+$opts{destdir} = '';
+# Consider refactoring this to use Getopt::Long once Getopt::Long's planned
+# feature is implemented, to distinguish + and - options.
while (@ARGV) {
- $nonono = 1 if $ARGV[0] eq '-n';
+ $opts{notify} = 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';
+ $opts{silent} = 1 if $ARGV[0] eq '-S';
$otherperls = 0 if $ARGV[0] eq '-o';
$force = 1 if $ARGV[0] eq '-f';
- $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
+ $opts{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';
- $destdir = $1 if $ARGV[0] =~ /^-?-destdir=(.*)$/;
+ $opts{destdir} = $1 if $ARGV[0] =~ /^-?-destdir=(.*)$/;
if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) {
print <<"EOT";
Usage $0: [switches]
@@ -178,8 +153,13 @@
push(@scripts, map("$_.exe", @scripts));
}
+# Exclude nonxs extensions that are not architecture dependent
+my @nonxs = grep(!/^Errno$/, split(' ', $Config{'nonxs_ext'}));
+
find(sub {
- if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
+ if (($File::Find::name =~ m{^ext\b(.*)/([^/]+)\.pm$}) &&
+ ! grep { $File::Find::name =~ /^ext\/$_/ } @nonxs)
+ {
my($path, $modname) = ($1,$2);
# strip to optional "/lib", or remove trailing component
@@ -206,13 +186,13 @@
if $patchlevel != $Config{'PERL_VERSION'};
# Fetch some frequently-used items from %Config
-my $installbin = "$destdir$Config{installbin}";
-my $installscript = "$destdir$Config{installscript}";
-my $installprivlib = "$destdir$Config{installprivlib}";
-my $installarchlib = "$destdir$Config{installarchlib}";
-my $installsitelib = "$destdir$Config{installsitelib}";
-my $installsitearch = "$destdir$Config{installsitearch}";
-my $installman1dir = "$destdir$Config{installman1dir}";
+my $installbin = "$opts{destdir}$Config{installbin}";
+my $installscript = "$opts{destdir}$Config{installscript}";
+my $installprivlib = "$opts{destdir}$Config{installprivlib}";
+my $installarchlib = "$opts{destdir}$Config{installarchlib}";
+my $installsitelib = "$opts{destdir}$Config{installsitelib}";
+my $installsitearch = "$opts{destdir}$Config{installsitearch}";
+my $installman1dir = "$opts{destdir}$Config{installman1dir}";
my $man1ext = $Config{man1ext};
my $libperl = $Config{libperl};
# Shared library and dynamic loading suffixes.
@@ -250,13 +230,13 @@
# Do some quick sanity checks.
-if (!$nonono && $d_dosuid && $>) { die "You must run as root to install
suidperl\n"; }
+if (!$opts{notify} && $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, $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;
+-d $installbin || mkpath($installbin, $opts{verbose}, 0777);
+-d $installbin || $opts{notify} || die "$installbin is not a
directory\n";
+-w $installbin || $opts{notify} || die "$installbin is not writable by
you\n"
+ unless $installbin =~ m#^/afs/# || $opts{notify};
if (!$Is_NetWare) {
if (!$Is_VMS) {
@@ -276,7 +256,7 @@
} #if (!$Is_NetWare)
# This will be used to store the packlist
-my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
+$packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
my $perldll;
@@ -370,10 +350,10 @@
my ($do_installarchlib, $do_installprivlib) = (0, 0);
my $vershort = $Is_Cygwin ? substr($ver,0,-2) : $ver;
-mkpath($installprivlib, $verbose, 0777);
-mkpath($installarchlib, $verbose, 0777);
-mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
-mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
+mkpath($installprivlib, $opts{verbose}, 0777);
+mkpath($installarchlib, $opts{verbose}, 0777);
+mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
+mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
if (chdir "lib") {
$do_installarchlib = ! samepath($installarchlib, '.');
@@ -390,7 +370,7 @@
}
# Install header files and libraries.
-mkpath("$installarchlib/CORE", $verbose, 0777);
+mkpath("$installarchlib/CORE", $opts{verbose}, 0777);
my @corefiles;
if ($Is_VMS) { # We did core file selection during build
my $coredir = "lib/$Config{archname}/$ver/CORE";
@@ -405,7 +385,7 @@
push(@corefiles,'perl.exp') if $^O eq 'aix';
if ($^O eq 'mpeix') {
# MPE needs mpeixish.h installed as well.
- mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
+ mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777);
push(@corefiles,'mpeix/mpeixish.h');
}
# If they have built sperl.o...
@@ -480,7 +460,7 @@
my $mainperl_is_instperl = 0;
if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
- !$versiononly && !$nonono && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t
STDIN && -t STDERR
+ !$versiononly && !$opts{notify} && !$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";
@@ -548,7 +528,7 @@
}
# Install scripts.
-mkpath($installscript, $verbose, 0777);
+mkpath($installscript, $opts{verbose}, 0777);
if ($versiononly) {
for (@scripts) {
(my $base = $_) =~ s#.*/##;
@@ -583,7 +563,7 @@
my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) {
- mkpath("${installprivlib}/$pod", $verbose, 0777);
+ mkpath("${installprivlib}/$pod", $opts{verbose}, 0777);
# If Perl 5.003's perldiag.pod is there, rename it.
if (open POD, "${installprivlib}/$pod/perldiag.pod") {
@@ -596,7 +576,7 @@
print " rename $from $to";
rename($from, $to)
or warn "Couldn't rename $from to $to: $!\n"
- unless $nonono;
+ unless $opts{notify};
}
}
@@ -651,13 +631,16 @@
}
-$packlist->write() unless $nonono;
-print " Installation complete\n" if $verbose;
+$packlist->write() unless $opts{notify};
+print " Installation complete\n" if $opts{verbose};
exit 0;
###############################################################################
+# If these are needed elsewhere, move them into install_lib.pl rather than
+# copying them.
+
sub yn {
my($prompt) = @_;
my($answer);
@@ -668,33 +651,17 @@
($answer =~ m/^[yY]/);
}
-sub unlink {
- my(@names) = @_;
- my($cnt) = 0;
-
- return scalar(@names) if $Is_VMS;
-
- foreach my $name (@names) {
- next unless -e $name;
- 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;
-}
-
sub safe_unlink {
- return if $nonono or $Is_VMS;
+ return if $opts{notify} or $Is_VMS;
my @names = @_;
foreach my $name (@names) {
next unless -e $name;
chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_NetWare);
- print " unlink $name\n" if $verbose;
+ print " unlink $name\n" if $opts{verbose};
next if CORE::unlink($name);
warn "Couldn't unlink $name: $!\n";
if ($! =~ /busy/i) {
- print " mv $name $name.old\n" if $verbose;
+ print " mv $name $name.old\n" if $opts{verbose};
safe_rename($name, "$name.old")
or warn "Couldn't rename $name: $!\n";
}
@@ -715,58 +682,16 @@
unlink($from);
}
-sub link {
- my($from,$to) = @_;
- my($success) = 0;
-
- my $xfrom = $from;
- $xfrom =~ s/^\Q$destdir\E// if $destdir;
- my $xto = $to;
- $xto =~ s/^\Q$destdir\E// if $destdir;
- print $verbose ? " ln $xfrom $xto\n" : " $xto\n" unless $silent;
- eval {
- CORE::link($from, $to)
- ? $success++
- : ($from =~ m#^/afs/# || $to =~ m#^/afs/#)
- ? die "AFS" # okay inside eval {}
- : die "Couldn't link $from to $to: $!\n"
- unless $nonono;
- $packlist->{$xto} = { from => $xfrom, type => 'link' };
- };
- if ($@) {
- warn "Replacing link() with File::Copy::copy(): $@";
- print $verbose ? " cp $from $xto\n" : " $xto\n" unless $silent;
- print " creating new version of $xto\n"
- if $Is_VMS and -e $to and !$silent;
- unless ($nonono or File::Copy::copy($from, $to) and ++$success) {
- # Might have been that F::C::c can't overwrite the target
- warn "Couldn't copy $from to $to: $!\n"
- unless -f $to and (chmod(0666, $to), unlink $to)
- and File::Copy::copy($from, $to) and ++$success;
- }
- $packlist->{$xto} = { type => 'file' };
- }
- $success;
-}
-
-sub chmod {
- my($mode,$name) = @_;
-
- return if ($^O eq 'dos');
- 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;
-}
-
sub copy {
my($from,$to) = @_;
my $xto = $to;
- $xto =~ s/^\Q$destdir\E// if $destdir;
- print $verbose ? " cp $from $xto\n" : " $xto\n" unless $silent;
- print " creating new version of $xto\n" if $Is_VMS and -e $to and
!$silent;
- unless ($nonono or File::Copy::copy($from, $to)) {
+ $xto =~ s/^\Q$opts{destdir}\E//;
+ print $opts{verbose} ? " cp $from $xto\n" : " $xto\n"
+ unless $opts{silent};
+ print " creating new version of $xto\n"
+ if $Is_VMS and -e $to and !$opts{silent};
+ unless ($opts{notify} or File::Copy::copy($from, $to)) {
# Might have been that F::C::c can't overwrite the target
warn "Couldn't copy $from to $to: $!\n"
unless -f $to and (chmod(0666, $to), unlink $to)
@@ -775,22 +700,6 @@
$packlist->{$xto} = { type => 'file' };
}
-sub samepath {
- my($p1, $p2) = @_;
-
- return (lc($p1) eq lc($p2)) if ($Is_W32 || $Is_NetWare);
-
- if ($p1 ne $p2) {
- my($dev1, $ino1, $dev2, $ino2);
- ($dev1, $ino1) = stat($p1);
- ($dev2, $ino2) = stat($p2);
- ($dev1 == $dev2 && $ino1 == $ino2);
- }
- else {
- 1;
- }
-}
-
sub installlib {
my $dir = $File::Find::dir;
$dir =~ s#^\.(?![^/])/?##;
@@ -867,11 +776,11 @@
unlink("$installarchlib/$name");
}
my $xname = "$installlib/$name";
- $xname =~ s/^\Q$destdir\E// if $destdir;
+ $xname =~ s/^\Q$opts{destdir}\E//;
$packlist->{$xname} = { type => 'file' };
- if ($force || compare($_, "$installlib/$name") || $nonono) {
+ if ($force || compare($_, "$installlib/$name") || $opts{notify}) {
unlink("$installlib/$name");
- mkpath("$installlib/$dir", $verbose, 0777);
+ mkpath("$installlib/$dir", $opts{verbose}, 0777);
# HP-UX (at least) needs to maintain execute permissions
# on dynamically-loaded libraries.
if ($Is_NetWare && !$nwinstall) {
@@ -914,7 +823,7 @@
my($from,$to)[EMAIL PROTECTED];
return 1 if (($^O eq 'VMS') && (-d $from));
my $xto = $to;
- $xto =~ s/^\Q$destdir\E// if $destdir;
+ $xto =~ s/^\Q$opts{destdir}\E//;
my $perlpodbadsymlink;
if ($from =~ m!^pod/perl[\w-]+\.pod$! &&
-l $from &&
@@ -928,9 +837,9 @@
}
-f $from || $perlpodbadsymlink || warn "$0: $from not found";
$packlist->{$xto} = { type => 'file' };
- if ($force || compare($from, $to) || $nonono) {
+ if ($force || compare($from, $to) || $opts{notify}) {
safe_unlink($to); # In case we don't have write permissions.
- if ($nonono) {
+ if ($opts{notify}) {
$from = $depth . "/" . $from if $depth;
}
if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) {
@@ -938,7 +847,7 @@
}
copy($from, $to);
# Restore timestamps if it's a .a library or for OS/2.
- if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) {
+ if (!$opts{notify} && ($Is_OS2 || $to =~ /\.a$/)) {
my ($atime, $mtime) = (stat $from)[8,9];
utime $atime, $mtime, $to;
}
@@ -959,14 +868,14 @@
foreach my $file (@args) {
if (-f $file) {
- if ($verbose) {
+ if ($opts{verbose}) {
print " strip " . join(' ', @opts);
print " " if (@opts);
print "$file\n";
}
system("strip", @opts, $file);
} else {
- print "# file '$file' skipped\n" if $verbose;
+ print "# file '$file' skipped\n" if $opts{verbose};
}
}
}
==== //depot/maint-5.8/perl/pod/perltodo.pod#49 (text) ====
Index: perl/pod/perltodo.pod
--- perl/pod/perltodo.pod#48~34288~ 2008-09-05 15:58:40.000000000 -0700
+++ perl/pod/perltodo.pod 2008-09-05 16:04:00.000000000 -0700
@@ -79,15 +79,6 @@
into a file, change it to build an C<%Is> hash and require it. Maybe just put
it into F<test.pl>. Throw in the handy tainting subroutines.
-=head2 merge common code in installperl and installman
-
-There are some common subroutines and a common C<BEGIN> block in F<installperl>
-and F<installman>. These should probably be merged. It would also be good to
-check for duplication in all the utility scripts supplied in the source
-tarball. It might be good to move them all to a subdirectory, but this would
-require careful checking to find all places that call them, and change those
-correctly.
-
=head2 POD -E<gt> HTML conversion in the core still sucks
Which is crazy given just how simple POD purports to be, and how simple HTML
==== //depot/maint-5.8/perl/uconfig.sh#25 (xtext) ====
Index: perl/uconfig.sh
--- perl/uconfig.sh#24~33190~ 2008-02-02 08:22:10.000000000 -0800
+++ perl/uconfig.sh 2008-09-05 16:04:00.000000000 -0700
@@ -422,6 +422,7 @@
d_telldir='undef'
d_telldirproto='undef'
d_time='define'
+d_timegm='undef'
d_times='undef'
d_tm_tm_gmtoff='undef'
d_tm_tm_zone='undef'
==== //depot/maint-5.8/perl/win32/config_sh.PL#12 (text) ====
Index: perl/win32/config_sh.PL
--- perl/win32/config_sh.PL#11~32419~ 2007-11-20 06:28:43.000000000 -0800
+++ perl/win32/config_sh.PL 2008-09-05 16:04:00.000000000 -0700
@@ -85,7 +85,7 @@
$opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}";
$opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g;
$opt{'version_patchlevel_string'} = "version $opt{PERL_VERSION} subversion
$opt{PERL_SUBVERSION}";
-$opt{'version_patchlevel_string'} .= " patchlevel $opt{PERL_PATCHLEVEL}" if
exists $opt{PERL_PATCHLEVEL};
+$opt{'version_patchlevel_string'} .= " patch $opt{PERL_PATCHLEVEL}" if exists
$opt{PERL_PATCHLEVEL};
my $ver = `ver 2>nul`;
if ($ver =~ /Version (\d+\.\d+)/) {
End of Patch.
