diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 8 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLTREE.pm | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 09ec5eb6ada..099864ecc96 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -1,6 +1,6 @@ # $Id$ # TeXLive::TLPSRC.pm - module for using tlpsrc files -# Copyright 2007 Norbert Preining +# Copyright 2007, 2008 Norbert Preining # # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -730,9 +730,9 @@ automatically expanded to the respective architecture. =item C<bat/exe/dll/texlua> for win32 -For C<binpattern>s of the form C<f bin/win32/foobar> (i.e., also for a -binpattern of the form C<f bin/${ARCH}/foobar>) files C<foobar.bat>, -C<foobar.dll>, C<foobar.exe>, and C<foobar.texlua> are also matched. +C<binpattern>s of the form C<f bin/win32/foobar> or +C<f bin/${ARCH}/foobar>) also match the files C<foobar.bat>, +C<foobar.cmd>, C<foobar.dll>, C<foobar.exe>, and C<foobar.texlua>. The above two properties allows to capture the binaries for all architectures in one binpattern diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index d8107c1a5a8..286518d44ee 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -1,6 +1,6 @@ # $Id$ # TeXLive::TLTREE.pm - helper module to work with the tree of all files -# Copyright 2007 Norbert Preining +# Copyright 2007, 2008 Norbert Preining # # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -260,10 +260,11 @@ sub _get_files_matching_glob_pattern { } } if ($dirpart =~ m@^bin/win32@) { - # for arch=win32 under bin we also want to match .dll, .bat, .exe files + # for arch=win32 under bin we want to automatch more extensions. foreach my $f (@candfiles) { - ddebug("matching $f in $dirpart via glob $globline.{bat/exe/texlua}\n"); - if ($f =~ /^$basepart\.(bat|exe|dll|texlua)$/) { + my $w32_binext = "bat|cmd|exe|dll|texlua"; + ddebug("matching $f in $dirpart via glob $globline.($w32_binext)\n"); + if ($f =~ /^$basepart\.($w32_binext)$/) { ddebug("hit: globline=$globline, $dirpart/$f\n"); if ("$dirpart" eq ".") { push @returnfiles, "$f"; |