From e18d28496f5b2a64bb2c158ad4b28a880748a0ac Mon Sep 17 00:00:00 2001
From: Joseph Wright <joseph.wright@morningstar2.co.uk>
Date: Sat, 10 Mar 2018 11:05:47 +0000
Subject: [PATCH] Allow build scripts to work with old and new l3build calls

This supports both

     texlua build.lua command

and

    l3build command
---
 base/build.lua              | 5 ++++-
 build.lua                   | 5 ++++-
 doc/build.lua               | 5 ++++-
 required/amsmath/build.lua  | 5 ++++-
 required/babel/build.lua    | 4 +++-
 required/cyrillic/build.lua | 5 ++++-
 required/graphics/build.lua | 5 ++++-
 required/tools/build.lua    | 4 +++-
 8 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/base/build.lua b/base/build.lua
index ef38281e1..28ae6eabb 100644
--- a/base/build.lua
+++ b/base/build.lua
@@ -226,4 +226,7 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+
diff --git a/build.lua b/build.lua
index 8c4e032d5..bde4a842b 100644
--- a/build.lua
+++ b/build.lua
@@ -74,4 +74,7 @@ end
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
 dofile(("./build-config.lua"))
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+
diff --git a/doc/build.lua b/doc/build.lua
index db67dff06..91631749a 100644
--- a/doc/build.lua
+++ b/doc/build.lua
@@ -38,4 +38,7 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+
diff --git a/required/amsmath/build.lua b/required/amsmath/build.lua
index b57b74b61..6c3b546b1 100644
--- a/required/amsmath/build.lua
+++ b/required/amsmath/build.lua
@@ -27,4 +27,7 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+
diff --git a/required/babel/build.lua b/required/babel/build.lua
index 1dbf2cad7..fa83e56a2 100644
--- a/required/babel/build.lua
+++ b/required/babel/build.lua
@@ -33,4 +33,6 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
\ No newline at end of file
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
diff --git a/required/cyrillic/build.lua b/required/cyrillic/build.lua
index 279174652..e07ee1150 100644
--- a/required/cyrillic/build.lua
+++ b/required/cyrillic/build.lua
@@ -22,4 +22,7 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+
diff --git a/required/graphics/build.lua b/required/graphics/build.lua
index 1cd54e97f..fca3e5f8f 100644
--- a/required/graphics/build.lua
+++ b/required/graphics/build.lua
@@ -22,4 +22,7 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end
+
diff --git a/required/tools/build.lua b/required/tools/build.lua
index 4574e5ebe..674f7ed90 100644
--- a/required/tools/build.lua
+++ b/required/tools/build.lua
@@ -24,4 +24,6 @@ dofile (maindir .. "/build-config.lua")
 
 -- Find and run the build system
 kpse.set_program_name ("kpsewhich")
-dofile (kpse.lookup ("l3build.lua"))
+if not release_date then
+  dofile(kpse.lookup("l3build.lua"))
+end