[Bps-public-commit] r14737 - in Shipwright/trunk: . t

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun Aug  3 03:00:20 2008
New Revision: 14737

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Util.pm
   Shipwright/trunk/t/05.util.t

Log:
 r15238 at sunnavys-mb:  sunnavy | 2008-08-03 14:57:17 +0800
 Module::Install changed layout a bit, share dir lives in blib/lib/auto/share/dist/Shipwright now


Modified: Shipwright/trunk/lib/Shipwright/Util.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Util.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Util.pm	Sun Aug  3 03:00:20 2008
@@ -115,6 +115,13 @@
         $root[-1] = 'share';                       # replace 'lib' to 'share'
         $SHARE_ROOT = File::Spec->catdir(@root);
     }
+
+    if ( $SHARE_ROOT !~ m{([/\\])auto\1share\1}
+            && $SHARE_ROOT =~ m{([/\\])blib\1lib\1} ) {
+        my $sep = $1;
+        $SHARE_ROOT =~ s!${sep}auto$sep!${sep}auto${sep}share${sep}dist${sep}!;
+    }
+
     return ($SHARE_ROOT);
 
 }

Modified: Shipwright/trunk/t/05.util.t
==============================================================================
--- Shipwright/trunk/t/05.util.t	(original)
+++ Shipwright/trunk/t/05.util.t	Sun Aug  3 03:00:20 2008
@@ -19,7 +19,7 @@
     # found blib/lib, so we're probably in `make test` or something like that.
     $shipwright_root = File::Spec->catfile( $cwd, 'blib', 'lib' );
     $share_root =
-      File::Spec->catfile( $cwd, 'blib', 'lib', 'auto', 'Shipwright' );
+      File::Spec->catfile( $cwd, 'blib', 'lib', 'auto', 'share', 'dist', 'Shipwright' );
 }
 else {
     $shipwright_root = File::Spec->catfile( $cwd, 'lib' );