[Bps-public-commit] r10289 - in bpsbuilder/BPB/lib/BPB: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Jan 11 10:04:01 2008
New Revision: 10289

Modified:
   bpsbuilder/BPB/lib/BPB/Backend.pm
   bpsbuilder/BPB/lib/BPB/Build.pm
   bpsbuilder/BPB/lib/BPB/Script/Import.pm

Log:
set PERL5LIB, no need to use -I cli :)

Modified: bpsbuilder/BPB/lib/BPB/Backend.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Backend.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Backend.pm	Fri Jan 11 10:04:01 2008
@@ -89,6 +89,9 @@
     $ENV{LD_LIBRARY_PATH} =
       File::Spec->catfile( $args{'install-base'}, 'lib' ) . ':'
       . $ENV{LD_LIBRARY_PATH};
+    $ENV{PERL5LIB} =
+      File::Spec->catfile( $args{'install-base'}, 'lib', 'perl5' ) . ':'
+      . $ENV{PERL5LIB};
 }
 
 
@@ -100,9 +103,6 @@
 copy( File::Spec->catfile( 'etc', 'bpb-script-wrapper' ),
     File::Spec->catfile( $args{'install-base'}, 'etc', 'bpb-script-wrapper' ) );
 
-chmod 0755,
-  File::Spec->catfile( $args{'install-base'}, 'etc', 'bpb-script-wrapper' );
-
 my $order = parse_order( File::Spec->catfile( 'bpb', 'order.yml' ) );
 
 for my $dist (@$order) {
@@ -126,10 +126,6 @@
 
     chdir File::Spec->catfile( 'dists', $dir );
 
-    my $lib = " -I"
-      . File::Spec->catfile( $args{'install-base'}, 'lib', 'perl5' ) . " -I"
-      . File::Spec->catfile( $args{'install-base'}, 'lib', 'perl5',
-        $Config{archname} );
 
     if ( !-f '__build' ) {
         warn "I have no idea how to build this distribution";

Modified: bpsbuilder/BPB/lib/BPB/Build.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Build.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Build.pm	Fri Jan 11 10:04:01 2008
@@ -31,6 +31,9 @@
     $ENV{LD_LIBRARY_PATH} =
       File::Spec->catfile( $self->install_base, 'lib' ) . ':'
       . $ENV{LD_LIBRARY_PATH};
+    $ENV{PERL5LIB} =
+      File::Spec->catfile( $self->install_base, 'lib', 'perl5' ) . ':'
+      . $ENV{PERL5LIB};
     return $self;
 }
 
@@ -55,9 +58,6 @@
 
     dircopy( 'etc', File::Spec->catfile( $self->install_base, 'etc' ) );
 
-    chmod 0755,
-      File::Spec->catfile( $self->install_base, 'etc', 'bpb-script-wrapper' );
-
     my $order =
       BPB::Config::LoadFile( File::Spec->catfile( 'bpb', 'order.yml' ) );
 

Modified: bpsbuilder/BPB/lib/BPB/Script/Import.pm
==============================================================================
--- bpsbuilder/BPB/lib/BPB/Script/Import.pm	(original)
+++ bpsbuilder/BPB/lib/BPB/Script/Import.pm	Fri Jan 11 10:04:01 2008
@@ -157,8 +157,6 @@
         push @commands,
           'configure: '
           . $bpb->build->perl
-          . ' -I%%INSTALL_BASE%%/lib/perl5'
-          . " -I%%INSTALL_BASE%%/lib/perl5/$Config{archname}"
           . ' Build.PL --install_base=%%INSTALL_BASE%%';
         push @commands, "test: ./Build test";
         push @commands, "install: ./Build install";
@@ -167,8 +165,6 @@
         push @commands,
           'configure: '
           . $bpb->build->perl
-          . ' -I%%INSTALL_BASE%%/lib/perl5'
-          . " -I%%INSTALL_BASE%%/lib/perl5/$Config{archname} "
           . ' Makefile.PL INSTALL_BASE=%%INSTALL_BASE%%';
         push @commands, 'test: make test';