r26328 - in /branches/upstream/libpar-dist-perl/current: Changes META.yml README lib/PAR/Dist.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Wed Oct 29 12:07:33 UTC 2008
Author: gregoa
Date: Wed Oct 29 12:07:30 2008
New Revision: 26328
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26328
Log:
[svn-upgrade] Integrating new upstream version, libpar-dist-perl (0.40)
Modified:
branches/upstream/libpar-dist-perl/current/Changes
branches/upstream/libpar-dist-perl/current/META.yml
branches/upstream/libpar-dist-perl/current/README
branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm
Modified: branches/upstream/libpar-dist-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/Changes?rev=26328&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/Changes (original)
+++ branches/upstream/libpar-dist-perl/current/Changes Wed Oct 29 12:07:30 2008
@@ -1,3 +1,13 @@
+By: smueller on 2008/10/27
+ * Rewrite parts of the install_par docs.
+ * Add the esoteric auto_inst_lib_conversion parameter to install_par.
+ * This is 0.40.
+____________________________________________________________________________
+By: smueller on 2008/10/21
+ * Add the "verbose" option to install_par and uninstall_par.
+ * Add the "uninstall_shadows" option to install_par.
+ * This is 0.39.
+____________________________________________________________________________
By: smueller on 2008/10/16
* Fix _check_tools() to use *Foo{THING} syntax instead of \&{}.
* This is 0.38.
Modified: branches/upstream/libpar-dist-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/META.yml?rev=26328&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/META.yml (original)
+++ branches/upstream/libpar-dist-perl/current/META.yml Wed Oct 29 12:07:30 2008
@@ -1,11 +1,11 @@
--- #YAML:1.0
name: PAR-Dist
-version: 0.38
+version: 0.40
abstract: Create and manipulate PAR distributions
license: ~
author:
- Audrey Tang <cpan at audreyt.org>
-generated_by: ExtUtils::MakeMaker version 6.44
+generated_by: ExtUtils::MakeMaker version 6.42
distribution_type: module
requires:
File::Find: 0
Modified: branches/upstream/libpar-dist-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/README?rev=26328&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/README (original)
+++ branches/upstream/libpar-dist-perl/current/README Wed Oct 29 12:07:30 2008
@@ -8,7 +8,6 @@
PAR::Dist uses the standard perl module install process:
-cpansign -v # optional; see SIGNATURE for details
perl Makefile.PL
make # or 'nmake' on Win32
make test
@@ -25,7 +24,7 @@
* Copyright
-Copyright 2003-2007 by Audrey Tang <autrijus at autrijus.org>.
+Copyright 2003-2008 by Audrey Tang <autrijus at autrijus.org>.
All rights reserved. You can redistribute and/or modify
this bundle under the same terms as Perl itself.
Modified: branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm?rev=26328&op=diff
==============================================================================
--- branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm (original)
+++ branches/upstream/libpar-dist-perl/current/lib/PAR/Dist.pm Wed Oct 29 12:07:30 2008
@@ -2,7 +2,7 @@
require Exporter;
use vars qw/$VERSION @ISA @EXPORT @EXPORT_OK $DEBUG/;
-$VERSION = '0.38';
+$VERSION = '0.40';
@ISA = 'Exporter';
@EXPORT = qw/
blib_to_par
@@ -33,7 +33,7 @@
=head1 VERSION
-This document describes version 0.38 of PAR::Dist, released October 16, 2008.
+This document describes version 0.40 of PAR::Dist, released October 27, 2008.
=head1 SYNOPSIS
@@ -309,7 +309,10 @@
Installs a PAR distribution into the system, using
C<ExtUtils::Install::install_default>.
-Valid parameters are:
+If only a single parameter is given, it is treated as the value for the
+C<dist> parameter.
+
+Valid named parameters are:
=over 2
@@ -324,7 +327,24 @@
If it isn't specified, the environment variable
C<PERL_INSTALL_ROOT> is used as a prefix.
+=item uninstall_shadows
+
+This corresponds to the C<uninstall_shadows> option of L<ExtUtils::Install>. Quoting its manual:
+If C<uninstall_shadows> is set to true, any differing versions throughout C<@INC>
+will be uninstalled. This is C<make install UNINST=1>.
+
+=item verbose
+
+This corresponds to the C<verbose> option of L<ExtUtils::Install>. According to its manual:
+If C<verbose> is true, will print out each file removed. This is C<make install VERBINST=1>.
+C<verbose> values going up to 5 show increasingly more diagnostics output.
+
+Default verbosity for PAR::Dist is 1.
+
=back
+
+If you're just going to install into the running perl like everything else,
+you can stop reading the rest of this section now.
Additionally, you can use several parameters to change the default
installation destinations. You don't usually have to worry about this
@@ -349,6 +369,16 @@
C<inst_man1dir => undef, inst_man3dir => undef> means that the contained
manual pages won't be installed. This is not available for the packlists.
+Again, the defaults will be the normal I<site> paths from C<%Config>.
+
+(*) If the C<.par>'s I<inst_archlib> section (normally C<blib/arch>)
+isn't empty, the code in I<inst_lib> (normally C<blib/lib>) is also installed
+into the I<inst_archlib> path. This makes sense for XS modules.
+If, however, you override C<inst_lib>, this automatic conversion is
+also overridden! You can use the named parameter
+C<auto_inst_lib_conversion =E<gt> 1> to re-enable the conversion
+for custom I<inst_lib>'s.
+
Finally, you may specify a C<custom_targets> parameter. Its value should be
a reference to a hash of custom installation targets such as
@@ -356,9 +386,6 @@
You can use this to install the F<.par> archives contents to arbitrary
locations.
-
-If only a single parameter is given, it is treated as the C<dist>
-parameter.
=cut
@@ -377,6 +404,9 @@
to this is the C<packlist_read> parameter which specifies the
F<.packlist> file to read the list of installed files from.
It defaults to C<$Config::Config{installsitearch}/auto/$name/.packlist>.
+
+Additionally, the C<uninstall_shadows> parameter of C<install_par>
+isn't available.
=cut
@@ -427,12 +457,16 @@
my $custom_targets = $args{custom_targets} || {};
$target->{$_} = $custom_targets->{$_} foreach keys %{$custom_targets};
- $rv = ExtUtils::Install::install($target, 1, 0, 0);
+ my $uninstall_shadows = $args{uninstall_shadows};
+ my $verbose = $args{verbose};
+ $rv = ExtUtils::Install::install($target, $verbose, 0, $uninstall_shadows);
}
elsif ($action eq 'uninstall') {
require Config;
+ my $verbose = $args{verbose};
$rv = ExtUtils::Install::uninstall(
- $args{packlist_read}||"$Config::Config{installsitearch}/auto/$name/.packlist"
+ $args{packlist_read}||"$Config::Config{installsitearch}/auto/$name/.packlist",
+ $verbose
);
}
@@ -469,14 +503,16 @@
);
+ my $par_has_archlib = _directory_not_empty( $sources{inst_archlib} );
+
# default targets
my $target = {
read => $Config::Config{sitearchexp}."/auto/$name/.packlist",
write => $Config::Config{installsitearch}."/auto/$name/.packlist",
- $sources{inst_lib}
- => (_directory_not_empty($sources{inst_archlib}))
- ? $Config::Config{installsitearch}
- : $Config::Config{installsitelib},
+ $sources{inst_lib} =>
+ ($par_has_archlib
+ ? $Config::Config{installsitearch}
+ : $Config::Config{installsitelib}),
$sources{inst_archlib} => $Config::Config{installsitearch},
$sources{inst_bin} => $Config::Config{installbin} ,
$sources{inst_script} => $Config::Config{installscript},
@@ -509,6 +545,12 @@
# overwrite stuff, don't let the user create new entries
$target->{ $sources{$key} } = $value;
}
+ }
+
+ # apply the automatic inst_lib => inst_archlib conversion again
+ # if the user asks for it and there is an archlib in the .par
+ if ($user->{auto_inst_lib_conversion} and $par_has_archlib) {
+ $target->{inst_lib} = $target->{inst_archlib};
}
return $target;
More information about the Pkg-perl-cvs-commits
mailing list