[latex3-commits] [git/LaTeX3-latex3-latex3] master: Allow build scripts to work with old and new l3build calls (a726d4f)

Joseph Wright joseph.wright at morningstar2.co.uk
Sat Mar 10 12:09:41 CET 2018


Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/a726d4f9304609726d3e0d0f309b6ce0e088a7ea

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

commit a726d4f9304609726d3e0d0f309b6ce0e088a7ea
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Mar 10 11:09:41 2018 +0000

    Allow build scripts to work with old and new l3build calls
    
    This supports both
    
         texlua build.lua command
    
    and
    
        l3build command


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

a726d4f9304609726d3e0d0f309b6ce0e088a7ea
 build.lua                           |    5 ++++-
 contrib/build.lua                   |    5 ++++-
 l3experimental/build.lua            |    5 ++++-
 l3experimental/l3color/build.lua    |    5 ++++-
 l3experimental/l3draw/build.lua     |    5 ++++-
 l3experimental/l3str/build.lua      |    5 ++++-
 l3experimental/xcoffins/build.lua   |    5 ++++-
 l3experimental/xgalley/build.lua    |    5 ++++-
 l3kernel/build.lua                  |    5 ++++-
 l3packages/build.lua                |    5 ++++-
 l3packages/l3doc/build.lua          |    5 ++++-
 l3packages/l3doc/examples/build.lua |    5 ++++-
 l3packages/l3keys2e/build.lua       |    5 ++++-
 l3packages/xfp/build.lua            |    5 ++++-
 l3packages/xfrac/build.lua          |    5 ++++-
 l3packages/xparse/build.lua         |    5 ++++-
 l3packages/xtemplate/build.lua      |    5 ++++-
 l3trial/build.lua                   |    5 ++++-
 l3trial/l3auxdata/build.lua         |    5 ++++-
 l3trial/l3benchmark/build.lua       |    5 ++++-
 l3trial/l3bigint/build.lua          |    5 ++++-
 l3trial/l3check/build.lua           |    5 ++++-
 l3trial/l3fp-extras/build.lua       |    5 ++++-
 l3trial/l3hooks/build.lua           |    5 ++++-
 l3trial/l3htoks/build.lua           |    5 ++++-
 l3trial/l3image/build.lua           |    5 ++++-
 l3trial/l3kernel-extras/build.lua   |    5 ++++-
 l3trial/l3ldb/build.lua             |    5 ++++-
 l3trial/l3str-format-new/build.lua  |    5 ++++-
 l3trial/l3trace/build.lua           |    5 ++++-
 l3trial/l3tree/build.lua            |    5 ++++-
 l3trial/xbox/build.lua              |    5 ++++-
 l3trial/xfont/build.lua             |    5 ++++-
 33 files changed, 132 insertions(+), 33 deletions(-)

diff --git a/build.lua b/build.lua
index 7b22e9a..018807a 100644
--- a/build.lua
+++ b/build.lua
@@ -57,4 +57,7 @@ end
 
 -- 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/contrib/build.lua b/contrib/build.lua
index bf1247c..1201eb2 100644
--- a/contrib/build.lua
+++ b/contrib/build.lua
@@ -28,4 +28,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/l3experimental/build.lua b/l3experimental/build.lua
index f51138f..970fb79 100644
--- a/l3experimental/build.lua
+++ b/l3experimental/build.lua
@@ -15,4 +15,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/l3experimental/l3color/build.lua b/l3experimental/l3color/build.lua
index 831b6f9..878ceb1 100644
--- a/l3experimental/l3color/build.lua
+++ b/l3experimental/l3color/build.lua
@@ -15,4 +15,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/l3experimental/l3draw/build.lua b/l3experimental/l3draw/build.lua
index 62dabc6..264189e 100644
--- a/l3experimental/l3draw/build.lua
+++ b/l3experimental/l3draw/build.lua
@@ -20,4 +20,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/l3experimental/l3str/build.lua b/l3experimental/l3str/build.lua
index 7408f27..3c4b0ef 100644
--- a/l3experimental/l3str/build.lua
+++ b/l3experimental/l3str/build.lua
@@ -18,4 +18,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/l3experimental/xcoffins/build.lua b/l3experimental/xcoffins/build.lua
index 303b560..d919c06 100644
--- a/l3experimental/xcoffins/build.lua
+++ b/l3experimental/xcoffins/build.lua
@@ -20,4 +20,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/l3experimental/xgalley/build.lua b/l3experimental/xgalley/build.lua
index b0eebeb..0de77a5 100644
--- a/l3experimental/xgalley/build.lua
+++ b/l3experimental/xgalley/build.lua
@@ -18,4 +18,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/l3kernel/build.lua b/l3kernel/build.lua
index cd4075e..b829854 100644
--- a/l3kernel/build.lua
+++ b/l3kernel/build.lua
@@ -158,4 +158,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/l3packages/build.lua b/l3packages/build.lua
index 8dc9fc6..1483360 100644
--- a/l3packages/build.lua
+++ b/l3packages/build.lua
@@ -15,4 +15,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/l3packages/l3doc/build.lua b/l3packages/l3doc/build.lua
index baa04f6..6cc6303 100644
--- a/l3packages/l3doc/build.lua
+++ b/l3packages/l3doc/build.lua
@@ -23,4 +23,7 @@ testfiledir = ""
 
 -- 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/l3packages/l3doc/examples/build.lua b/l3packages/l3doc/examples/build.lua
