more x86_64 cygwin checks

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

3 files changed, 13 insertions, 5 deletions

diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index 28a0bfc8f5c..83a546fe351 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -5069,8 +5069,8 @@ sub check_file {
   if (-r $f) {
     return 1;
   } else {
-    # not -r, so check for the extensions .bat and .exe on w32 and cygwin
-    if (($a eq "win32") || ($a eq "i386-cygwin")) {
+    # not -r, so check for the extensions .bat and .exe on windoze-ish.
+    if ($a =~ /win[0-9]|.*-cygwin/) {
       if (-r "$f.exe" || -r "$f.bat") {
         return 1;
       }
diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt
index 024585dc48c..4e108ed8d48 100644
--- a/Master/tlpkg/doc/packages.txt
+++ b/Master/tlpkg/doc/packages.txt
@@ -11,9 +11,9 @@ To add a new platform:
   in the `platform' routine in TeXLive/TLUtils.pm.
 - add the abbreviation to the full-name mapping in `platform_desc'.
 - create directory in Master/bin and add at least one file.
-- if windows-ish (.exe extension), update list in TLTREE.pm.
-- add xz, xzdec, maybe wget (update 00texlive.installer.tlpsrc if so)
-  binaries in Master/tlpkg/installer.
+- if windows-ish (.exe extension), update regexps in TLTREE.pm and tlmgr.pl.
+- add xz, xzdec, maybe wget binaries in Master/tlpkg/installerl
+  update 00texlive.installer.tlpsrc as needed.
 - update .tlpsrc files if necessary: most likely asymptote, biber, xindy.
 - regenerate tlpdb.
 
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index b90cb4852df..da1efdd2ed6 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -28,16 +28,23 @@ runpattern f texmf-dist/web2c/updmap-hdr.cfg
 runpattern f tlpkg/installer/config.guess
 #
 binpattern f bin/${ARCH}/tlmgr
+#
 binpattern f/win32 bin/win32/tlmgr-gui.exe
 binpattern f/win32 tlpkg/installer/tar.exe
 binpattern f/win32 tlpkg/installer/xz/xzdec.exe
 binpattern f/win32 tlpkg/installer/xz/xz.exe
 binpattern f/win32 tlpkg/installer/wget/wget.exe
+#
 binpattern f/i386-cygwin tlpkg/installer/xz/xzdec.i386-cygwin.exe
 binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe
 binpattern f/!i386-cygwin tlpkg/installer/xz/xzdec.${ARCH}
 binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH}
 #
+binpattern f/x86_64-cygwin tlpkg/installer/xz/xzdec.x86_64-cygwin.exe
+binpattern f/x86_64-cygwin tlpkg/installer/xz/xz.x86_64-cygwin.exe
+binpattern f/!x86_64-cygwin tlpkg/installer/xz/xzdec.${ARCH}
+binpattern f/!x86_64-cygwin tlpkg/installer/xz/xz.${ARCH}
+#
 # Lots of platforms provide wget as part of the normal system install.
 binpattern f/!\
 alpha-linux,\
@@ -48,6 +55,7 @@ i386-linux,\
 i386-solaris,\
 mipsel-linux,\
 powerpc-linux,\
+x86_64-cygwin,\
 x86_64-linux,\
 x86_64-solaris \
   tlpkg/installer/wget/wget.${ARCH}