summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-30 20:59:58 +0000
committerKarl Berry <karl@freefriends.org>2019-07-30 20:59:58 +0000
commit5e541c41c7d9b017d0dfebb337f79da3a69e5251 (patch)
treebd69c8939d2ad830c60f3e565c23acf9d9696c37 /Master/texmf-dist/scripts/l3build
parent4f9282799e6b77aab5da00b68ede2cc9a7ae33e1 (diff)
l3build (30jul19)
git-svn-id: svn://tug.org/texlive/trunk@51777 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua5
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-file-functions.lua4
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-install.lua70
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-variables.lua5
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
5 files changed, 63 insertions, 23 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 9fcf9885717..6cd9ac1b324 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -772,7 +772,10 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
ext ~= tlgext and
ext ~= lveext and
ext ~= logext then
- ren(testdir, file, gsub(file, "(%.[^.]+)$", "." .. engine .. "%1"))
+ local newname = gsub(file,"(%.[^.]+)$","." .. engine .. "%1")
+ if not fileexists(testdir,newname) then
+ ren(testdir,file,newname)
+ end
end
end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
index cc1bef67fa8..9c7ac1fb6df 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-file-functions.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-file-functions.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-file-functions.lua Copyright (C) 2018,2019 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
@@ -80,7 +80,7 @@ local insert = table.insert
(end license)
--]]
-local function glob_to_pattern(glob)
+function glob_to_pattern(glob)
local pattern = "^" -- pattern being built
local i = 0 -- index in glob
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index a97a24e29ec..d2222c8561e 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-install.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-install.lua Copyright (C) 2018,2019 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
@@ -22,8 +22,9 @@ for those people who are interested.
--]]
-local pairs = pairs
-local print = print
+local ipairs = ipairs
+local pairs = pairs
+local print = print
local set_program = kpse.set_program_name
local var_value = kpse.var_value
@@ -40,9 +41,7 @@ local function gethome()
end
function uninstall()
- local function uninstall_files(dir,subdir)
- subdir = subdir or moduledir
- dir = dir .. "/" .. subdir
+ local function zapdir(dir)
local installdir = gethome() .. "/" .. dir
if options["dry-run"] then
local files = filelist(installdir)
@@ -60,6 +59,11 @@ function uninstall()
end
return 0
end
+ local function uninstall_files(dir,subdir)
+ subdir = subdir or moduledir
+ dir = dir .. "/" .. subdir
+ return zapdir(dir)
+ end
local errorlevel = 0
-- Any script man files need special handling
local manfiles = { }
@@ -83,13 +87,21 @@ function uninstall()
print("- " .. v)
end
end
- return uninstall_files("doc")
+ errorlevel = uninstall_files("doc")
+ uninstall_files("source")
+ uninstall_files("tex")
+ uninstall_files("bibtex/bst",module)
+ uninstall_files("makeindex",module)
+ uninstall_files("scripts",module)
+ errorlevel
+ if errorlevel ~= 0 then return errorlevel end
+ -- Finally, clean up special locations
+ for _,location in ipairs(tdslocations) do
+ local path,glob = splitpath(location)
+ errorlevel = zapdir(path)
+ if errorlevel ~= 0 then return errorlevel end
+ end
+ return 0
end
function install_files(target,full,dry_run)
@@ -103,28 +115,47 @@ function install_files(target,full,dry_run)
end
dir = dir .. (subdir and ("/" .. subdir) or "")
local filenames = { }
+ local paths = { }
+ -- Generate a file list and include the directory
for _,glob_table in pairs(files) do
for _,glob in pairs(glob_table) do
for file,_ in pairs(tree(source,glob)) do
- insert(filenames,file)
+ -- Just want the name
+ local file = gsub(file,"^%./","")
+ local matched = false
+ for _,location in ipairs(tdslocations) do
+ local path,glob = splitpath(location)
+ local pattern = glob_to_pattern(glob)
+ if match(file,pattern) then
+ insert(paths,path)
+ insert(filenames,path .. "/" .. file)
+ matched = true
+ break
+ end
+ end
+ if not matched then
+ insert(paths,dir)
+ insert(filenames,dir .. "/" .. file)
+ end
end
end
end
+
local errorlevel = 0
-- The target is only created if there are actual files to install
if next(filenames) then
- local installdir = target .. "/" .. dir
- if dry_run then
- print("\n" .. "For installation in " .. installdir .. ":")
- else
- errorlevel = cleandir(installdir)
- if errorlevel ~= 0 then return errorlevel end
+ if not dry_run then
+ for _,path in pairs(paths) do
+ errorlevel = cleandir(target .. "/" .. path)
+ if errorlevel ~= 0 then return errorlevel end
+ end
end
for _,file in ipairs(filenames) do
if dry_run then
- print("- " .. select(2,splitpath(file)))
+ print("- " .. file)
else
- errorlevel = cp(file,source,installdir)
+ local path,file = splitpath(file)
+ errorlevel = cp(file,source,target .. "/" .. path)
if errorlevel ~= 0 then return errorlevel end
end
end
@@ -180,6 +211,10 @@ function install_files(target,full,dry_run)
typesetlist = excludelist(docfiledir,typesetfiles,{sourcefiles})
sourcelist = excludelist(sourcefiledir,sourcefiles,
{bstfiles,installfiles,makeindexfiles,scriptfiles})
+
+ if dry_run then
+ print("\nFor installation inside " .. target .. ":")
+ end
errorlevel = install_files(sourcefiledir,"source",{sourcelist})
+ install_files(docfiledir,"doc",
@@ -212,9 +247,8 @@ function install_files(target,full,dry_run)
end
end
if next(manfiles) then
- print("\n" .. "For installation in " .. target .. "/doc/man:")
for _,v in ipairs(manfiles) do
- print("- " .. v)
+ print("- doc/man/" .. v)
end
end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-variables.lua b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
index 1288a6b7ca7..0b3c9a2e431 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-variables.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-variables.lua
@@ -1,6 +1,6 @@
--[[
-File l3build-variables.lua Copyright (C) 2018 The LaTeX3 Project
+File l3build-variables.lua Copyright (C) 2018,2019 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
@@ -197,6 +197,9 @@ tpfext = tpfext or ".tpf"
-- Manifest options
manifestfile = manifestfile or "MANIFEST.md"
+-- Non-standard installation locations
+tdslocations = tdslocations or { }
+
-- Upload settings
curlexe = curlexe or "curl"
uploadconfig = uploadconfig or {}
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index eacada0df35..c1029d4d3bc 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2019-06-27"
+release_date = "2019-07-30"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")