PERFORCE change 12575 for review
[email protected] (Chris Nandor) Mon, 22 Oct 2001 18:00:19 -0400
| Newsgroups | perl.perl5.changes.mac |
|---|---|
| Message-ID | <p05100313b7fa3f83ac7b@[10.0.1.177]> |
Change 12575 by pudge@pudge-mobile on 2001/10/22 18:56:34
Clean up some build utilities. Change Entab to Duplicate;
fix docs and error reporting; improve macify() of paths;
remove requirement for Exporter.pm presence.
Affected files ...
... //depot/maint-5.6/macperl/macos/InstallBLIB#3 edit
... //depot/maint-5.6/macperl/macos/MacPerlTests.cmd#6 edit
... //depot/maint-5.6/macperl/macos/lib/ExtUtils/MM_MacOS.pm#6 edit
... //depot/maint-5.6/macperl/macos/lib/Mac/BuildTools.pm#3 edit
Differences ...
==== //depot/maint-5.6/macperl/macos/InstallBLIB#3 (text) ====
Index: perl/macos/InstallBLIB
--- perl/macos/InstallBLIB.~1~ Mon Oct 22 13:00:08 2001
+++ perl/macos/InstallBLIB Mon Oct 22 13:00:08 2001
@@ -27,7 +27,9 @@
next FILE;
}
}
- $dup .= "Entab -t 0 $file>$new\n";
+# We don't want to detab anymore ... I think
+# $dup .= "Entab -t 0 $file>$new\n";
+ $dup .= "Duplicate -y $file $new\n";
$new =~ /^(.*:)/;
$mkpath{$1} = 1;
}
==== //depot/maint-5.6/macperl/macos/MacPerlTests.cmd#6 (text) ====
Index: perl/macos/MacPerlTests.cmd
--- perl/macos/MacPerlTests.cmd.~1~ Mon Oct 22 13:00:08 2001
+++ perl/macos/MacPerlTests.cmd Mon Oct 22 13:00:08 2001
@@ -589,8 +589,4 @@
echo "# fails tests 329 (known problem in sysopen warning)"
echo ":perl -I::lib :pragma:warnings.t >> ::macos:MacPerlTests.out"
echo ""
-echo "# :op:misc.t, :op:runlevel.t, :pragma:strict.t, :pragma:subs.t, and"
-echo "# :pragma:warnings.t all produce a lot of errors because of error"
-echo "# output format; not sure what to do about them"
-echo ""
echo "# `Date -t` ----- End MacPerl tests."
==== //depot/maint-5.6/macperl/macos/lib/ExtUtils/MM_MacOS.pm#6 (text) ====
Index: perl/macos/lib/ExtUtils/MM_MacOS.pm
--- perl/macos/lib/ExtUtils/MM_MacOS.pm.~1~ Mon Oct 22 13:00:08 2001
+++ perl/macos/lib/ExtUtils/MM_MacOS.pm Mon Oct 22 13:00:08 2001
@@ -192,9 +192,17 @@
=cut
sub macify {
+ # mmm, better ... and this condition should always be satisified,
+ # as the module is now distributed with MacPerl, but leave in anyway
+ if (do 'Mac/FileSpec/Unixish.pm') {
+ return Mac::FileSpec::Unixish::nativize($_[0]);
+ }
+
my($unix) = @_;
my(@mac);
-
+
+ $unix =~ s|^\./||;
+
foreach (split(/[ \t\n]+/, $unix)) {
if (m|/|) {
$_ = ":$_";
@@ -309,10 +317,11 @@
$self->{MAP_TARGET} ||= "perl";
# make a simple check if we find Exporter
- warn "Warning: PERL_LIB ($self->{PERL_LIB}) seems not to be a perl library directory
- (Exporter.pm not found)"
- unless -f $self->catfile("$self->{PERL_LIB}","Exporter.pm") ||
- $self->{NAME} eq "ExtUtils::MakeMaker";
+ # hm ... do we really care? at all?
+# warn "Warning: PERL_LIB ($self->{PERL_LIB}) seems not to be a perl library directory
+# (Exporter.pm not found)"
+# unless -f $self->catfile("$self->{PERL_LIB}","Exporter.pm") ||
+# $self->{NAME} eq "ExtUtils::MakeMaker";
# Determine VERSION and VERSION_FROM
($self->{DISTNAME}=$self->{NAME}) =~ s#(::)#-#g unless $self->{DISTNAME};
==== //depot/maint-5.6/macperl/macos/lib/Mac/BuildTools.pm#3 (text) ====
Index: perl/macos/lib/Mac/BuildTools.pm
--- perl/macos/lib/Mac/BuildTools.pm.~1~ Mon Oct 22 13:00:08 2001
+++ perl/macos/lib/Mac/BuildTools.pm Mon Oct 22 13:00:08 2001
@@ -21,7 +21,7 @@
undef $@;
unless (eval { do ":Makefile.PL" }) {
- warn "Can't do :Makefile.PL in $cwd\n";
+ warn "Can't do :Makefile.PL in $cwd: $@\n";
}
warn $@ if $@;
End of Patch.