[Bps-public-commit] r10548 - bpsbuilder/Shipwright/lib/Shipwright

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Tue Jan 29 00:57:17 2008
New Revision: 10548

Modified:
   bpsbuilder/Shipwright/lib/Shipwright/Backend.pm

Log:
updated builder script: if we skip perl, we shouldn't set perl as in install base

Modified: bpsbuilder/Shipwright/lib/Shipwright/Backend.pm
==============================================================================
--- bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	(original)
+++ bpsbuilder/Shipwright/lib/Shipwright/Backend.pm	Tue Jan 29 00:57:17 2008
@@ -186,10 +186,14 @@
     print $log "no default install-base, will set it to $args{'install-base'}\n";
 }
 
+$args{skip} = [ split /,\s*/, $args{skip} || '' ];
+
 my $order = parse_order( File::Spec->catfile( 'shipwright', 'order.yml' ) );
 
 unless ( $args{perl} ) {
-    if ( grep { $_ eq 'perl' } @$order ) {
+    if ( ( grep { $_ eq 'perl' } @$order )
+        && !( grep { $_ eq 'perl' } @{ $args{skip} } ) )
+    {
         $args{perl} =
           File::Spec->catfile( $args{'install-base'}, 'bin', 'perl' );
     }
@@ -198,8 +202,6 @@
     }
 }
 
-$args{skip} = [ split /,\s*/, $args{skip} || '' ];
-
 {
     no warnings 'uninitialized';
     $ENV{DYLD_LIBRARY_PATH} =