[Bps-public-commit] r18409 - in Shipwright/trunk: share/bin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun Feb 15 23:24:58 2009
New Revision: 18409

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/share/bin/shipwright-builder

Log:
 r19887 at sunnavys-mb:  sunnavy | 2009-02-16 12:10:23 +0800
 use lib 'inc', so we don't need to prefix inc:: any more


Modified: Shipwright/trunk/share/bin/shipwright-builder
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-builder	(original)
+++ Shipwright/trunk/share/bin/shipwright-builder	Sun Feb 15 23:24:58 2009
@@ -2,6 +2,7 @@
 use warnings;
 use strict;
 
+use lib 'inc';
 use File::Spec::Functions qw/catfile catdir splitdir/;
 use File::Temp qw/tempdir/;
 use File::Copy qw/move copy/;
@@ -10,11 +11,12 @@
 use Config;
 use Getopt::Long;
 use Cwd qw/getcwd abs_path/;
-use inc::YAML::Tiny;
-use inc::Shipwright::Util::CleanINC;
+use YAML::Tiny;
+use Shipwright::Util::CleanINC;
 use Carp qw/confess/;
 
 my $build_base = getcwd;
+my $inc_lib = catdir( $build_base, 'inc' );
 
 my %args;
 
@@ -355,7 +357,7 @@
         print $log "found build.pl for $dir, will install $dir using that\n";
         my $cmd = join ' ', $args{perl} || $^X,
            '-I' . $build_base,
-           '-Minc::Shipwright::Util::CleanINC',
+           '-MShipwright::Util::CleanINC',
           catfile( '..', '..', 'scripts', $dir, 'build.pl' ),
           '--install-base' => $args{'install-base'},
           '--flags'        => join( ',', keys %{ $args{flags} } ),
@@ -498,7 +500,7 @@
     }
 
     my $perl_archname = `$perl -MConfig -e 'print \$Config{archname}'`;
-    $text =~ s/%%PERL%%/$perl -I$build_base -Minc::Shipwright::Util::CleanINC/g;
+    $text =~ s/%%PERL%%/$perl -I$build_base -MShipwright::Util::CleanINC/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;
     $text =~ s/%%PERL_ARCHNAME%%/$perl_archname/g;
     $text =~ s/%%MAKE%%/$args{make}/g;
@@ -585,7 +587,7 @@
     if ( -e catfile( '..', '..', 'scripts', $dir, 'build.pl' ) ) {
         print $log "found build.pl for $dir, will clean $dir using that\n";
         $cmd = join ' ', $args{perl} || $^X,
-          '-Minc::Shipwright::Util::CleanINC',
+          '-MShipwright::Util::CleanINC',
           catfile( '..', '..', 'scripts', $dir, 'build.pl' ),
           '--install-base' => $args{'install-base'},
           '--flags'        => join( ',', keys %{ $args{flags} } ),