[Bps-public-commit] r17816 - in Shipwright/trunk: inc/Module inc/Module/Install
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Sun Jan 18 07:57:56 EST 2009
Author: sunnavy
Date: Sun Jan 18 07:57:55 2009
New Revision: 17816
Modified:
Shipwright/trunk/ (props changed)
Shipwright/trunk/MANIFEST
Shipwright/trunk/META.yml
Shipwright/trunk/inc/Module/Install.pm
Shipwright/trunk/inc/Module/Install/AutoInstall.pm
Shipwright/trunk/inc/Module/Install/Base.pm
Shipwright/trunk/inc/Module/Install/Can.pm
Shipwright/trunk/inc/Module/Install/Fetch.pm
Shipwright/trunk/inc/Module/Install/Include.pm
Shipwright/trunk/inc/Module/Install/Makefile.pm
Shipwright/trunk/inc/Module/Install/Metadata.pm
Shipwright/trunk/inc/Module/Install/Share.pm
Shipwright/trunk/inc/Module/Install/Win32.pm
Shipwright/trunk/inc/Module/Install/WriteAll.pm
Log:
r18888 at sunnavys-mb: sunnavy | 2009-01-18 17:47:44 +0800
updated package files
Modified: Shipwright/trunk/MANIFEST
==============================================================================
--- Shipwright/trunk/MANIFEST (original)
+++ Shipwright/trunk/MANIFEST Sun Jan 18 07:57:55 2009
@@ -1,3 +1,4 @@
+bin/jeos-build
bin/shipwright
Changes
inc/Module/AutoInstall.pm
@@ -24,6 +25,7 @@
lib/Shipwright/Manual/CustomizeBuild.pod
lib/Shipwright/Manual/Glossary.pod
lib/Shipwright/Manual/Tutorial.pod
+lib/Shipwright/Manual/UsingBranches.pod
lib/Shipwright/Manual/UsingFlags.pod
lib/Shipwright/Script.pm
lib/Shipwright/Script/Build.pm
@@ -62,7 +64,7 @@
share/etc/shipwright-source-bash
share/etc/shipwright-source-tcsh
share/etc/shipwright-utility
-share/shipwright/branches.yml
+share/etc/shipwright-windows-setenv.bat
share/shipwright/branches.yml
share/shipwright/flags.yml
share/shipwright/known_test_failures.yml
@@ -90,6 +92,7 @@
t/dists/version1/info
t/dists/version2/info
t/hello/Acme-Hello-0.03.tar.gz
+t/hello/fs.t
t/hello/scripts/build
t/hello/scripts/howdy_require.yml
t/hello/scripts/require.yml
Modified: Shipwright/trunk/META.yml
==============================================================================
--- Shipwright/trunk/META.yml (original)
+++ Shipwright/trunk/META.yml Sun Jan 18 07:57:55 2009
@@ -7,7 +7,7 @@
IPC::Cmd: 0
Module::Build: 0
distribution_type: module
-generated_by: 'Module::Install version 0.76'
+generated_by: 'Module::Install version 0.77'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -23,6 +23,8 @@
Algorithm::Dependency::Ordered: 0
Algorithm::Dependency::Source::HoA: 0
App::CLI: 0
+ Archive::Extract: 0
+ Archive::Tar: 0
CPAN: 1.9205
CPAN::DistnameInfo: 0
Class::Accessor::Fast: 0
@@ -32,6 +34,8 @@
File::Spec: 0
File::Temp: 0
Hash::Merge: 0
+ IO::Uncompress::Bunzip2: 0
+ IO::Uncompress::RawInflate: 2.012
IPC::Run3: 0
LWP::UserAgent: 0
List::MoreUtils: 0
@@ -45,4 +49,4 @@
version: 0
resources:
license: http://dev.perl.org/licenses/
-version: 2.0
+version: 2.000000
Modified: Shipwright/trunk/inc/Module/Install.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install.pm (original)
+++ Shipwright/trunk/inc/Module/Install.pm Sun Jan 18 07:57:55 2009
@@ -30,7 +30,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.76';
+ $VERSION = '0.77';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -125,8 +125,10 @@
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')} unless uc($1) eq $1;
+ unless ( uc($1) eq $1 ) {
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')};
+ }
};
}
@@ -339,6 +341,9 @@
close FH or die "close($_[0]): $!";
}
+# _version is for processing module versions (eg, 1.03_05) not
+# Perl versions (eg, 5.8.1).
+
sub _version ($) {
my $s = shift || 0;
$s =~ s/^(\d+)\.?//;
Modified: Shipwright/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ Shipwright/trunk/inc/Module/Install/AutoInstall.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Base.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Base.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Base.pm Sun Jan 18 07:57:55 2009
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.76';
+$VERSION = '0.77';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: Shipwright/trunk/inc/Module/Install/Can.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Can.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Can.pm Sun Jan 18 07:57:55 2009
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -39,6 +39,7 @@
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
+ next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[1]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
@@ -79,4 +80,4 @@
__END__
-#line 157
+#line 158
Modified: Shipwright/trunk/inc/Module/Install/Fetch.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Fetch.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Fetch.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Include.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Include.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Include.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Makefile.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Makefile.pm Sun Jan 18 07:57:55 2009
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -181,7 +181,9 @@
my $user_preop = delete $args{dist}->{PREOP};
if (my $preop = $self->admin->preop($user_preop)) {
- $args{dist} = $preop;
+ foreach my $key ( keys %$preop ) {
+ $args{dist}->{$key} = $preop->{$key};
+ }
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -248,4 +250,4 @@
__END__
-#line 377
+#line 379
Modified: Shipwright/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Metadata.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Metadata.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -175,6 +175,12 @@
my $version = shift or die(
"Did not provide a value to perl_version()"
);
+
+ # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
+ # numbers (eg, 5.006001 or 5.008009).
+
+ $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
+
$version =~ s/_.+$//;
$version = $version + 0; # Numify
unless ( $version >= 5.005 ) {
@@ -213,6 +219,9 @@
die("all_from cannot find $file from $name");
}
}
+ unless ( -f $file ) {
+ die("The path '$file' does not exist, or is not a file");
+ }
# Some methods pull from POD instead of code.
# If there is a matching .pod, use that instead
@@ -424,8 +433,12 @@
my $license_text = $1;
my @phrases = (
'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU general public license' => 'gpl', 1,
'GNU public license' => 'gpl', 1,
+ 'GNU lesser general public license' => 'lgpl', 1,
'GNU lesser public license' => 'lgpl', 1,
+ 'GNU library general public license' => 'lgpl', 1,
+ 'GNU library public license' => 'lgpl', 1,
'BSD license' => 'bsd', 1,
'Artistic license' => 'artistic', 1,
'GPL' => 'gpl', 1,
Modified: Shipwright/trunk/inc/Module/Install/Share.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Share.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Share.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: Shipwright/trunk/inc/Module/Install/Win32.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/Win32.pm (original)
+++ Shipwright/trunk/inc/Module/Install/Win32.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: Shipwright/trunk/inc/Module/Install/WriteAll.pm
==============================================================================
--- Shipwright/trunk/inc/Module/Install/WriteAll.pm (original)
+++ Shipwright/trunk/inc/Module/Install/WriteAll.pm Sun Jan 18 07:57:55 2009
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.76';
+ $VERSION = '0.77';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
More information about the Bps-public-commit
mailing list