[latex3-commits] [git/l3build] master: Revert "Parameterise builddir" (0def066)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/0def0665f90937ae42e7d0931d1dc89028e7c1a4

>---------------------------------------------------------------

commit 0def0665f90937ae42e7d0931d1dc89028e7c1a4
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Nov 28 20:08:41 2017 +0000

    Revert "Parameterise builddir"
    
    This reverts commit 08086cd1237151dbf9c51b3346aba252bd36b745.


>---------------------------------------------------------------

0def0665f90937ae42e7d0931d1dc89028e7c1a4
 l3build.dtx |   11 +++++------
 l3build.lua |   13 ++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/l3build.dtx b/l3build.dtx
index bae2aab..9f81fff 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -63,12 +63,11 @@
 \luavarset{testfiledir} {maindir .. "/testfiles"}   {Where the tests are.}
 \luavarset{testsuppdir} {testfiledir .. "/support"} {Where support files for the tests are.}
 \luavarseparator
-\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{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{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.}
diff --git a/l3build.lua b/l3build.lua
index 2e537be..3a7f4d2 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -70,12 +70,11 @@ testfiledir = testfiledir or maindir     .. "/testfiles"
 testsuppdir = testsuppdir or testfiledir .. "/support"
 
 -- Structure within a development area
-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"
+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"
 
 -- Substructure for CTAN release material
 ctandir     = ctandir or distribdir .. "/ctan"
@@ -691,7 +690,7 @@ function tree(path, glob)
       for _, file in ipairs(filelist(dir, pattern)) do
         local fullpath = path .. "/" .. file
         if file ~= "." and file ~= ".." and
-          fullpath ~= builddir and
+          fullpath ~= maindir .. "/build" and
           (string.sub(pattern, 1, 1) == "."
             or string.sub(file, 1, 1) ~= ".")
         then