[svn:CPANPLUS-Dist-Build] r15493 - in CPANPLUS-Dist-Build/trunk: . lib/CPANPLUS/Dist lib/CPANPLUS/Dist/Build

[BINGOS]

Author: BINGOS
Date: Tue Dec  4 15:10:45 2012
New Revision: 15493

Modified:
   CPANPLUS-Dist-Build/trunk/Changes
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm

Log:
Resolve issue where Build.PL does not generate Build script

Modified: CPANPLUS-Dist-Build/trunk/Changes
==============================================================================
--- CPANPLUS-Dist-Build/trunk/Changes   (original)
+++ CPANPLUS-Dist-Build/trunk/Changes   Tue Dec  4 15:10:45 2012
@@ -1,5 +1,9 @@
 Revision history for Perl extension CPANPLUS::Dist::Build.
 
+0.66 Tue Dec  4 23:05:53 GMT 2012
+  - Resolve an issue where Build.PL doesn't generate a
+    Build script
+
 0.64 Sat Oct 20 23:21:36 BST 2012
   - Update Module::Install, no functional changes.
 

Modified: CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm
==============================================================================
--- CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm        (original)
+++ CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm        Tue Dec  4 
15:10:45 2012
@@ -30,7 +30,7 @@
 
 local $Params::Check::VERBOSE = 1;
 
-$VERSION = '0.64';
+$VERSION = '0.66';
 
 =pod
 
@@ -327,6 +327,15 @@
             $fail++; last RUN;
         }
 
+        unless ( BUILD->( $dir ) ) {
+            error( loc( "Build.PL failed to generate a Build script: %1", 
$prep_output ) );
+            if ( $conf->get_conf('cpantest') ) {
+               $status->{stage} = 'prepare';
+               $status->{capture} = $prep_output;
+            }
+            $fail++; last RUN;
+        }
+
         msg( $prep_output, 0 );
 
         my $prereqs = $self->status->prereqs;

Modified: CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm
==============================================================================
--- CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm      
(original)
+++ CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build/Constants.pm      Tue Dec 
 4 15:10:45 2012
@@ -9,7 +9,7 @@
     require Exporter;
     use vars    qw[$VERSION @ISA @EXPORT];
 
-    $VERSION    = '0.64';
+    $VERSION    = '0.66';
     @ISA        = qw[Exporter];
     @EXPORT     = qw[ BUILD_DIR BUILD CPDB_PERL_WRAPPER];
 }
@@ -31,7 +31,7 @@
                             };
 
 
-use constant CPDB_PERL_WRAPPER   => 'use strict; BEGIN { my $old = select 
STDERR; $|++; select $old; $|++; $0 = shift(@ARGV); my $rv = do($0); die $@ if 
$@; }';
+use constant CPDB_PERL_WRAPPER   => 'use strict; BEGIN { my $old = select 
STDERR; $|++; select $old; $|++; $0 = shift(@ARGV); my $rv = do($0); die $@ if 
$@; die "$!" unless defined $rv; }';
 
 1;