[Bps-public-commit] r16209 - in Shipwright/branches/1.10: lib/Shipwright/Backend share/bin share/etc

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Oct  3 01:42:36 2008
New Revision: 16209

Added:
   Shipwright/branches/1.10/share/etc/shipwright-windows-setenv.bat
Modified:
   Shipwright/branches/1.10/lib/Shipwright/Backend/Base.pm
   Shipwright/branches/1.10/lib/Shipwright/Build.pm
   Shipwright/branches/1.10/share/bin/shipwright-builder

Log:
merged 16206:16208 to 1.1

Modified: Shipwright/branches/1.10/lib/Shipwright/Backend/Base.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Backend/Base.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Backend/Base.pm	Fri Oct  3 01:42:36 2008
@@ -284,12 +284,17 @@
 
             if ( $maker eq 'cpan-Module-Build' ) {
 
+                my @maker_recommends; 
                 # cpan-Regexp-Common is the dep of cpan-Pod-Readme
-                my @maker_recommends = (
+                for my $r (
                     'cpan-Regexp-Common', 'cpan-Pod-Readme',
                     'cpan-version',       'cpan-ExtUtils-CBuilder',
-                    'cpan-Archive-Tar',   'cpan-ExtUtils-ParseXS'
-                );
+                    'cpan-Archive-Tar',   'cpan-ExtUtils-ParseXS',
+                  )
+                {
+                    push @maker_recommends, $r if grep { $r eq $_ } @$order;
+                }
+
                 my %maker_recommends = map { $_ => 1 } @maker_recommends;
                 @$order = grep { $maker_recommends{$_} ? 0 : 1 } @$order;
                 splice @$order, $first_cpan_index + 1, 0, @maker_recommends;

Modified: Shipwright/branches/1.10/lib/Shipwright/Build.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Build.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Build.pm	Fri Oct  3 01:42:36 2008
@@ -188,7 +188,7 @@
             chdir $self->build_base;
         }
 
-        $self->_wrapper();
+        $self->_wrapper() unless $^O =~ /MSWin/;
 
         $self->log->info(
             "install finished. the dists are at " . $self->install_base );

Modified: Shipwright/branches/1.10/share/bin/shipwright-builder
==============================================================================
--- Shipwright/branches/1.10/share/bin/shipwright-builder	(original)
+++ Shipwright/branches/1.10/share/bin/shipwright-builder	Fri Oct  3 01:42:36 2008
@@ -293,7 +293,7 @@
             catfile( $args{'install-base'}, 'etc', $_ ) );
     }
 
-    wrap_bin($log);
+    wrap_bin($log) unless $^O =~ /MSWin/;
 
     print "install finished, the dists are at $args{'install-base'}\n";
     print $log "install finished, the dists are at $args{'install-base'}\n";

Added: Shipwright/branches/1.10/share/etc/shipwright-windows-setenv.bat
==============================================================================
--- (empty file)
+++ Shipwright/branches/1.10/share/etc/shipwright-windows-setenv.bat	Fri Oct  3 01:42:36 2008
@@ -0,0 +1,3 @@
+set PATH=%1\sbin;%1\bin;%PATH%;
+set PERL5LIB=%1\lib\perl5\site_perl;%1\lib\perl5;%PERL5LIB%;
+set LIB=%1\lib;%LIB%