[Bps-public-commit] r10746 - Shipwright/lib/Shipwright

sunnavy at bestpractical.com sunnavy at bestpractical.com
Wed Feb 6 20:06:24 EST 2008


Author: sunnavy
Date: Wed Feb  6 20:06:23 2008
New Revision: 10746

Modified:
   Shipwright/lib/Shipwright/Build.pm

Log:
catch up with build script

Modified: Shipwright/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/lib/Shipwright/Build.pm	(original)
+++ Shipwright/lib/Shipwright/Build.pm	Wed Feb  6 20:06:23 2008
@@ -8,7 +8,7 @@
 
 __PACKAGE__->mk_accessors(
     qw/install_base perl build_base skip_test commands log
-      skip skip_test only_test force order/
+      skip only_test force order/
 );
 
 use File::Spec;
@@ -200,6 +200,7 @@
     # if we have this $type(e.g. perl) installed and have that specific wrapper,
     # then link to it, else link to the normal one
         if ( $type && grep( { $_ eq $type } @{$self->order} )
+            && !( grep { $_ eq $type } @{ $self->skip || [] } ) 
             && -e File::Spec->catfile( '..', 'etc', "shipwright-$type-wrapper" )
           )
         {
@@ -231,7 +232,7 @@
     return unless $text;
 
     my $perl         = $self->perl || $^X;
-    my $perl_archname = `$perl -MConfig -e 'print my \$Config{archname}'`;
+    my $perl_archname = `$perl -MConfig -e 'print \$Config{archname}'`;
     my $install_base = $self->install_base;
     $text =~ s/%%PERL%%/$perl/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;



More information about the Bps-public-commit mailing list