# It may be deleted in a later release of perl so try to
# avoid using it for other purposes.
-my (%excl, %incl, %opts, @extspec, @pass_through);
+my (%excl, %incl, %opts, @extspec, @pass_through, $verbose);
foreach (@ARGV) {
if (/^!(.*)$/) {
$excl{$1} = 1;
} elsif (/^\+(.*)$/) {
$incl{$1} = 1;
+ } elsif (/^--verbose$/ or /^-v$/) {
+ $verbose = 1;
} elsif (/^--([\w\-]+)$/) {
$opts{$1} = 1;
} elsif (/^--([\w\-]+)=(.*)$/) {
my $pl2bat = "$topdir\\win32\\bin\\pl2bat";
unless (-f "$pl2bat.bat") {
my @args = ($perl, "-I$topdir\\lib", ("$pl2bat.pl") x 2);
- print "@args\n";
+ print "@args\n" if $verbose;
system(@args) unless IS_CROSS;
}
- print "In $build";
+ print "In $build" if $verbose;
foreach my $dir (@dirs) {
chdir($dir) or die "Cannot cd to $dir: $!\n";
(my $ext = Cwd::getcwd()) =~ s{/}{\\}g;
}
}
- print "\tMaking $mname ($target)\n";
+ print "\tMaking $mname ($target)\n" if $verbose;
build_extension($ext_pathname, $perl, $mname, $target,
[@pass_through, @{$extra_passthrough{$spec} || []}]);
if (!-f $makefile) {
NO_MAKEFILE:
if (!-f 'Makefile.PL') {
- unless (just_pm_to_blib($target, $ext_dir)) {
+ unless (just_pm_to_blib($target, $ext_dir, $mname, $return_dir)) {
# No problems returned, so it has faked everything for us. :-)
chdir $return_dir || die "Cannot cd to $return_dir: $!";
return;
}
- print "\nCreating Makefile.PL in $ext_dir for $mname\n";
+ print "\nCreating Makefile.PL in $ext_dir for $mname\n" if $verbose;
my ($fromname, $key, $value);
if ($mname eq 'podlators') {
# We need to special case this somewhere, and this is fewer
my $ftime = time - 4;
utime $ftime, $ftime, 'Makefile.PL';
};
+ } elsif ($mname =~ /\A(?:Carp
+ |ExtUtils::CBuilder
+ |Safe
+ |Search::Dict)\z/x) {
+ # An explicit list of dual-life extensions that have a Makefile.PL
+ # for CPAN, but we have verified can also be built using the fakery.
+ my ($problem) = just_pm_to_blib($target, $ext_dir, $mname, $return_dir);
+ # We really need to sanity test that we can fake it.
+ # Otherwise "skips" will go undetected, and the build slow down for
+ # everyone, defeating the purpose.
+ if (defined $problem) {
+ if (-d "$return_dir/.git") {
+ # Get the list of files that git isn't ignoring:
+ my @files = `git ls-files --cached --others --exclude-standard 2>/dev/null`;
+ # on error (eg no git) we get nothing, but that's not a
+ # problem. The goal is to see if git thinks that the problem
+ # file is interesting, by getting a positive match with
+ # something git told us about, and if so bail out:
+ foreach (@files) {
+ chomp;
+ # We really need to sanity test that we can fake it.
+ # The intent is that this should only fail because
+ # you've just added a file to the dual-life dist that
+ # we can't handle. In which case you should either
+ # 1) remove the dist from the regex a few lines above.
+ # or
+ # 2) add the file to regex of "safe" filenames earlier
+ # in this function, that starts with ChangeLog
+ die "FATAL - $0 has $mname in the list of simple extensions, but it now contains file '$problem' which we can't handle"
+ if $problem eq $_;
+ }
+ # There's an unexpected file, but it seems to be something
+ # that git will ignore. So fall through to the regular
+ # Makefile.PL handling code below, on the assumption that
+ # we won't get here for a clean build.
+ }
+ warn "WARNING - $0 is building $mname using EU::MM, as it found file '$problem'";
+ } else {
+ # It faked everything for us.
+ chdir $return_dir || die "Cannot cd to $return_dir: $!";
+ return;
+ }
}
- print "\nRunning Makefile.PL in $ext_dir\n";
+
+ # We are going to have to use Makefile.PL:
+ print "\nRunning Makefile.PL in $ext_dir\n" if $verbose;
my @args = ("-I$lib_dir", 'Makefile.PL');
if ($is_VMS) {
}
push @args, @$pass_through;
_quote_args(\@args) if $is_VMS;
- print join(' ', $perl, @args), "\n";
+ print join(' ', $perl, @args), "\n" if $verbose;
my $code = system $perl, @args;
warn "$code from $ext_dir\'s Makefile.PL" if $code;
if test ! -f Makefile ; then
echo "Warning: No Makefile!"
fi
- make $clean_target MAKE='@make' @pass_through
+ @make $clean_target MAKE='@make' @pass_through
fi
cd $return_dir
EOS
system(@make, @args) and print "@make @args failed, continuing anyway...\n";
}
my @targ = ($target, @$pass_through);
- print "Making $target in $ext_dir\n@make @targ\n";
+ print "Making $target in $ext_dir\n@make @targ\n" if $verbose;
+ local $ENV{PERL_INSTALL_QUIET} = 1;
my $code = system(@make, @targ);
die "Unsuccessful make($ext_dir): code=$code" if $code != 0;
# savings are impressive.
sub just_pm_to_blib {
- my ($target, $ext_dir) = @_;
- my $has_lib;
+ my ($target, $ext_dir, $mname, $return_dir) = @_;
+ my ($has_lib, $has_top, $has_topdir);
+ my ($last) = $mname =~ /([^:]+)$/;
+ my ($first) = $mname =~ /^([^:]+)/;
+
+ my $pm_to_blib = $is_VMS ? 'pm_to_blib.ts' : 'pm_to_blib';
+
foreach my $leaf (<*>) {
if (-d $leaf) {
+ $leaf =~ s/\.DIR\z//i
+ if $is_VMS;
next if $leaf =~ /\A(?:\.|\.\.|t|demo)\z/;
if ($leaf eq 'lib') {
++$has_lib;
next;
}
+ if ($leaf eq $first) {
+ ++$has_topdir;
+ next;
+ }
}
return $leaf
unless -f _;
+ $leaf =~ s/\.\z//
+ if $is_VMS;
# Makefile.PL is "safe" to ignore because we will only be called for
# directories that hold a Makefile.PL if they are in the exception list.
next
|Makefile\.PL
|MANIFEST
|META\.yml
- |pm_to_blib
+ |\Q$pm_to_blib\E
|README
|README\.patching
|README\.release
)\z/xi; # /i to deal with case munging systems.
+ if ($leaf eq "$last.pm") {
+ ++$has_top;
+ next;
+ }
return $leaf;
}
return 'no lib/'
- unless $has_lib;
+ unless $has_lib || $has_top;
+ die "Inconsistent module $mname has both lib/ and $first/"
+ if $has_lib && $has_topdir;
print "\nRunning pm_to_blib for $ext_dir directly\n";
- # strictly ExtUtils::MakeMaker uses the pm_to_blib target to install
- # .pm, pod and .pl files. We're just going to do it for .pm and .pod
- # files, to avoid problems on case munging file systems. Specifically,
- # _pm.PL which ExtUtils::MakeMaker should run munges to _PM.PL, and
- # looks a lot like a regular foo.pl (ie FOO.PL)
- my @pm;
- require File::Find;
- unless (eval {
- File::Find::find({
- no_chdir => 1,
- wanted => sub {
- return if -d $_;
- # Bail out immediately with the problem file:
- die \$_
- unless -f _;
- die \$_
- unless /\A[^.]+\.(?:pm|pod)\z/i;
- push @pm, $_;
+ my %pm;
+ if ($has_top) {
+ my $to = $mname =~ s!::!/!gr;
+ $pm{"$last.pm"} = "../../lib/$to.pm";
+ }
+ if ($has_lib || $has_topdir) {
+ # strictly ExtUtils::MakeMaker uses the pm_to_blib target to install
+ # .pm, pod and .pl files. We're just going to do it for .pm and .pod
+ # files, to avoid problems on case munging file systems. Specifically,
+ # _pm.PL which ExtUtils::MakeMaker should run munges to _PM.PL, and
+ # looks a lot like a regular foo.pl (ie FOO.PL)
+ my @found;
+ require File::Find;
+ unless (eval {
+ File::Find::find({
+ no_chdir => 1,
+ wanted => sub {
+ return if -d $_;
+ # Bail out immediately with the problem file:
+ die \$_
+ unless -f _;
+ die \$_
+ unless /\A[^.]+\.(?:pm|pod)\z/i;
+ push @found, $_;
}
- }, 'lib');
- 1;
- }) {
- # Problem files aren't really errors:
- return ${$@}
- if ref $@ eq 'SCALAR';
- # But anything else is:
- die $@;
+ }, $has_lib ? 'lib' : $first);
+ 1;
+ }) {
+ # Problem files aren't really errors:
+ return ${$@}
+ if ref $@ eq 'SCALAR';
+ # But anything else is:
+ die $@;
+ }
+ if ($has_lib) {
+ $pm{$_} = "../../$_"
+ foreach @found;
+ } else {
+ $pm{$_} = "../../lib/$_"
+ foreach @found;
+ }
}
# This is running under miniperl, so no autodie
if ($target eq 'all') {
+ local $ENV{PERL_INSTALL_QUIET} = 1;
require ExtUtils::Install;
- ExtUtils::Install::pm_to_blib({map {$_ => "../../$_"} sort @pm},
- '../../lib/auto');
- open my $fh, '>', 'pm_to_blib'
- or die $!;
+ ExtUtils::Install::pm_to_blib(\%pm, '../../lib/auto');
+ open my $fh, '>', $pm_to_blib
+ or die "Can't open '$pm_to_blib': $!";
print $fh "$0 has handled pm_to_blib directly\n";
close $fh
- or die $!;
+ or die "Can't close '$pm_to_blib': $!";
+ if ($is_Unix) {
+ # Fake the fallback cleanup
+ my $fallback
+ = join '', map {s!^\.\./\.\./!!; "rm -f $_\n"} sort values %pm;
+ foreach my $clean_target ('realclean', 'veryclean') {
+ fallback_cleanup($return_dir, $clean_target, $fallback);
+ }
+ }
} else {
# A clean target.
# For now, make the targets behave the same way as ExtUtils::MakeMaker
# does
- _unlink('pm_to_blib');
+ _unlink($pm_to_blib);
unless ($target eq 'clean') {
# but cheat a bit, by relying on the top level Makefile clean target
# to take out our directory lib/auto/...
# lib/auto/foo/bar, but the EU::MM rule will only
# rmdir lib/auto/foo/bar, leaving lib/auto/foo
_unlink("../../$_")
- foreach @pm;
+ foreach sort values %pm;
}
}
return;
https://perl5.git.perl.org / perl5.git / blobdiff