Perl-Dist-WiX

changeset 1075:a9c7d3685e50

Get the packlist location for Locale::Maketext right consistently.
author Curtis Jewell <perl@curtisjewell.name>
date Mon Jul 11 22:17:45 2011 -0600 (2011-07-11)
parents a92fc19eae10
children 4254cc184790
files lib/Perl/Dist/WiX/Mixin/BuildPerl.pm
line diff
     1.1 --- a/lib/Perl/Dist/WiX/Mixin/BuildPerl.pm	Mon Jul 11 20:22:45 2011 -0600
     1.2 +++ b/lib/Perl/Dist/WiX/Mixin/BuildPerl.pm	Mon Jul 11 22:17:45 2011 -0600
     1.3 @@ -202,6 +202,12 @@
     1.4  				$self->_install_cpan_module( $module, 1 );
     1.5  			}
     1.6  
     1.7 +			when (m{/Locale-Maketext-\d}msx) {
     1.8 +
     1.9 +				# This one has an odd packlist location.
    1.10 +				$self->_install_cpan_module( $module, $default_force, 'Locale-Maketext' );
    1.11 +			}
    1.12 +
    1.13  			when (m{/Time-HiRes-}msx) {
    1.14  
    1.15  				# Time-HiRes is timing-dependent, of course.
    1.16 @@ -356,7 +362,7 @@
    1.17  
    1.18  
    1.19  sub _install_cpan_module {
    1.20 -	my ( $self, $module, $force ) = @_;
    1.21 +	my ( $self, $module, $force, $packlist_location ) = @_;
    1.22  
    1.23  	# Collect information.
    1.24  	$force = $force or $self->force();
    1.25 @@ -379,8 +385,9 @@
    1.26  	# Actually do the installation.
    1.27  	$self->install_distribution(
    1.28  		name     => $module_file,
    1.29 -		mod_name => $self->_packlist_fix($module_id),
    1.30 +		mod_name => $module_id,
    1.31  		$self->_install_location($core),
    1.32 +		$packlist_location ? ( packlist_location => $packlist_location ) : (),
    1.33  		$force
    1.34  		  ? ( force => 1 )
    1.35  		  : (),
    1.36 @@ -719,7 +726,7 @@
    1.37  #<<<
    1.38  		$self->install_distribution(
    1.39  			name              => $dist,
    1.40 -			mod_name          => $self->_packlist_fix($module_id),
    1.41 +			mod_name          => $mod_name,
    1.42  			force             => $force,
    1.43  			automated_testing => $automated_testing,
    1.44  			release_testing   => $release_testing,