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

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  b16e13d531ab9b09706b006303e99e4a7f29cd1e (commit)
       via  02b96d17b04cef93cca0158d5855efbd520dab64 (commit)
      from  d69ccfc9c24ce55d0dc6eedb432af49b2efe7a29 (commit)

Summary of changes:
 lib/Shipwright/Script/Import.pm |    2 ++
 lib/Shipwright/Util/CleanINC.pm |   17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 02b96d17b04cef93cca0158d5855efbd520dab64
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 29 15:04:38 2009 +0800

    update comment

diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index 5ffb945..301f173 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -369,6 +369,8 @@ sub _generate_build {
     }
     elsif ( -f catfile( $source_dir, 'Makefile.PL' ) ) {
         $self->log->info( 'detected ExtUtils::MakeMaker build system or alike' );
+# XXX when only support 5.8.9+, we can change it to INSTALL_BASE=%%INSTALL_BASE%%
+# because LIB=.../lib/perl5 is so ugly and not so right
         @commands = (
             'configure: %%PERL%% Makefile.PL LIB=%%INSTALL_BASE%%/lib/perl5/ PREFIX=%%INSTALL_BASE%% %%MAKEMAKER_CONFIGURE_EXTRA%%',
             'make: %%MAKE%%',

commit b16e13d531ab9b09706b006303e99e4a7f29cd1e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 29 15:05:18 2009 +0800

    add updatesarch and updateslib to CORE @INC

diff --git a/lib/Shipwright/Util/CleanINC.pm b/lib/Shipwright/Util/CleanINC.pm
index 83dc5f1..eec9940 100644
--- a/lib/Shipwright/Util/CleanINC.pm
+++ b/lib/Shipwright/Util/CleanINC.pm
@@ -10,12 +10,15 @@ sub import {
     
     my %skip_lib_path = map { $_ => 1 } _default_inc();
     delete $skip_lib_path{'.'}; # . is important
-    my @explicit_libs = grep {!/inc$/}  split( /:/,($ENV{'PERL5LIB'} ||''));
-    my @inc_libs = grep {/inc$/}  split( /:/,($ENV{'PERL5LIB'} ||''));
+    my @explicit_libs = grep {!/inc$/}  split( /[:;]/,($ENV{'PERL5LIB'} ||''));
+    my @inc_libs = grep {/inc$/}  split( /[:;]/,($ENV{'PERL5LIB'} ||''));
     # if the libs are explicitly specified, don't pull them from @INC
     my @new_base_inc = grep { !$skip_lib_path{$_}++ } (  @explicit_libs, @INC, at inc_libs);
-    @INC = map { /^(.*)$/ ; $1 }  ( @new_base_inc,
-            $Config::Config{archlibexp}, $Config::Config{privlibexp}, );
+    @INC = map { /(.+)/; $1 } (
+        @new_base_inc,               $Config::Config{archlibexp},
+        $Config::Config{privlibexp}, $Config::Config{updatesarch},
+        $Config::Config{updateslib},
+    );
 }
 
 
@@ -57,8 +60,10 @@ Shipwright::Util::CleanINC - Use this to clean @INC
 
 =head1 DESCRIPTION
 
-this will limit the @INC to only contain Core ( technically, they are
-$Config::Config{privlibexp} and $Config::Config{archlibexp} ) and PERL5LIB
+this will limit the @INC to only contain "Core" ( technically, they are
+$Config::Config{privlibexp} and $Config::Config{archlibexp}, also 
+$Config::Config{updatesarch} and $Config::Config{updateslib}, which are
+used in Mac ) and PERL5LIB
 
 =head1 AUTHOR
 

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