Parameterise builddir

l3build.dtx

@@ -63,11 +63,12 @@
 \luavarset{testfiledir} {maindir .. "/testfiles"}   {Where the tests are.}
 \luavarset{testsuppdir} {testfiledir .. "/support"} {Where support files for the tests are.}
 \luavarseparator
-\luavarset{localdir}   {maindir .. "/build/local"}  {Generated folder where support files are placed to allow \enquote{sandboxed} \TeX{} runs.}
-\luavarset{testdir}    {maindir .. "/build/test"}   {Generated folder where tests are run.}
-\luavarset{typesetdir} {maindir .. "/build/doc"}    {Generated folder where typesetting is run.}
-\luavarset{unpackdir}  {maindir .. "/build/unpack"} {Generated folder where unpacking occurs.}
-\luavarset{distribdir} {maindir .. "/build/distrib"}{Generated folder where the archive is created.}
+\luavarset{builddir}   {maindir .. "/build"}   {Generated folder where building takes place.}
+\luavarset{localdir}   {builddir .. "/local"}  {Generated folder where support files are placed to allow \enquote{sandboxed} \TeX{} runs.}
+\luavarset{testdir}    {builddir .. "/test"}   {Generated folder where tests are run.}
+\luavarset{typesetdir} {builddir .. "/doc"}    {Generated folder where typesetting is run.}
+\luavarset{unpackdir}  {builddir .. "/unpack"} {Generated folder where unpacking occurs.}
+\luavarset{distribdir} {builddir .. "/distrib"}{Generated folder where the archive is created.}
 \luavarset{ctandir}    {distribdir .. "/ctan"}      {Generated folder where files are organised for CTAN.}
 \luavarset{tdsdir}     {distribdir .. "/tds"}       {Generated folder where files are organised for a TDS.}
 \luavarset{tdsroot}    {"latex"}{Root directory of the TDS structure for the bundle/module to be installed into.}

l3build.lua

@@ -70,11 +70,12 @@ testfiledir = testfiledir or maindir     .. "/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"
@@ -690,7 +691,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
           (string.sub(pattern, 1, 1) == "."
             or string.sub(file, 1, 1) ~= ".")
         then