Perl-Dist-WiX

changeset 1073:465ddd293283

Keep only the Windows directories for the base path when executing things.

(the directories of the distribution being created will also be added.)
author Curtis Jewell <perl@curtisjewell.name>
date Mon Jul 11 05:17:57 2011 -0600 (2011-07-11)
parents 12af52f3fea4
children a92fc19eae10
files lib/Perl/Dist/WiX/Mixin/Support.pm
line diff
     1.1 --- a/lib/Perl/Dist/WiX/Mixin/Support.pm	Sun Jun 26 20:46:39 2011 -0600
     1.2 +++ b/lib/Perl/Dist/WiX/Mixin/Support.pm	Mon Jul 11 05:17:57 2011 -0600
     1.3 @@ -373,11 +373,9 @@
     1.4  		# Strip any path that doesn't exist
     1.5  		next if not -d $p;
     1.6  
     1.7 -		# Strip any path that contains either dmake or perl.exe.
     1.8 -		# This should remove both the ...\c\bin and ...\perl\bin
     1.9 -		# parts of the paths that Vanilla/Strawberry added.
    1.10 -		next if -f catfile( $p, 'dmake.exe' );
    1.11 -		next if -f catfile( $p, 'perl.exe' );
    1.12 +		# Strip any path outside of the windows directories.
    1.13 +		# This is done by testing for kernel32.dll and win.ini
    1.14 +		next if ! (-f catfile( $p, 'kernel32.dll' ) || -f catfile( $p, 'win.ini' ));
    1.15  
    1.16  		# Strip any path that contains either unzip or gzip.exe.
    1.17  		# These two programs cause perl to fail its own tests.