texlive[65958] trunk: win32->windows continues

[commits+karl at tug.org]

Revision: 65958
          http://tug.org/svn/texlive?view=revision&revision=65958
Author:   karl
Date:     2023-02-20 17:50:51 +0100 (Mon, 20 Feb 2023)
Log Message:
-----------
win32->windows continues

Modified Paths:
--------------
    trunk/Build/source/README
    trunk/Master/tlpkg/TeXLive/TLUtils.pm
    trunk/Master/tlpkg/tlpsrc/bibtexu.tlpsrc
    trunk/Master/tlpkg/tlpsrc/context.tlpsrc
    trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc

Modified: trunk/Build/source/README
===================================================================
--- trunk/Build/source/README	2023-02-20 16:38:47 UTC (rev 65957)
+++ trunk/Build/source/README	2023-02-20 16:50:51 UTC (rev 65958)
@@ -68,8 +68,8 @@
 
 universal-darwin: See Master/source/mactexdoc.tar.xz.
 
-win32:
-  Makefiles written by hand, see Master/source/w32tex-src.tar.xz.
+windows:
+  Makefiles written by hand, see Master/source/windows-src.tar.xz.
   Visual Studio 2010 and Visual Studio 2015.
 
 x86_64-darwinlegacy:

Modified: trunk/Master/tlpkg/TeXLive/TLUtils.pm
===================================================================
--- trunk/Master/tlpkg/TeXLive/TLUtils.pm	2023-02-20 16:38:47 UTC (rev 65957)
+++ trunk/Master/tlpkg/TeXLive/TLUtils.pm	2023-02-20 16:50:51 UTC (rev 65958)
@@ -297,14 +297,13 @@
 systems, such as Solaris, we have to look for a shell. We use the value
 of the C<CONFIG_SHELL> environment variable if it is set, else
 C</bin/ksh> if it exists, else C</bin/bash> if it exists, else give up.
+Happily, C<config.guess> later reverted this change, but we keep our
+shell-finding code anyway to defend against future mistakes of the same ilk.
 
 =cut
 
 sub platform {
-  if (defined $::_platform_) {
-    print STDERR "_platform_: already defined as $::_platform_\n";
-  }
-  unless (defined $::_platform_) {
+  if (! defined $::_platform_) {
     if ($^O =~ /^MSWin/i) {
       print STDERR "\$^O is $^O\n";
       $::_platform_ = "windows";
@@ -532,7 +531,8 @@
     'sparc-linux'      => 'GNU/Linux on Sparc',
     'sparc-solaris'    => 'Solaris on Sparc',
     'universal-darwin' => 'MacOSX current (10.14-) on ARM/x86_64',
-    'windows'            => 'Windows',
+    'win32'            => 'Windows (32-bit)',
+    'windows'          => 'Windows (64-bit)',
     'x86_64-cygwin'    => 'Cygwin on x86_64',
     'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-) on x86_64',
     'x86_64-dragonfly' => 'DragonFlyBSD on x86_64',

Modified: trunk/Master/tlpkg/tlpsrc/bibtexu.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/bibtexu.tlpsrc	2023-02-20 16:38:47 UTC (rev 65957)
+++ trunk/Master/tlpkg/tlpsrc/bibtexu.tlpsrc	2023-02-20 16:50:51 UTC (rev 65958)
@@ -1,3 +1,3 @@
 category TLCore
 shortdesc BibTeX variant supporting Unicode (UTF-8), via ICU
-binpattern f/!win32 bin/${ARCH}/bibtexu
+binpattern f bin/${ARCH}/bibtexu

Modified: trunk/Master/tlpkg/tlpsrc/context.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/context.tlpsrc	2023-02-20 16:38:47 UTC (rev 65957)
+++ trunk/Master/tlpkg/tlpsrc/context.tlpsrc	2023-02-20 16:50:51 UTC (rev 65958)
@@ -70,5 +70,5 @@
 binpattern f bin/${ARCH}/mtxrunjit
 binpattern f bin/${ARCH}/texexec
 binpattern f bin/${ARCH}/texmfstart
-binpattern f/win32 bin/win32/mtxrun.lua
-binpattern f/win32 bin/win32/contextjit.exe
+binpattern f/windows bin/windows/mtxrun.lua
+binpattern f/windows bin/windows/contextjit.exe

Modified: trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc	2023-02-20 16:38:47 UTC (rev 65957)
+++ trunk/Master/tlpkg/tlpsrc/xindy.tlpsrc	2023-02-20 16:50:51 UTC (rev 65958)
@@ -16,9 +16,9 @@
 binpattern f/universal-darwin bin/universal-darwin/xindy-x86_64.mem
 #
 # cygwin and windows must use a different name for the clisp executable.
-binpattern f/!x86_64-cygwin,win32,${no_xindy_platforms} \
+binpattern f/!x86_64-cygwin,windows,${no_xindy_platforms} \
   bin/${ARCH}/xindy.run
-binpattern f/x86_64-cygwin,win32 bin/${ARCH}/xindy-lisp.exe
+binpattern f/x86_64-cygwin,windows bin/${ARCH}/xindy-lisp.exe
 #
 docpattern f texmf-dist/doc/man/man1/*xindy.*
 docpattern d texmf-dist/doc/xindy