now also match .dll like .exe and .bat, again update .tlpsrc, man page

of TLPSRC. texlive.tlpdb didn't change (good)


git-svn-id: svn://tug.org/texlive/trunk@4521 c570f23f-e606-0410-a88d-b1316a301751

9 files changed, 9 insertions, 15 deletions

diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 4d65bf1fa24..20326a78872 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -584,11 +584,11 @@ of included files.
 In case the string C<${ARCH}> occurs in one C<binpattern> it is
 automatically expanded to the respective architecture.
 
-=head2 bat/exe for win32
+=head2 bat/exe/dll for win32
 
 For C<binpatterns> of the form C<f bin/win32/foobar> (i.e., also for a
-binpattern of the form C<f bin/${ARCH}/foobar>) files F<foobar.bat> and
-F<foobar.exe> are also matched.
+binpattern of the form C<f bin/${ARCH}/foobar>) files F<foobar.bat>,
+F<foobar.dll>, and F<foobar.exe> are also 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 1246a6893a9..4d8ff67b675 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -243,10 +243,10 @@ sub _get_files_matching_glob_pattern {
     }
   }
   if ($dirpart =~ m@^bin/win32@) {
-    # for arch=win32 under bin we also want to match .bat and .exe files
+    # for arch=win32 under bin we also want to match .dll, .bat, .exe files
     foreach my $f (@candfiles) {
       &TeXLive::TLUtils::debug("matching $f in $dirpart via glob $globline.{bat/exe}\n");
-      if ($f =~ /^$basepart\.(bat|exe)$/) {
+      if ($f =~ /^$basepart\.(bat|exe|dll)$/) {
         &TeXLive::TLUtils::debug("hit: globline=$globline, $dirpart/$f\n");
         push @returnfiles, "$dirpart/$f";
       }
diff --git a/Master/tlpkg/man/TeXLive::TLPSRC.1 b/Master/tlpkg/man/TeXLive::TLPSRC.1
index 512b3770683..32837594845 100644
--- a/Master/tlpkg/man/TeXLive::TLPSRC.1
+++ b/Master/tlpkg/man/TeXLive::TLPSRC.1
@@ -324,11 +324,11 @@ of included files.
 .IX Subsection "arch expansion"
 In case the string \f(CW\*(C`${ARCH}\*(C'\fR occurs in one \f(CW\*(C`binpattern\*(C'\fR it is
 automatically expanded to the respective architecture.
-.Sh "bat/exe for win32"
-.IX Subsection "bat/exe for win32"
+.Sh "bat/exe/dll for win32"
+.IX Subsection "bat/exe/dll for win32"
 For \f(CW\*(C`binpatterns\*(C'\fR of the form \f(CW\*(C`f bin/win32/foobar\*(C'\fR (i.e., also for a
-binpattern of the form \f(CW\*(C`f bin/${ARCH}/foobar\*(C'\fR) files \fIfoobar.bat\fR and
-\&\fIfoobar.exe\fR are also matched.
+binpattern of the form \f(CW\*(C`f bin/${ARCH}/foobar\*(C'\fR) files \fIfoobar.bat\fR,
+\&\fIfoobar.dll\fR, and \fIfoobar.exe\fR are also matched.
 .PP
 The above two properties allows to capture the binaries for all architectures
 in one binpattern
diff --git a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
index ca0e507aa41..3ada4ee61bc 100644
--- a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
@@ -6,4 +6,3 @@ runpattern f texmf/fmtutil/format.aleph.cnf
 runpattern f texmf/web2c/aleph.pool
 binpattern f bin/${ARCH}/aleph
 binpattern f bin/${ARCH}/lamed
-binpattern f bin/win32/aleph.dll
diff --git a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
index 26c8a6124d4..2b30f26c2e8 100644
--- a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
@@ -24,4 +24,3 @@ binpattern f bin/${ARCH}/mpto
 binpattern f bin/${ARCH}/newer
 binpattern f bin/win32/makempx-without-g-prefix.exe
 binpattern f bin/win32/mfmp.exe
-binpattern f bin/win32/mpost.dll
diff --git a/Master/tlpkg/tlpsrc/bin-omega.tlpsrc b/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
index 813cde973fa..e372786a671 100644
--- a/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
@@ -9,4 +9,3 @@ docpattern f texmf/doc/man/man1/omega.1
 docpattern f texmf/doc/man/man1/omega.1.html
 binpattern f bin/${ARCH}/lambda
 binpattern f bin/${ARCH}/omega
-binpattern f bin/win32/omega.dll
diff --git a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
index 6e824dcf11b..00a1353944f 100644
--- a/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-pdftex.tlpsrc
@@ -24,4 +24,3 @@ binpattern f bin/${ARCH}/pdfetex
 binpattern f bin/${ARCH}/pdflatex
 binpattern f bin/${ARCH}/pdftex
 binpattern f bin/${ARCH}/simpdftex
-binpattern f bin/win32/pdftex.dll
diff --git a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
index 2efda5c2ce6..9e5ec85d5a6 100644
--- a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
@@ -7,5 +7,4 @@ runpattern f texmf/web2c/tex.pool
 docpattern f texmf/doc/man/man1/tex.1
 docpattern f texmf/doc/man/man1/tex.1.html
 binpattern f bin/${ARCH}/tex
-binpattern f bin/win32/tex.dll
 binpattern f bin/win32/tl90tex.dll
diff --git a/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
index 82092ab804f..4c9e626a95e 100644
--- a/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xetex.tlpsrc
@@ -15,4 +15,3 @@ binpattern f bin/win32/conf/*
 binpattern f bin/win32/conf/conf.d/*
 binpattern f bin/win32/fc-*
 binpattern f bin/win32/icu*.dll
-binpattern f bin/win32/xetex.dll