[Bps-public-commit] Shipwright branch, master, updated. 2e875bd2167a5bde7908c9fbe6f769a019993133

[? sunnavy]

The branch, master has been updated
       via  2e875bd2167a5bde7908c9fbe6f769a019993133 (commit)
       via  e9ea0382bcb7a19db415134f1c9407bf2262fd91 (commit)
       via  296264943774fec0c3e30677c991a234f04f22f1 (commit)
      from  75282cb8b7e34f8b41ae7dbbbf5abe251dfe6e2b (commit)

Summary of changes:
 Changes                        |    5 +++++
 META.yml                       |    2 +-
 lib/Shipwright.pm              |    2 +-
 lib/Shipwright/Backend/Base.pm |   34 +++++++++++++++++++++++++++++++++-
 4 files changed, 40 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 296264943774fec0c3e30677c991a234f04f22f1
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Feb 21 15:11:35 2011 +0800

    make Module::Install and its deps happy

diff --git a/lib/Shipwright/Backend/Base.pm b/lib/Shipwright/Backend/Base.pm
index 4f50d75..7cd0e8e 100644
--- a/lib/Shipwright/Backend/Base.pm
+++ b/lib/Shipwright/Backend/Base.pm
@@ -5,6 +5,7 @@ use strict;
 use File::Spec::Functions qw/catfile catdir splitpath/;
 use Shipwright::Util;
 use File::Temp qw/tempdir/;
+use File::Copy 'copy';
 use File::Copy::Recursive qw/rcopy/;
 use File::Path qw/make_path remove_tree/;
 use List::MoreUtils qw/uniq firstidx/;
@@ -95,7 +96,7 @@ sub _install_module_build {
     my $dir = shift;
     my $module_build_path = catdir( $dir, 'inc', 'Module', );
     make_path( catdir( $module_build_path, 'Build' ) );
-    rcopy( Module::Info->new_from_module('Module::Build')->file,
+    copy( Module::Info->new_from_module('Module::Build')->file,
             $module_build_path ) or confess_or_die "copy Module/Build.pm failed: $!";
     rcopy(
         catdir(
@@ -105,6 +106,37 @@ sub _install_module_build {
         catdir( $module_build_path, 'Build' )
       )
       or confess_or_die "copy Module/Build failed: $!";
+
+    # Module::Build needs Module::Metadata, Perl::OSType
+    make_path( catdir( $dir, 'inc', 'Module::Metadata' ) );
+    make_path( catdir( $dir, 'inc', 'Perl' ) );
+    copy(
+        Module::Info->new_from_module('Perl::OSType')->file,
+        catdir( $dir, 'inc', 'Perl' ) )
+          or confess_or_die "copy Perl/OSType.pm failed: $!";
+
+    copy(
+        Module::Info->new_from_module('Module::Metadata')->file,
+        catdir( $dir, 'inc', 'Module' ) )
+          or confess_or_die "copy Module/Metadata.pm failed: $!";
+# Module::Metadata 1.02 requires version 0.87+, which isn't in perl core yet
+# we can't simply copy version.pm to inc because it's not plain perl.
+# so here we do a maybe dangerous thing, hack Module::Metadata to not require
+# version 0.87+
+# so is Module::Build
+    my @files = ( catfile( $dir, 'inc', 'Module', 'Metadata.pm' ),
+      catfile( $dir, 'inc', 'Module', 'Build', 'Version.pm' ) );
+
+    for my $file ( @files ) {
+        open my $fh, '<', $file or die $!;
+        local $/;
+        my $content = <$fh>;
+        $content =~ s!use version.*?;!use version;!;
+        chmod 0755, $file unless -w $file;
+        open $fh, '>', $file or die $!;
+        print $fh $content;
+        close $fh;
+    }
 }
 
 sub _install_yaml_tiny {

commit e9ea0382bcb7a19db415134f1c9407bf2262fd91
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Feb 21 15:11:57 2011 +0800

    changes of 2.4.19

diff --git a/Changes b/Changes
index 863d313..b724704 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,9 @@ Revision history for Shipwright
 2.4.19
 
 * use Class::XSAccessor::Compat if possible
+* copy deps of Module::Build not in core into inc( except version.pm ).
+* for Module::Build: hack to not require so strcit version.pm, as it's not in
+    core and is xs( which makes it not appropriate to copy into inc )
 
 2.4.18 Fri Dec 10 02:49:24 UTC 2010
 

commit 2e875bd2167a5bde7908c9fbe6f769a019993133
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Feb 21 15:12:59 2011 +0800

    bump to 2.4.20

diff --git a/Changes b/Changes
index b724704..0bdd3e0 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Shipwright
 
+2.4.20
+
 2.4.19
 
 * use Class::XSAccessor::Compat if possible
diff --git a/META.yml b/META.yml
index 1508f89..fe59104 100644
--- a/META.yml
+++ b/META.yml
@@ -55,4 +55,4 @@ requires:
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/bestpractical/shipwright.git
-version: 2.004019
+version: 2.004020
diff --git a/lib/Shipwright.pm b/lib/Shipwright.pm
index cc191f2..4030e50 100644
--- a/lib/Shipwright.pm
+++ b/lib/Shipwright.pm
@@ -2,7 +2,7 @@ package Shipwright;
 
 use warnings;
 use strict;
-use version; our $VERSION = qv('2.4.19');
+use version; our $VERSION = qv('2.4.20');
 
 use base qw/Shipwright::Base/;
 

-----------------------------------------------------------------------