index e8b7739..c93465b 100644
--- a/l3packages/l3doc/examples/build.lua
+++ b/l3packages/l3doc/examples/build.lua
@@ -6,4 +6,7 @@ module = "l3doc-examples"
 
 -- 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/l3packages/l3keys2e/build.lua b/l3packages/l3keys2e/build.lua
index b0a5b6d..231e853 100644
--- a/l3packages/l3keys2e/build.lua
+++ b/l3packages/l3keys2e/build.lua
@@ -18,4 +18,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/l3packages/xfp/build.lua b/l3packages/xfp/build.lua
index 935aa01..45764c3 100644
--- a/l3packages/xfp/build.lua
+++ b/l3packages/xfp/build.lua
@@ -18,4 +18,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/l3packages/xfrac/build.lua b/l3packages/xfrac/build.lua
index ce97c7d..86b363d 100644
--- a/l3packages/xfrac/build.lua
+++ b/l3packages/xfrac/build.lua
@@ -20,4 +20,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/l3packages/xparse/build.lua b/l3packages/xparse/build.lua
index 9ef72df..e7b0ee9 100644
--- a/l3packages/xparse/build.lua
+++ b/l3packages/xparse/build.lua
@@ -15,4 +15,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/l3packages/xtemplate/build.lua b/l3packages/xtemplate/build.lua
index aa5d246..c0f8f01 100644
--- a/l3packages/xtemplate/build.lua
+++ b/l3packages/xtemplate/build.lua
@@ -19,4 +19,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/l3trial/build.lua b/l3trial/build.lua
index 61b7ba7..e7ee198 100644
--- a/l3trial/build.lua
+++ b/l3trial/build.lua
@@ -15,4 +15,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/l3trial/l3auxdata/build.lua b/l3trial/l3auxdata/build.lua
index 6baf206..c92216d 100644
--- a/l3trial/l3auxdata/build.lua
+++ b/l3trial/l3auxdata/build.lua
@@ -19,4 +19,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/l3trial/l3benchmark/build.lua b/l3trial/l3benchmark/build.lua
index fc56b5e..8fe86ee 100644
--- a/l3trial/l3benchmark/build.lua
+++ b/l3trial/l3benchmark/build.lua
@@ -18,4 +18,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/l3trial/l3bigint/build.lua b/l3trial/l3bigint/build.lua
index eec3dcb..8c74816 100644
--- a/l3trial/l3bigint/build.lua
+++ b/l3trial/l3bigint/build.lua
@@ -15,4 +15,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/l3trial/l3check/build.lua b/l3trial/l3check/build.lua
index f201ff4..5a43b18 100644
--- a/l3trial/l3check/build.lua
+++ b/l3trial/l3check/build.lua
@@ -18,4 +18,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/l3trial/l3fp-extras/build.lua b/l3trial/l3fp-extras/build.lua
index 442c070..0877dff 100644
--- a/l3trial/l3fp-extras/build.lua
+++ b/l3trial/l3fp-extras/build.lua
@@ -15,4 +15,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/l3trial/l3hooks/build.lua b/l3trial/l3hooks/build.lua
index 7db3361..27ac38e 100644
--- a/l3trial/l3hooks/build.lua
+++ b/l3trial/l3hooks/build.lua
@@ -18,4 +18,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/l3trial/l3htoks/build.lua b/l3trial/l3htoks/build.lua
index 40bc531..0f7829b 100644
--- a/l3trial/l3htoks/build.lua
+++ b/l3trial/l3htoks/build.lua
@@ -21,4 +21,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/l3trial/l3image/build.lua b/l3trial/l3image/build.lua
index 821b3fd..5ec3b3a 100644
--- a/l3trial/l3image/build.lua
+++ b/l3trial/l3image/build.lua
@@ -15,4 +15,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/l3trial/l3kernel-extras/build.lua b/l3trial/l3kernel-extras/build.lua
index 553c60e..7ebd3db 100644
--- a/l3trial/l3kernel-extras/build.lua
+++ b/l3trial/l3kernel-extras/build.lua
@@ -18,4 +18,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/l3trial/l3ldb/build.lua b/l3trial/l3ldb/build.lua
index 155d9ee..c875a6b 100644
--- a/l3trial/l3ldb/build.lua
+++ b/l3trial/l3ldb/build.lua
@@ -31,4 +31,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/l3trial/l3str-format-new/build.lua b/l3trial/l3str-format-new/build.lua
index 9f01e3e..b41536e 100644
--- a/l3trial/l3str-format-new/build.lua
+++ b/l3trial/l3str-format-new/build.lua
@@ -18,4 +18,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/l3trial/l3trace/build.lua b/l3trial/l3trace/build.lua
index 1623319..c34bd1c 100644
--- a/l3trial/l3trace/build.lua
+++ b/l3trial/l3trace/build.lua
@@ -15,4 +15,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/l3trial/l3tree/build.lua b/l3trial/l3tree/build.lua
index df7d3aa..636450a 100644
--- a/l3trial/l3tree/build.lua
+++ b/l3trial/l3tree/build.lua
@@ -15,4 +15,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/l3trial/xbox/build.lua b/l3trial/xbox/build.lua
index 5537bf8..9bd0ce9 100644
--- a/l3trial/xbox/build.lua
+++ b/l3trial/xbox/build.lua
@@ -19,4 +19,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/l3trial/xfont/build.lua b/l3trial/xfont/build.lua
index c1eb137..02f6fcf 100644
--- a/l3trial/xfont/build.lua
+++ b/l3trial/xfont/build.lua
@@ -25,4 +25,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
+





More information about the latex3-commits mailing list