[Bps-public-commit] r18460 - in Shipwright/trunk: lib/Shipwright/Backend lib/Shipwright/Script share/bin

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Feb 19 00:51:38 2009
New Revision: 18460

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Backend/Base.pm
   Shipwright/trunk/lib/Shipwright/Script/Import.pm
   Shipwright/trunk/share/bin/shipwright-utility

Log:
 r19957 at sunnavys-mb:  sunnavy | 2009-02-19 13:47:32 +0800
 remove fiddle_order stuff


Modified: Shipwright/trunk/lib/Shipwright/Backend/Base.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Backend/Base.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Backend/Base.pm	Thu Feb 19 00:51:38 2009
@@ -355,72 +355,9 @@
       or confess $@;
     my $order = $dep->schedule_all();
 
-#    $order = $self->fiddle_order($order);
-
     $self->order($order);
 }
 
-=item fiddle_order
-
-fiddle the order a bit
-put cpan-ExtUtils-MakeMaker and cpan-Module-Build to the head of
-cpan dists.
-also put cpan-Module-Build's recommends right after it,
-since we omitted them in the $require->{'cpan-Module-Build'}
-
-if not passed order, will use the one in shipwright/order.yml.
-return fiddled order.
-
-note, this sub won't update shipwright/order.yml, you need to do it yourself.
-
-NOTE: this's going to be dropped, it's _wrong_ to fiddle order
-
-=cut
-
-#sub fiddle_order {
-#    my $self       = shift;
-#    my $orig_order = shift;
-#
-#    my $order;
-#    if ($orig_order) {
-#
-#        # don't change the argument
-#        $order = [@$orig_order];
-#    }
-#    else {
-#        $order = $self->order;
-#    }
-#
-#    for my $maker ( 'cpan-Module-Build', 'cpan-ExtUtils-MakeMaker' ) {
-#        if ( grep { $_ eq $maker } @$order ) {
-#            @$order = grep { $_ ne $maker } @$order;
-#            my $first_cpan_index = firstidx { /^cpan-/ } @$order;
-#            $first_cpan_index = scalar @$order if $first_cpan_index == -1;
-#            splice @$order, $first_cpan_index, 0, $maker;
-#
-#            if ( $maker eq 'cpan-Module-Build' ) {
-#
-#                my @maker_recommends;
-#
-#                # cpan-Regexp-Common is the dep of cpan-Pod-Readme
-#                for my $r (
-#                    'cpan-Regexp-Common', 'cpan-Pod-Readme',
-#                    'cpan-version',       'cpan-ExtUtils-CBuilder',
-#                    '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;
-#            }
-#        }
-#    }
-#    return $order;
-#}
-
 sub _fill_deps {
     my $self    = shift;
     my %args    = @_;

Modified: Shipwright/trunk/lib/Shipwright/Script/Import.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Script/Import.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Script/Import.pm	Thu Feb 19 00:51:38 2009
@@ -239,8 +239,6 @@
             }
         }
 
-#        my $new_order = $shipwright->backend->fiddle_order;
-#        $shipwright->backend->order($new_order);
     }
 
     print "imported with success\n";

Modified: Shipwright/trunk/share/bin/shipwright-utility
==============================================================================
--- Shipwright/trunk/share/bin/shipwright-utility	(original)
+++ Shipwright/trunk/share/bin/shipwright-utility	Thu Feb 19 00:51:38 2009
@@ -74,33 +74,6 @@
       or confess $@;
     my $order = $dep->schedule_all();
 
-#    # fiddle the order a bit
-#    # put cpan-ExtUtils-MakeMaker and cpan-Module-Build to the head of
-#    # cpan dists.
-#    # also put cpan-Module-Build's recommends right after it,
-#    # since we omitted them in the $require->{'cpan-Module-Build'}
-#
-#    for my $maker ( 'cpan-Module-Build', 'cpan-ExtUtils-MakeMaker' ) {
-#        if ( grep { $_ eq $maker } @$order ) {
-#            @$order = grep { $_ ne $maker } @$order;
-#            my $first_cpan_index = firstidx { /^cpan-/ } @$order;
-#            splice @$order, $first_cpan_index, 0, $maker;
-#
-#            if ( $maker eq 'cpan-Module-Build' ) {
-#
-#                # cpan-Regexp-Common is the dep of cpan-Pod-Readme
-#                my @maker_recommends = (
-#                    'cpan-Regexp-Common', 'cpan-Pod-Readme',
-#                    'cpan-version',       'cpan-ExtUtils-CBuilder',
-#                    'cpan-Archive-Tar',   'cpan-ExtUtils-ParseXS'
-#                );
-#                my %maker_recommends = map { $_ => 1 } @maker_recommends;
-#                @$order = grep { $maker_recommends{$_} ? 0 : 1 } @$order;
-#                splice @$order, $first_cpan_index + 1, 0, @maker_recommends;
-#            }
-#        }
-#    }
-
     DumpFile( 'shipwright/order.yml', $order );
 }