Author: BINGOS
Date: Wed Feb 18 08:51:41 2009
New Revision: 12511

Modified:
   CPANPLUS-Dist-Build/trunk/Changes
   CPANPLUS-Dist-Build/trunk/MANIFEST
   CPANPLUS-Dist-Build/trunk/Makefile.PL
   CPANPLUS-Dist-Build/trunk/lib/CPANPLUS/Dist/Build.pm
   CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t

Log:
Test fixes, detect C_support more cleanly. Changed to M::I in Makefile.PL

Modified: CPANPLUS-Dist-Build/trunk/Changes
==============================================================================
--- CPANPLUS-Dist-Build/trunk/Changes   (original)
+++ CPANPLUS-Dist-Build/trunk/Changes   Wed Feb 18 08:51:41 2009
@@ -1,8 +1,10 @@
 Revision history for Perl extension CPANPLUS::Dist::Build.
 
-0.06_XX -
+0.06_04 Wed Feb 18 16:50:08 GMT 2009
 
  - bumped CPANPLUS prerequisite to 0.84
+ - bumped all required versions, added Test::Harness 3.15
+ - Fixed warnings in tests and added diag() to ignore the [ERROR]
 
 0.06_03        Mon Feb  9 16:31:10 GMT 2009
 

Modified: CPANPLUS-Dist-Build/trunk/MANIFEST
==============================================================================
--- CPANPLUS-Dist-Build/trunk/MANIFEST  (original)
+++ CPANPLUS-Dist-Build/trunk/MANIFEST  Wed Feb 18 08:51:41 2009
@@ -1,9 +1,18 @@
 Changes
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
 lib/CPANPLUS/Dist/Build.pm
 lib/CPANPLUS/Dist/Build/Constants.pm
 Makefile.PL
 MANIFEST                       This list of files
 MANIFEST.SKIP
+META.yml
 README
 t/01_CPANPLUS-Dist-Build-Constants.t
 t/02_CPANPLUS-Dist-Build.t

Modified: CPANPLUS-Dist-Build/trunk/Makefile.PL
==============================================================================
--- CPANPLUS-Dist-Build/trunk/Makefile.PL       (original)
+++ CPANPLUS-Dist-Build/trunk/Makefile.PL       Wed Feb 18 08:51:41 2009
@@ -1,24 +1,21 @@
-use ExtUtils::MakeMaker;
 use strict;
-
-WriteMakefile (
-    NAME            => 'CPANPLUS::Dist::Build',
-    VERSION_FROM    => 'lib/CPANPLUS/Dist/Build.pm', # finds $VERSION
-    dist            => { COMPRESS => 'gzip -9f', SUFFIX => 'gz' },
-    clean           => { FILES => 't/dummy-cpanplus t/dummy-perl/lib/perl5' },
-    PREREQ_PM       => { 
-                        'Test::More'                => 0, 
-                        'CPANPLUS'                  => '0.84',
-                        'Locale::Maketext::Simple'  => 0,
-                        'Params::Check'             => '0.22',
-                        'IPC::Cmd'                  => '0.23',
-                        'Module::Load::Conditional' => '0.06',
-                        'Module::Pluggable'         => '2.4',
-                        'Module::Build'             => '0.28',
-                        'File::Spec'                => 0,
-                    },
-    AUTHOR          => 'Jos Boumans <kane[at]cpan.org>, Ken Williams 
<[email protected]>',
-    ABSTRACT        => 'CPANPLUS plugin to install packages that use Build.PL',
-);     
-
-
+use inc::Module::Install;
+name 'CPANPLUS-Dist-Build';
+author 'Jos Boumans <kane[at]cpan.org>, Ken Williams <[email protected]>';
+version_from 'lib/CPANPLUS/Dist/Build.pm';
+abstract 'CPANPLUS plugin to install packages that use Build.PL';
+perl_version '5.006';
+license 'perl';
+build_requires 'Test::More'         => 0.47;
+requires 'Test::Harness'            => '3.15';
+requires 'CPANPLUS'                  => '0.84';
+requires 'Locale::Maketext::Simple'  => 0;
+requires 'Params::Check'             => '0.26';
+requires 'IPC::Cmd'                  => '0.42';
+requires 'Module::Load'                     => '0.16';
+requires 'Module::Load::Conditional' => '0.30';
+requires 'Module::Pluggable'         => '3.8';
+requires 'Module::Build'             => '0.28';
+requires 'File::Spec'                => 0;
+clean_files 't/dummy-cpanplus t/dummy-perl/lib/perl5';
+WriteAll();

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        Wed Feb 18 
08:51:41 2009
@@ -30,13 +30,13 @@
 
 local $Params::Check::VERBOSE = 1;
 
-$VERSION = '0.06_03';
+$VERSION = '0.06_04';
 
 =pod
 
 =head1 NAME
 
-CPANPLUS::Dist::Build
+CPANPLUS::Dist::Build - CPANPLUS plugin to install packages that use Build.PL
 
 =head1 SYNOPSIS
 

Modified: CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t
==============================================================================
--- CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t        (original)
+++ CPANPLUS-Dist-Build/trunk/t/02_CPANPLUS-Dist-Build.t        Wed Feb 18 
08:51:41 2009
@@ -25,6 +25,13 @@
 use ExtUtils::Packlist;
 use ExtUtils::Installed;
 
+my $Have_C_support;
+
+eval {
+  require Module::Build::ConfigData;
+  $Have_C_support = Module::Build::ConfigData->feature('C_support');
+};
+
 my $Class   = 'CPANPLUS::Dist::Build';
 my $Utils   = 'CPANPLUS::Internals::Utils';
 my $Have_CC =  can_run($Config{'cc'} )? 1 : 0;
@@ -133,7 +140,8 @@
              "-- skipping compile tests", 5) if $need_cc && !$Have_CC;
         skip("Module::Build is not compiled with C support ".
              "-- skipping compile tests", 5) 
-             unless Module::Build->_mb_feature('C_support');
+    #         unless Module::Build->new( dist_name => 'DUMMY', dist_version => 
'0.01' )->_mb_feature('C_support');
+             unless $Have_C_support;
 
         ok( $mod->create( ),    "Creating module" );
         ok( $mod->status->dist_cpan->status->created,
@@ -218,6 +226,7 @@
     ### so we dont spam the result through the test -- this is expected
     ### behaviour after all.
     ### also quell the warning for print() on unopened fh...
+    diag("The following ERROR may be ignored:\n\n");
     my $rv = do { 
                 local $^W;
 #                local *STDERR; 

Reply via email to