diff options
Diffstat (limited to 'Master/tlpkg/TeXLive/TLTREE.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLTREE.pm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index 39c650665b6..1246a6893a9 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -176,9 +176,7 @@ sub get_matching_files { my %returnfiles; foreach $a (@Architectures) { # return empty list of arch!=win32 and pattern matches bin/win32 - # this is a special case to treat with tlsrc files auto generated - # from tpm files - if (($p =~ m@f bin/win32/@) && ($a ne "win32")) { + if (($p =~ m@f bin/win32/@) && ($a ne "win32")) { $returnfiles{$a} = [ ]; next; } @@ -204,7 +202,7 @@ sub _get_matching_files { if ($pattype eq "t") { @matchfiles = $self->_get_files_matching_dir_pattern($type,$patdata,@rest); } elsif ($pattype eq "f") { - @matchfiles = $self->_get_files_matching_glob_pattern($type,$patdata); + @matchfiles = $self->_get_files_matching_glob_pattern($type,$patdata,$arch); } elsif ($pattype eq "r") { @matchfiles = $self->_get_files_matching_regexp_pattern($type,$patdata); } elsif ($pattype eq "d") { @@ -244,6 +242,16 @@ sub _get_files_matching_glob_pattern { push @returnfiles, "$dirpart/$f"; } } + if ($dirpart =~ m@^bin/win32@) { + # for arch=win32 under bin we also want to match .bat and .exe files + foreach my $f (@candfiles) { + &TeXLive::TLUtils::debug("matching $f in $dirpart via glob $globline.{bat/exe}\n"); + if ($f =~ /^$basepart\.(bat|exe)$/) { + &TeXLive::TLUtils::debug("hit: globline=$globline, $dirpart/$f\n"); + push @returnfiles, "$dirpart/$f"; + } + } + } return(@returnfiles); } @@ -306,8 +314,6 @@ sub architectures { return @Architectures; } - - 1; ### Local Variables: @@ -315,4 +321,4 @@ sub architectures { ### tab-width: 2 ### indent-tabs-mode: nil ### End: -# vim:set tabstop=2: # +# vim:set tabstop=2 expandtab: # |