Perl-Dist-WiX

changeset 1051:577482ccb4e3

Merge accidental double-heading.
author Curtis Jewell <perl@curtisjewell.name>
date Thu Jun 09 20:25:59 2011 -0600 (2011-06-09)
parents e43a36f906fe 37fa0958b228
children 85daa4d3caf6
files
line diff
     1.1 --- a/lib/Perl/Dist/WiX.pm	Wed Jun 08 06:55:01 2011 -0600
     1.2 +++ b/lib/Perl/Dist/WiX.pm	Thu Jun 09 20:25:59 2011 -0600
     1.3 @@ -2060,6 +2060,7 @@
     1.4  	  $self->file( qw{ c    bin         gccbug  } ),
     1.5  	  $self->file( qw{ c    bin         mingw32-gcc-3.4.5  } ),
     1.6  	  $self->file( qw{ cpan FTPstats.yml  } ),
     1.7 +	  $self->file( qw{ cpan cpandb.sql    } ),
     1.8  	  ];
     1.9  #>>>
    1.10  } ## end sub _build_filters
    1.11 @@ -2234,6 +2235,15 @@
    1.12  	default  => sub { File::List::Object->new() },
    1.13  );
    1.14  
    1.15 +
    1.16 +has '_msm_files_object' => (
    1.17 +	is       => 'ro',
    1.18 +	isa      => 'File::List::Object',
    1.19 +	init_arg => undef,
    1.20 +	lazy     => 1,
    1.21 +	default  => sub { File::List::Object->new() },
    1.22 +);
    1.23 +
    1.24  # This comes from MooseX::Object::Pluggable, and sets up the
    1.25  # fact that Perl::Dist::WiX::BuildPerl::* is where plugins happen to be.
    1.26  has '+_plugin_ns' => ( default => 'BuildPerl', );
    1.27 @@ -2597,7 +2607,7 @@
    1.28  
    1.29  	# Download and extract the image.
    1.30  	my $tgz = $self->mirror_url( $self->msm_zip(), $self->download_dir() );
    1.31 -	$self->extract_archive( $tgz, $self->image_dir() );
    1.32 +	my @files_extracted = $self->extract_archive( $tgz, $self->image_dir() );
    1.33  	
    1.34  	# Start adding the fragments that are only for an .msi.
    1.35  	$self->_add_fragment( 'StartMenuIcons',
    1.36 @@ -2639,7 +2649,6 @@
    1.37  
    1.38  	# Do the relocation.
    1.39  	$self->execute_perl( $self->file(qw(relocation.pl.bat)));
    1.40 -
    1.41  	
    1.42  	# Do the same for the environment variables
    1.43  	$self->add_path( 'c',    'bin' );
    1.44 @@ -2660,6 +2669,8 @@
    1.45  			$cpan_dir, );
    1.46  	}
    1.47  
    1.48 +	$self->_msm_files_object()->add_files(@files_extracted);
    1.49 +	
    1.50  	return 1;
    1.51  } ## end sub initialize_using_msm
    1.52  
    1.53 @@ -3114,6 +3125,7 @@
    1.54  	}
    1.55  	my @files_in_imagedir = grep {m/\A\Q$image_dir\E/msx} @files;
    1.56  	$files_msi->load_array(@files_in_imagedir);
    1.57 +	$files_msi->add($self->_msm_files_object());
    1.58  	if ( -e $perllocal ) {
    1.59  		$files_msi->add_file($perllocal);
    1.60  	}