Skip to content

Commit

Permalink
Parameterise builddir
Browse files Browse the repository at this point in the history
Same as 08086cd, really.
  • Loading branch information
josephwright committed Dec 8, 2017
1 parent c85c897 commit 582f9b4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
11 changes: 6 additions & 5 deletions l3build.dtx
Expand Up @@ -63,11 +63,12 @@
\luavarset{testfiledir}{maindir .. "/testfiles"} {Directory containing test files}
\luavarset{testsuppdir}{testfiledir .. "/support"}{Directory containing test-specific support files}
\luavarseparator
\luavarset{distribdir}{maindir .. "/build/distrib"}{Directory for generating distribution structure}
\luavarset{localdir} {maindir .. "/build/local"} {Directory for extracted files in \enquote{sandboxed} \TeX{} runs}
\luavarset{testdir} {maindir .. "/build/test"} {Directory for running tests}
\luavarset{typesetdir}{maindir .. "/build/doc"} {Directory for building documentation}
\luavarset{unpackdir} {maindir .. "/build/unpack"} {Directory for unpacking sources}
\luavarset{builddir} {maindir .. "/build"} {Directory for building and testing}
\luavarset{distribdir}{builddir .. "/distrib"}{Directory for generating distribution structure}
\luavarset{localdir} {builddir .. "/local"} {Directory for extracted files in \enquote{sandboxed} \TeX{} runs}
\luavarset{testdir} {builddir .. "/test"} {Directory for running tests}
\luavarset{typesetdir}{builddir .. "/doc"} {Directory for building documentation}
\luavarset{unpackdir} {builddir .. "/unpack"} {Directory for unpacking sources}
\luavarseparator
\luavarset{ctandir}{distribdir .. "/ctan"}{Directory for organising files for CTAN}
\luavarset{tdsdir} {distribdir .. "/tds"} {Directory for organised files into TDS structure}
Expand Down
13 changes: 7 additions & 6 deletions l3build.lua
Expand Up @@ -70,11 +70,12 @@ testfiledir = testfiledir or "testfiles"
testsuppdir = testsuppdir or testfiledir .. "/support"
-- Structure within a development area
distribdir = distribdir or maindir .. "/build/distrib"
localdir = localdir or maindir .. "/build/local"
testdir = testdir or maindir .. "/build/test"
typesetdir = typesetdir or maindir .. "/build/doc"
unpackdir = unpackdir or maindir .. "/build/unpacked"
builddir = builddir or maindir .. "/build"
distribdir = distribdir or builddir .. "/distrib"
localdir = localdir or builddir .. "/local"
testdir = testdir or builddir .. "/test"
typesetdir = typesetdir or builddir .. "/doc"
unpackdir = unpackdir or builddir .. "/unpacked"
-- Substructure for CTAN release material
ctandir = ctandir or distribdir .. "/ctan"
Expand Down Expand Up @@ -691,7 +692,7 @@ function tree(path, glob)
for _, file in ipairs(filelist(dir, pattern)) do
local fullpath = path .. "/" .. file
if file ~= "." and file ~= ".." and
fullpath ~= maindir .. "/build" and
fullpath ~= builddir and
(sub(pattern, 1, 1) == "."
or sub(file, 1, 1) ~= ".")
then
Expand Down

0 comments on commit 582f9b4

Please sign in to comment.