From 04c30db0018970c69516d748c7b4509240857b65 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 5 May 2021 19:44:19 +0000 Subject: l3build (5may21) git-svn-id: svn://tug.org/texlive/trunk@59091 c570f23f-e606-0410-a88d-b1316a301751 --- .../texlive/linked_scripts/l3build/l3build.lua | 25 ++++++++-------------- .../texk/texlive/linked_scripts/texlive/tlmgr.pl | 10 ++++----- 2 files changed, 14 insertions(+), 21 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index e7acd47fb3b..0b68ee1617d 100644 --- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua +++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua @@ -2,7 +2,7 @@ --[[ -File l3build.lua Copyright (C) 2014-2020 The LaTeX3 Project +File l3build.lua Copyright (C) 2014-2020 The LaTeX Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2020-06-04" +release_date = "2021-05-05" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -79,18 +79,12 @@ elseif options["target"] == "version" then exit(0) end --- Allow main function to be disabled 'higher up' -main = main or stdmain - --- Load configuration file if running as a script -if match(arg[0], "l3build$") or match(arg[0], "l3build%.lua$") then - -- Look for some configuration details - if fileexists("build.lua") then - dofile("build.lua") - else - print("Error: Cannot find configuration build.lua") - exit(1) - end +-- Look for some configuration details +if fileexists("build.lua") then + dofile("build.lua") +else + print("Error: Cannot find configuration build.lua") + exit(1) end -- Load standard settings for variables: @@ -120,7 +114,7 @@ if options["epoch"] then forcecheckepoch = true forcedocepoch = true end -normalise_epoch() +epoch = normalise_epoch(epoch) -- Sanity check check_engines() @@ -159,7 +153,6 @@ if options["target"] == "check" then print("\n Check failed with difference files") local testdir = testdir if config ~= "build" then - resultdir = resultdir .. "-" .. config testdir = testdir .. "-" .. config end for _,i in ipairs(filelist(testdir,"*" .. os_diffext)) do diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 648d5a7e4f7..854b7958e77 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 59064 2021-05-03 17:37:44Z karl $ +# $Id: tlmgr.pl 59074 2021-05-04 15:57:34Z siepo $ # # Copyright 2008-2021 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 59064 $'; -my $datrev = '$Date: 2021-05-03 19:37:44 +0200 (Mon, 03 May 2021) $'; +my $svnrev = '$Revision: 59074 $'; +my $datrev = '$Date: 2021-05-04 17:57:34 +0200 (Tue, 04 May 2021) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -4864,7 +4864,7 @@ sub action_option { # sub action_platform { my $ret = $F_OK; - my @extra_w32_packs = qw/tlperl.win32 tlgs.win32 tlpsv.win32 + my @extra_w32_packs = qw/tlperl.win32 tlgs.win32 collection-wintools dviout.win32 wintools.win32/; if ($^O =~ /^MSWin/i) { @@ -10124,7 +10124,7 @@ This script and its documentation were written for the TeX Live distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 59064 2021-05-03 17:37:44Z karl $ +$Id: tlmgr.pl 59074 2021-05-04 15:57:34Z siepo $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html -- cgit v1.2.3