From 532511086aea4b0e4fa585e4833441b0ede48dc4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 26 Jan 2017 22:19:01 +0000 Subject: l3build (26jan17) git-svn-id: svn://tug.org/texlive/trunk@43054 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/l3build/l3build.lua | 95 ++++++++++++++-------- .../tex/latex/l3build/regression-test.tex | 45 ++-------- 2 files changed, 68 insertions(+), 72 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3build') diff --git a/Master/texmf-dist/tex/latex/l3build/l3build.lua b/Master/texmf-dist/tex/latex/l3build/l3build.lua index 06f6942ace5..4d7e8abe192 100644 --- a/Master/texmf-dist/tex/latex/l3build/l3build.lua +++ b/Master/texmf-dist/tex/latex/l3build/l3build.lua @@ -1,24 +1,30 @@ --[[ - File l3build.lua (C) Copyright 2014-2016 The LaTeX3 Project +File l3build.lua Copyright (C) 2014-2017 The LaTeX3 Project - It may be distributed and/or modified under the conditions of the - LaTeX Project Public License (LPPL), either version 1.3c of this - license or (at your option) any later version. The latest version - of this license is in the file +It may be distributed and/or modified under the conditions of the +LaTeX Project Public License (LPPL), either version 1.3c of this +license or (at your option) any later version. The latest version +of this license is in the file - http://www.latex-project.org/lppl.txt + http://www.latex-project.org/lppl.txt - This file is part of the "l3build bundle" (The Work in LPPL) - and all files in that bundle must be distributed together. +This file is part of the "l3build bundle" (The Work in LPPL) +and all files in that bundle must be distributed together. - The released version of this bundle is available from CTAN. +----------------------------------------------------------------------- + +The development version of the bundle can be found at + + https://github.com/latex3/latex3 + +for those people who are interested. --]] -- Version information: should be identical to that in l3build.dtx -release_date = "2016/11/21" -release_ver = "6760" +release_date = "2017/01/25" +release_ver = "6826" -- "module" is a deprecated function in Lua 5.2: as we want the name -- for other purposes, and it should eventually be 'free', simply @@ -175,34 +181,37 @@ function argparse() local files = { } local long_options = { - date = "date" , - engine = "engine" , - ["halt-on-error"] = "halt" , - ["halt-on-failure"] = "halt" , - help = "help" , - pdf = "pdf" , - quiet = "quiet" , - release = "release" + date = "date" , + engine = "engine" , + ["halt-on-error"] = "halt" , + ["halt-on-failure"] = "halt" , + help = "help" , + pdf = "pdf" , + quiet = "quiet" , + release = "release" , + testfiledir = "testfiledir" } local short_options = { - d = "date" , - e = "engine" , - h = "help" , - H = "halt" , - p = "pdf" , - q = "quiet" , - r = "release" + d = "date" , + e = "engine" , + h = "help" , + H = "halt" , + p = "pdf" , + q = "quiet" , + r = "release" , + t = "testfiledir" } local option_args = { - date = true , - engine = true , - halt = false, - help = false, - pdf = false, - quiet = false, - release = true + date = true , + engine = true , + halt = false, + help = false, + pdf = false, + quiet = false, + release = true, + testfiledir = true } -- arg[1] is a special case: must be a command or "-h"/"--help" -- Deal with this by assuming help and storing only apparently-valid @@ -1097,7 +1106,7 @@ function runcheck(name, hide) for _,i in ipairs(checkengines) do -- Allow for luatex == luajittex for .tlg purposes local engine = i - if i == "luajitex" then + if i == "luajittex" then engine = "luatex" end checkpdf = setup_check(name, engine) @@ -1111,7 +1120,9 @@ function runcheck(name, hide) end if errlevel ~= 0 and opthalt then checkdiff() - return errlevel + if errlevel ~= 0 then + return 1 + end end if errlevel > errorlevel then errorlevel = errlevel @@ -1525,6 +1536,7 @@ function help() print(" --pdf|-p Check/save PDF files") print(" --quiet|-q Suppresses TeX output when unpacking") print(" --release|-r Sets the release to insert into sources") + print(" --testfiledir|-t Selects the specified testfile location") print("") print("See l3build.pdf for further details.") end @@ -2142,5 +2154,18 @@ end -- Allow main function to be disabled 'higher up' main = main or stdmain +-- Pick up and read any per-run testfiledir +if userargs["testfiledir"] then + if #userargs["testfiledir"] == 1 then + testfiledir = userargs["testfiledir"][1] + if fileexists(testfiledir .. "/config.lua") then + dofile(testfiledir .. "/config.lua") + end + else + print("Cannot use more than one testfile dir at a time!") + return 1 + end +end + -- Call the main function main(userargs["target"], userargs["files"]) diff --git a/Master/texmf-dist/tex/latex/l3build/regression-test.tex b/Master/texmf-dist/tex/latex/l3build/regression-test.tex index ade132e225a..86d722d7862 100644 --- a/Master/texmf-dist/tex/latex/l3build/regression-test.tex +++ b/Master/texmf-dist/tex/latex/l3build/regression-test.tex @@ -6,47 +6,18 @@ %% %% l3build.dtx (with options: `package') %% -%% EXPERIMENTAL CODE +%% Copyright (C) 2014-2016 The LaTeX3 Project %% -%% Do not distribute this file without also distributing the -%% source files specified above. +%% It may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License (LPPL), either version 1.3c of +%% this license or (at your option) any later version. The latest +%% version of this license is in the file: %% -%% Do not distribute a modified version of this file. -%% -%% -%% File l3build.dtx (C) Copyright 2014-2016 The LaTeX3 Project -%% -%% It may be distributed and/or modified under the conditions of the -%% LaTeX Project Public License (LPPL), either version 1.3c of this -%% license or (at your option) any later version. The latest version -%% of this license is in the file -%% %% http://www.latex-project.org/lppl.txt -%% +%% %% This file is part of the "l3build bundle" (The Work in LPPL) %% and all files in that bundle must be distributed together. -%% -%% The released version of this bundle is available from CTAN. -%% -%% ----------------------------------------------------------------------- -%% -%% The development version of the bundle can be found at -%% -%% http://www.latex-project.org/svnroot/experimental/trunk/ -%% -%% for those people who are interested. -%% -%%%%%%%%%%% -%% NOTE: %% -%%%%%%%%%%% -%% -%% Snapshots taken from the repository represent work in progress and may -%% not work or may contain conflicting material! We therefore ask -%% people _not_ to put them into distributions, archives, etc. without -%% prior consultation with the LaTeX Project Team. -%% -%% ----------------------------------------------------------------------- -%% +%% \ifx\unprotect\undefined \expandafter\edef\csname reset\string @catcodes\endcsname{% \catcode`\noexpand\@=\the\catcode`\@\relax @@ -71,7 +42,7 @@ } \let\TYPE\LONGTYPEOUT \def\STARTMESSAGE{This is a generated file for the l3build validation system.} -\def\START{\LONGTYPEOUT{START-TEST-LOG^^J^^J% +\def\START{\LONGTYPEOUT{^^JSTART-TEST-LOG^^J^^J% \STARTMESSAGE% ^^J^^JDon't change this file in any respect.% ^^J^^J}} -- cgit v1.2.3