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

[? sunnavy]

The branch, master has been updated
       via  8f41f353cb240206e24a22f1eb05043300c0a1d7 (commit)
       via  5d5bffb0c1026935efd06267bf635f416f9d920e (commit)
       via  0b92d4c059f9d7c175a14b48184960cadcf18e73 (commit)
      from  8de2c78977f62492b256911a9a0495363cb19750 (commit)

Summary of changes:
 Changes                      |    2 ++
 share/bin/shipwright-builder |   11 +++++++++++
 t/71.script_cmds.t           |    2 +-
 3 files changed, 14 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit 0b92d4c059f9d7c175a14b48184960cadcf18e73
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Aug 5 14:24:30 2011 +0800

    in case the base is installed by another shipyard already

diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder
index 586b02d..fbb5f73 100755
--- a/share/bin/shipwright-builder
+++ b/share/bin/shipwright-builder
@@ -948,6 +948,17 @@ sub _set_perl5lib {
         catdir( $args{'install-base'}, 'lib', 'perl5', _get_perl_arch() ),
         catdir( $args{'install-base'}, 'lib', 'perl5', 'site_perl' ),
         catdir( $args{'install-base'}, 'lib', 'perl5' ),
+        catdir(
+            $args{'install-base'}, 'as',
+            $args{as},             'lib',
+            'perl5',               _get_perl_arch()
+        ),
+        catdir(
+            $args{'install-base'}, 'as',
+            $args{as},             'lib',
+            'perl5',               'site_perl'
+        ),
+        catdir( $args{'install-base'}, 'as', $args{as}, 'lib', 'perl5' ),
     );
 }
 

commit 5d5bffb0c1026935efd06267bf635f416f9d920e
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Aug 5 14:41:58 2011 +0800

    update tests as we record the absolute file path now

diff --git a/t/71.script_cmds.t b/t/71.script_cmds.t
index 0eef289..a875fb5 100644
--- a/t/71.script_cmds.t
+++ b/t/71.script_cmds.t
@@ -208,7 +208,7 @@ sub start_test {
 
             qr{dir_configure:\s+ 
               version:\s+vendor:\s+3\.14\s+
-              from:\s+vendor:\s+\Qdirectory:t/dists/dir_configure\E\s+
+              from:\s+vendor:\s+\Qdirectory:\E.*?\Qt/dists/dir_configure\E\s+
               references:\s+0\s+
             }mx,
             'list dir_configure, --version arg works too',

commit 8f41f353cb240206e24a22f1eb05043300c0a1d7
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Aug 5 14:37:59 2011 +0800

    release 2.4.29

diff --git a/Changes b/Changes
index 348da8a..75b20f1 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,8 @@ Revision history for Shipwright
 
 2.4.29
 
+* fix PERL5LIB in case multiple shipyards install to the same place.
+
 2.4.28
 
 * auto build Dist::Zilla distribution when importing.

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