summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-09-01 19:49:58 +0000
committerNorbert Preining <preining@logic.at>2009-09-01 19:49:58 +0000
commit3f42ac2921d8eeca49b89e9a25ea1b1c4da971a1 (patch)
tree9ebe7397321107412cf31f2fdce3f175725b1173 /Master
parentbcd7ce299c54be3a1a87fd32f4e47b9bcb44dfeb (diff)
match .exe.manifest and .dll.manifest automatically
git-svn-id: svn://tug.org/texlive/trunk@14985 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/TeXLive/TLPSRC.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index eea7d953fa4..73807529a3c 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -1003,6 +1003,8 @@ C<binpattern>s that match Windows, e.g., 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>.
+In addition, C<foobar.exe.manifest> and C<foobar.dll.manifest> are matched.
+
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 9e9004f7aa3..35f88745932 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -276,7 +276,7 @@ sub _get_files_matching_glob_pattern
if ($dirpart =~ m,^bin/i386-cygwin,) {
$w32_binext = "exe"; # cygwin has .exe but nothing else
} else {
- $w32_binext = "bat|cmd|exe|dll|texlua";
+ $w32_binext = "(exe|dll)(.manifest)?|texlua|bat|cmd";
}
ddebug("matching $f in $dirpart via glob $globline.($w32_binext)\n");
if ($f =~ /^$basepart\.($w32_binext)$/) {