X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=7575db073d46ad9198f3d19eae47d640a4ad3325;hb=9a021b2b54372f72e6c17f3add625c94b2bb5a98;hp=6532653ce585aa1db86ca5602e38039e3113b1bf;hpb=86f54d7f5cc99b82a69c0ca9157d9700744efbe6;p=p5sagit%2Flocal-lib.git

diff --git a/Makefile.PL b/Makefile.PL
index 6532653..7575db0 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,11 +1,33 @@
 use strict;
 use warnings;
-use vars qw($bootstrapping);
+use File::Spec;
+use Cwd;
+use vars qw($bootstrapping $bootstrapping_args);
 
+my $cwd;
 BEGIN {
-  if (grep { /^--bootstrap(?:=(.*))?$/ } @ARGV) {
+  $cwd = Cwd::cwd();
+  # watch out for fancy dashes. these can wind up in our @ARGV if the user is
+  # copypasting the bootstrap command from the POD displayed e.g. by perldoc
+  # on a Mac OS X terminal. since no software recognizes and handles these
+  # dashes, it's better to die loudly telling the user exactly what happened
+  # so they don't make the same mistake again rather than being the only
+  # program in the universe that works with them.
+  if(grep { /−/ } @ARGV) {
+      die <<'DEATH';
+WHOA THERE! It looks like you've got some fancy dashes in your commandline!
+These are *not* the traditional -- dashes that software recognizes. You
+probably got these by copy-pasting from the perldoc for this module as
+rendered by a UTF8-capable formatter. This most typically happens on an OS X
+terminal, but can happen elsewhere too. Please try again after replacing the
+dashes with normal minus signs.
+DEATH
+  }
+  if (my ($x) = grep { /^--bootstrap(?:=.*)?$/ } @ARGV) {
+    @ARGV = grep { !/^--bootstrap(?:=.*)?$/ } @ARGV;
     $bootstrapping = 1;
-    my @args = (defined $1 ? ($1) : ());
+    my ($path) = $x =~ /^--bootstrap(?:=(.*))?$/;
+    my @args = $path ? $path : ();
 
     {
       local @INC = @INC;
@@ -15,17 +37,55 @@ BEGIN {
 
     local::lib->import(@args);
 
+    my @libs = map { "-I$_" } split ':', $ENV{PERL5LIB};
+    $bootstrapping_args = "@libs";
     push(@ARGV,$ENV{PERL_MM_OPT});
+    push(@ARGV, @libs);
 
     system($^X, '-MExtUtils::MakeMaker 6.31', '-e1');
-    my $r = $? >> 8;
+    my $eumm = $? >> 8;
+
+    system($^X, '-MCPAN 1.80', '-e1');
+    my $cpan = $? >> 8;
+    my $cpan_command = '';
+
+    system($^X, '-MCPAN', '-e',
+      'my $done; require ExtUtils::MakeMaker;
+       my $orig = ExtUtils::MakeMaker->can("prompt");
+       *ExtUtils::MakeMaker::prompt = sub {
+         if (!$done && $_[0] =~ /manual configuration/) {
+           $done++;
+           return "no";
+         }
+         return $orig->(@_);
+       };
+       CPAN::Config->load;
+       unless ($done || -w $CPAN::Config->{keep_source_where}) {
+         my $save = $CPAN::Config->{urllist};
+         delete @{$CPAN::Config}{keys %$CPAN::Config};
+         $CPAN::Config->{urllist} = $save;
+         CPAN::Config->init;
+       }'
+    );
+
+    $ENV{PERL_MM_USE_DEFAULT} = 1;
 
     # XXX - remove the force on EUMM once its test suite survive PERL_MM_OPT
 
-    if ($r) { # non-zero exit
-      system($^X, '-MCPAN', '-e', 'force("install","ExtUtils::MakeMaker");');
+    if ($eumm) { # non-zero exit
+      $cpan_command .= 'force("install","ExtUtils::MakeMaker"); ';
+    }
+    if ($cpan) {
+      $cpan_command .= 'force("install","CPAN"); ';
+    }
+    if(length $cpan_command) {
+      system($^X, '-MCPAN', '-e', $cpan_command);
+    }
+    if ($cpan) {
+      system($^X, '-MCPAN', '-e', 'CPAN::Config->load; CPAN::Config->commit;');
     }
 
+    chdir($cwd);
   }
 }
 
@@ -34,22 +94,48 @@ use inc::Module::Install;
 name 'local-lib';
 all_from 'lib/local/lib.pm';
 
-include('CPAN');
-include('CPAN::HandleConfig');
-include('CPAN::Debug');
-include('CPAN::Version');
-include('CPAN::Tarzip');
-
 requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
 requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
 requires 'ExtUtils::ParseXS';
 requires 'Module::Build' => '0.28'; # lib -> lib/perl5 change
 requires 'CPAN' => '1.80'; # sudo support
 
+# No, really. See
+# https://rt.cpan.org/Public/Bug/Display.html?id=23735
+# for why CPAN now sets the CPANPLUS env var.
+# trouble is this means we can't auto_install(_now) CPAN itself
+# without this beautiful hack
+
+my $no_cpanplus_env = !exists $ENV{PERL5_CPANPLUS_IS_RUNNING};
+my $no_cpan_env = !exists $ENV{PERL5_CPAN_IS_RUNNING};
+require CPAN;
+delete $ENV{PERL5_CPANPLUS_IS_RUNNING} if $no_cpanplus_env;
+delete $ENV{PERL5_CPAN_IS_RUNNING} if $no_cpan_env;
+
+# and make sure that the user doesn't have any existing CPAN config that'll
+# cause us problems for the next few steps.
+require CPAN::HandleConfig;
+CPAN::HandleConfig->load;
+for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+    if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+        die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
+    }
+}
+
+for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+    if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+        die "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
+    }
+}
+
 if ($bootstrapping) {
   auto_install_now;
+  postamble <<"END";
+PERL     += $bootstrapping_args
+FULLPERL += $bootstrapping_args
+END
 } else {
   auto_install;
 }
-
+chdir($cwd);
 WriteAll;