[latex3-commits] [l3svn] 01/02: Allow easier over-ride of generic build settings

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit b85847329f61f44e7d58a103af0c6a55985e58e2
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Oct 8 09:38:07 2015 +0100

    Allow easier over-ride of generic build settings
---
 build-config.lua            |   12 ++++++------
 l3trial/l3auxdata/build.lua |    6 ++----
 l3trial/l3htoks/build.lua   |    9 +++------
 xpackages/xor/build.lua     |   11 ++++-------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/build-config.lua b/build-config.lua
index 511fa3b..3c9afac 100644
--- a/build-config.lua
+++ b/build-config.lua
@@ -4,15 +4,15 @@ checkdeps   = checkdeps   or {maindir .. "/l3kernel", maindir .. "/l3build"}
 typesetdeps = typesetdeps or {maindir .. "/l3kernel"}
 unpackdeps  = unpackdeps  or {maindir .. "/l3kernel"}
 
-cmdchkfiles     = {"*.dtx"}
-checkengines    = {"pdftex", "xetex", "luatex", "ptex", "uptex"}
-checksuppfiles  = {"minimal.cls", "regression-test.cfg"}
-unpacksuppfiles = {"docstrip.tex"}
-versionfiles    = {"*.dtx", "README.md"}
+cmdchkfiles     = cmdchkfiles     or {"*.dtx"}
+checkengines    = checkengines    or {"pdftex", "xetex", "luatex", "ptex", "uptex"}
+checksuppfiles  = checksuppfiles  or {"minimal.cls", "regression-test.cfg"}
+unpacksuppfiles = unpacksuppfiles or {"docstrip.tex"}
+versionfiles    = versionfiles    or {"*.dtx", "README.md"}
 
 packtdszip  = true
 
-typesetcmds = "\\AtBeginDocument{\\DisableImplementation}"
+typesetcmds = typesetcmds or "\\AtBeginDocument{\\DisableImplementation}"
 
 if checksearch == nil then
   checksearch = false
diff --git a/l3trial/l3auxdata/build.lua b/l3trial/l3auxdata/build.lua
index 9e88838..1cd495e 100644
--- a/l3trial/l3auxdata/build.lua
+++ b/l3trial/l3auxdata/build.lua
@@ -13,15 +13,13 @@ maindir = "../.."
 -- Non-standard settings
 checkdeps   = {maindir .. "/l3experimental/l3str", maindir .. "/l3build"}
 testfiledir = ""
+typesetcmds = ""
 typesetdeps = {maindir .. "/l3experimental/l3str"}
+typesetcmds = ""
 
 -- Load the common build code: this is the one place that a path needs to be
 -- hard-coded
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-
--- Has to come after generic config
-typesetcmds = ""
-
 dofile (maindir .. "/l3build/l3build.lua")
diff --git a/l3trial/l3htoks/build.lua b/l3trial/l3htoks/build.lua
index b0cbc60..b167e32 100644
--- a/l3trial/l3htoks/build.lua
+++ b/l3trial/l3htoks/build.lua
@@ -11,16 +11,13 @@ module = "l3htoks"
 maindir = "../.."
 
 -- Non-standard settings
-checkruns   = 2
-checksearch = true
+checkengines = {"pdftex", "xetex", "luatex"}
+checkruns    = 2
+checksearch  = true
 
 -- Load the common build code: this is the one place that a path needs to be
 -- hard-coded
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-
--- Non-standard settings (have to be after build-config)
-checkengines = {"pdftex", "xetex", "luatex"}
-
 dofile (maindir .. "/l3build/l3build.lua")
diff --git a/xpackages/xor/build.lua b/xpackages/xor/build.lua
index 7173a15..6320a93 100644
--- a/xpackages/xor/build.lua
+++ b/xpackages/xor/build.lua
@@ -10,22 +10,19 @@ bundle = ""
 maindir = "../.."
 
 -- Non-standard settings
-checkdeps   =
+checkdeps    =
   {
     maindir .. "/l3build",
     maindir .. "/l3packages/xparse",
     maindir .. "/l3packages/xtemplate"
   }
-checkruns   = 3
-checksearch = true
+checkengines = {"pdftex"}
+checkruns    = 3
+checksearch  = true
 
 -- Load the common build code: this is the one place that a path needs to be
 -- hard-coded
 -- As the build system is 'self-contained' there is no module set up here: just
 --load the file in a similar way to a TeX \input
 dofile (maindir .. "/build-config.lua")
-
--- Non-standard settings (have to be after build-config)
-checkengines = {"pdftex"}
-
 dofile (maindir .. "/l3build/l3build.lua")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.