[latex3-commits] [git/l3build] master: Revert "Reorder a variable" (89be666)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/89be666bfaf21fa33f6f78175b5e8c2425e6d36b

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

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

    Revert "Reorder a variable"
    
    This reverts commit 2cb30f60e463ad03e9c77af417cf1128c4833bdf.


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

89be666bfaf21fa33f6f78175b5e8c2425e6d36b
 l3build.dtx |    2 +-
 l3build.lua |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/l3build.dtx b/l3build.dtx
index 9f81fff..d894295 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -58,7 +58,6 @@
 \luavarset{exclmodules}{\{~\}}{Directories to be excluded from automatic module detection}
 \luavarseparator
 \luavarset{maindir}     {"."}{The top level directory for this module or bundle.}
-\luavarset{docfiledir}        {maindir}{Where to look for the |typesetfiles| and |typesetsourcefiles|.}
 \luavarset{supportdir}  {maindir .. "/support"}     {Where copies of files to support check/doc compilation are stored.}
 \luavarset{testfiledir} {maindir .. "/testfiles"}   {Where the tests are.}
 \luavarset{testsuppdir} {testfiledir .. "/support"} {Where support files for the tests are.}
@@ -89,6 +88,7 @@
 \luavarset{textfiles}         {\{"*.md", "*.txt"\}}{Plain text files to send to CTAN as-is.}
 \luavarset{typesetdemofiles}  {\{~\}}       {Files to typeset before the documentation (as demos), but where the PDF results are not included in the release.}
 \luavarset{typesetfiles}      {\{"*.dtx"\}} {Files to typeset for documentation.}
+\luavarset{docfiledir}        {maindir}{Where to look for the |typesetfiles| and |typesetsourcefiles|.}
 \luavarset{typesetsuppfiles}  {\{~\}}       {Files needed to support typesetting when \enquote{sandboxed}.}
 \luavarset{typesetsourcefiles}{\{~\}}       {Files to copy to unpacking when typesetting.}
 \luavarset{unpackfiles}       {\{"*.ins"\}} {Files to run to perform unpacking.}
diff --git a/l3build.lua b/l3build.lua
index 3a7f4d2..e480db4 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -63,8 +63,7 @@ end
 -- Use Unix-style path separators
 maindir     = maindir or "."
 
--- Substructure files
-docfiledir  = docfiledir  or maindir
+-- Substructure for tests and support files
 supportdir  = supportdir  or maindir     .. "/support"
 testfiledir = testfiledir or maindir     .. "/testfiles"
 testsuppdir = testsuppdir or testfiledir .. "/support"
@@ -109,6 +108,7 @@ sourcefiles        = sourcefiles        or {"*.dtx", "*.ins"}
 textfiles          = textfiles          or {"*.md", "*.txt"}
 typesetdemofiles   = typesetdemofiles   or { }
 typesetfiles       = typesetfiles       or {"*.dtx"}
+docfiledir         = docfiledir         or maindir
 typesetsuppfiles   = typesetsuppfiles   or { }
 typesetsourcefiles = typesetsourcefiles or { }
 unpackfiles        = unpackfiles        or {"*.ins"}