[svk-commit] r2358 - in branches/2.0-releng: . inc/Module lib/SVK

nobody at bestpractical.com nobody at bestpractical.com
Thu Mar 22 12:07:39 EDT 2007


Author: clkao
Date: Thu Mar 22 12:07:38 2007
New Revision: 2358

Modified:
   branches/2.0-releng/CHANGES
   branches/2.0-releng/inc/Module/Install.pm
   branches/2.0-releng/inc/Module/Install/AutoInstall.pm
   branches/2.0-releng/inc/Module/Install/Base.pm
   branches/2.0-releng/inc/Module/Install/Can.pm
   branches/2.0-releng/inc/Module/Install/Fetch.pm
   branches/2.0-releng/inc/Module/Install/Include.pm
   branches/2.0-releng/inc/Module/Install/Makefile.pm
   branches/2.0-releng/inc/Module/Install/Metadata.pm
   branches/2.0-releng/inc/Module/Install/Scripts.pm
   branches/2.0-releng/inc/Module/Install/Win32.pm
   branches/2.0-releng/inc/Module/Install/WriteAll.pm
   branches/2.0-releng/lib/SVK/Version.pm

Log:
2.0.1rc1

Modified: branches/2.0-releng/CHANGES
==============================================================================
--- branches/2.0-releng/CHANGES	(original)
+++ branches/2.0-releng/CHANGES	Thu Mar 22 12:07:38 2007
@@ -34,6 +34,7 @@
   Others
     * Make updating a checkout that no longer exists in the depot give
       proper message.
+    * Make checkout more robust when resuming a interrupted checkout.
     * Check for .svk/floating before assuming floating checkout.
     * Fix a regression which caused binary files to sometimes be
       displayed as text during an "svk diff".

Modified: branches/2.0-releng/inc/Module/Install.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install.pm	(original)
+++ branches/2.0-releng/inc/Module/Install.pm	Thu Mar 22 12:07:38 2007
@@ -28,7 +28,7 @@
     # This is not enforced yet, but will be some time in the next few
     # releases once we can make sure it won't clash with custom
     # Module::Install extensions.
-    $VERSION = '0.64';
+    $VERSION = '0.65';
 }
 
 # Whether or not inc::Module::Install is actually loaded, the

Modified: branches/2.0-releng/inc/Module/Install/AutoInstall.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/AutoInstall.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/AutoInstall.pm	Thu Mar 22 12:07:38 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/inc/Module/Install/Base.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Base.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Base.pm	Thu Mar 22 12:07:38 2007
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.64';
+$VERSION = '0.65';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: branches/2.0-releng/inc/Module/Install/Can.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Can.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Can.pm	Thu Mar 22 12:07:38 2007
@@ -11,7 +11,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/inc/Module/Install/Fetch.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Fetch.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Fetch.pm	Thu Mar 22 12:07:38 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/inc/Module/Install/Include.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Include.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Include.pm	Thu Mar 22 12:07:38 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/inc/Module/Install/Makefile.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Makefile.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Makefile.pm	Thu Mar 22 12:07:38 2007
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
@@ -136,9 +136,13 @@
                 . "but we need version >= $perl_version";
     }
 
+    $args->{INSTALLDIRS} = $self->installdirs;
+
     my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
-    if ($self->admin->preop) {
-        $args{dist} = $self->admin->preop;
+
+    my $user_preop = delete $args{dist}->{PREOP};
+    if (my $preop = $self->admin->preop($user_preop)) {
+        $args{dist} = $preop;
     }
 
     my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -205,4 +209,4 @@
 
 __END__
 
-#line 334
+#line 338

Modified: branches/2.0-releng/inc/Module/Install/Metadata.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Metadata.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Metadata.pm	Thu Mar 22 12:07:38 2007
@@ -6,14 +6,14 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
 
 my @scalar_keys = qw{
     name module_name abstract author version license
-    distribution_type perl_version tests
+    distribution_type perl_version tests installdirs
 };
 
 my @tuple_keys = qw{
@@ -56,6 +56,11 @@
     };
 }
 
+sub install_as_core   { $_[0]->installdirs('perl')   }
+sub install_as_cpan   { $_[0]->installdirs('site')   }
+sub install_as_site   { $_[0]->installdirs('site')   }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
 sub sign {
     my $self = shift;
     return $self->{'values'}{'sign'} if defined wantarray and !@_;
@@ -279,9 +284,11 @@
 
     if (
         $self->_slurp($file) =~ m/
-        =head \d \s+
-        (?:licen[cs]e|licensing|copyright|legal)\b
-        (.*?)
+        (
+            =head \d \s+
+            (?:licen[cs]e|licensing|copyright|legal)\b
+            .*?
+        )
         (=head\\d.*|=cut.*|)
         \z
     /ixms
@@ -298,6 +305,7 @@
             'LGPL'                                            => 'lgpl',
             'BSD'                                             => 'bsd',
             'Artistic'                                        => 'artistic',
+            'MIT'                                             => 'MIT',
         );
         while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
             $pattern =~ s{\s+}{\\s+}g;

Modified: branches/2.0-releng/inc/Module/Install/Scripts.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Scripts.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Scripts.pm	Thu Mar 22 12:07:38 2007
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/inc/Module/Install/Win32.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/Win32.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/Win32.pm	Thu Mar 22 12:07:38 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/inc/Module/Install/WriteAll.pm
==============================================================================
--- branches/2.0-releng/inc/Module/Install/WriteAll.pm	(original)
+++ branches/2.0-releng/inc/Module/Install/WriteAll.pm	Thu Mar 22 12:07:38 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.64';
+	$VERSION = '0.65';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/2.0-releng/lib/SVK/Version.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Version.pm	(original)
+++ branches/2.0-releng/lib/SVK/Version.pm	Thu Mar 22 12:07:38 2007
@@ -50,7 +50,7 @@
 # END BPS TAGGED BLOCK }}}
 package SVK;
 
-use version; our $VERSION = qv(2.0.0);
+use version; our $VERSION = qv(2.0.0_91);
 
 =head1 NAME
 


More information about the svk-commit mailing list