texlive[46926] Build/source/texk: sync

[commits+karl at tug.org]

Revision: 46926
          http://tug.org/svn/texlive?view=revision&revision=46926
Author:   karl
Date:     2018-03-11 21:34:15 +0100 (Sun, 11 Mar 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
    trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
    trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu

Modified: trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLConfig.pm	2018-03-11 20:30:58 UTC (rev 46925)
+++ trunk/Build/source/texk/tests/TeXLive/TLConfig.pm	2018-03-11 20:34:15 UTC (rev 46926)
@@ -1,11 +1,12 @@
+# $Id: TLConfig.pm 46841 2018-03-05 16:31:19Z karl $
 # TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2017 Norbert Preining
+# Copyright 2007-2018 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 45617 $';
+my $svnrev = '$Revision: 46841 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -51,7 +52,7 @@
 
 # the year of our release, will be used in the location of the
 # network packages, and in menu names, and other places.
-$ReleaseYear = 2017;
+$ReleaseYear = 2018;
 
 # users can upgrade from this year to the current year; might be the
 # same as the release year, or any number of releases earlier.
@@ -107,7 +108,9 @@
 our $DefaultContainerExtension = "tar.$DefaultContainerFormat";
 
 # archive (not user) settings.
-# these can be overriden by putting them into 00texlive.config.tlpsrc
+# these can be overridden by putting them into 00texlive.config.tlpsrc
+# in the format
+#   depend key/value
 our %TLPDBConfigs = (
   "container_split_src_files" => 1,
   "container_split_doc_files" => 1,

Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm	2018-03-11 20:30:58 UTC (rev 46925)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm	2018-03-11 20:34:15 UTC (rev 46926)
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 46421 2018-01-24 03:55:35Z preining $
+# $Id: TLUtils.pm 46834 2018-03-05 15:34:41Z preining $
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
 # Copyright 2007-2018 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 46421 $';
+my $svnrev = '$Revision: 46834 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -298,6 +298,14 @@
     #   solaris2 is matched.
     $OS = $os if $guessed_platform =~ /\b$os/;
   }
+
+  if ($OS eq "linux") {
+    # deal with the special case of musl based distributions
+    # config.guess returns
+    #   x86_64-pc-linux-musl
+    #   i386-pc-linux-musl
+    $OS = "linuxmusl" if $guessed_platform =~ /\blinux-musl/;
+  }
   
   if ($OS eq "darwin") {
     # We have a variety of Mac binary sets.
@@ -375,6 +383,7 @@
     'i386-freebsd'     => 'FreeBSD on Intel x86',
     'i386-kfreebsd'    => 'GNU/kFreeBSD on Intel x86',
     'i386-linux'       => 'GNU/Linux on Intel x86',
+    'i386-linuxmusl'   => 'GNU/Linux on Intel x86 with musl',
     'i386-netbsd'      => 'NetBSD on Intel x86',
     'i386-openbsd'     => 'OpenBSD on Intel x86',
     'i386-solaris'     => 'Solaris on Intel x86',
@@ -391,6 +400,7 @@
     'x86_64-darwin'    => 'MacOSX current on x86_64',
     'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-10.9) on x86_64',
     'x86_64-linux'     => 'GNU/Linux on x86_64',
+    'x86_64-linuxmusl' => 'GNU/Linux on x86_64 with musl',
     'x86_64-solaris'   => 'Solaris on x86_64',
   );
 

Modified: trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu
===================================================================
--- trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu	2018-03-11 20:30:58 UTC (rev 46925)
+++ trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu	2018-03-11 20:34:15 UTC (rev 46926)
@@ -1,7 +1,7 @@
 
 
-local svnrevision = string.match("$Revision: 46031 $", "%d+") or "0"
-local svndate     = string.match("$Date: 2017-12-10 14:35:30 +0100 (Sun, 10 Dec 2017) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 46914 $", "%d+") or "0"
+local svndate     = string.match("$Date: 2018-03-10 04:48:22 +0100 (Sat, 10 Mar 2018) $", "[-%d]+") or "2009-12-04"
 local bannerstr   = "runscript wrapper utility (rev. " ..
                     svnrevision .. ", " .. svndate .. ")\n" .. 
                     "usage:   runscript script-name [arguments]\n" ..
@@ -683,9 +683,11 @@
 -- general case
 
 if not ARGV then
+  os.setenv('TEXMF', TEXMFDIST)
   local extlist = '.tlu;.texlua;.lua;.pl;.rb;.py;.tcl;.jar;.vbs;.js;.bat;.cmd;\0'
   local progfullname = search_path(progname, BINDIR, '.tlu;.bat;.cmd') or
                        assert(find_texmfscript(progname, extlist))
+  os.setenv('TEXMF', nil)
   local ext = string.match(string.lower(progfullname), '%.[^\\/.]*$') or ''
   if (ext == '.lua') or (ext == '.tlu') or (ext == '.texlua') then -- lua script
     arg[0] = progfullname