[Bps-public-commit] r10033 - in bpsbuilder/BPB: docs lib/BPB

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Dec 21 00:56:08 2007
New Revision: 10033

Modified:
   bpsbuilder/BPB/docs/tutorial
   bpsbuilder/BPB/examples/config.yml
   bpsbuilder/BPB/lib/BPB/Build.pm

Log:
no extra_lib in config any more, we can automatically find it

Modified: bpsbuilder/BPB/docs/tutorial
==============================================================================
--- bpsbuilder/BPB/docs/tutorial	(original)
+++ bpsbuilder/BPB/docs/tutorial	Fri Dec 21 00:56:08 2007
@@ -17,8 +17,6 @@
         install_base: '/tmp/jdbi' # where our project will be installed
         perl: '/usr/bin/perl'  # which perl we will use
         skip_test: 0 # skip the test or not, 1 means yes, 0 means no
-        extra_lib:
-            - 'lib/perl5/darwin-thread-multi-2level' # this depends on your system
 
 2. init bpb's backend
 

Modified: bpsbuilder/BPB/examples/config.yml
==============================================================================
--- bpsbuilder/BPB/examples/config.yml	(original)
+++ bpsbuilder/BPB/examples/config.yml	Fri Dec 21 00:56:08 2007
@@ -20,6 +20,4 @@
         install_base: '/tmp/svk'
         perl: '/usr/bin/perl'
         skip_test: 1
-        extra_lib:
-            - 'lib/perl5/darwin-thread-multi-2level'
 

Modified: bpsbuilder/BPB/lib/BPB/Build.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Build.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Build.pm	Fri Dec 21 00:56:08 2007
@@ -7,7 +7,7 @@
 use base qw/Class::Accessor::Fast/;
 
 __PACKAGE__->mk_accessors(
-    qw/install_base perl build_base skip_test commands extra_lib/);
+    qw/install_base perl build_base skip_test commands/);
 
 use File::Spec;
 use File::Temp qw/tempdir/;
@@ -15,6 +15,7 @@
 use File::Copy qw/move/;
 use File::Find qw/find/;
 use File::Slurp;
+use Config;
 
 sub new {
     my $class = shift;
@@ -62,11 +63,10 @@
     chdir File::Spec->catfile( 'dists', $dir );
 
     my @commands;
-    my $lib = " -I" . File::Spec->catfile( $self->install_base, 'lib', 'perl5' );
-    if ( $self->extra_lib ) {
-        $lib .= " -I" . join " -I", map { File::Spec->catfile(
-                $self->install_base, $_ ) }  @{ $self->extra_lib };
-    }
+    my $lib =
+        " -I" . File::Spec->catfile( $self->install_base, 'lib', 'perl5' ) . 
+        " -I" . File::Spec->catfile( $self->install_base, 'lib', 'perl5',
+            $Config{archname} );
 
     if ( -f '_build' ) {
         $self->_substitute('_build');