[latex3-commits] [git/LaTeX3-latex3-l3build] master: New ctanzip variable (fixes #31) (f768bbf)

[Joseph Wright]

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

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

commit f768bbfae7a95afd68b6b03ea9006c3a217a77b7
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Sat Aug 4 14:29:32 2018 +0100

    New ctanzip variable (fixes #31)


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

f768bbfae7a95afd68b6b03ea9006c3a217a77b7
 CHANGELOG.md          |    1 +
 l3build-ctan.lua      |    4 ++--
 l3build-variables.lua |    1 +
 l3build.dtx           |    1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74544ab..1142fb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ this project uses date-based 'snapshot' version identifiers.
 ## [Unreleased]
 
 ### Added
+- `ctanzip` variable
 - `--full` option
 
 ### Changed
diff --git a/l3build-ctan.lua b/l3build-ctan.lua
index 54c9373..9d29f63 100644
--- a/l3build-ctan.lua
+++ b/l3build-ctan.lua
@@ -128,8 +128,8 @@ function ctan()
     if packtdszip then
       cp(ctanpkg .. ".tds.zip", tdsdir, ctandir)
     end
-    dirzip(ctandir, ctanpkg)
-    cp(ctanpkg .. ".zip", ctandir, currentdir)
+    dirzip(ctandir, ctanzip)
+    cp(ctanzip .. ".zip", ctandir, currentdir)
   else
     print("\n====================")
     print("Typesetting failed, zip stage skipped!")
diff --git a/l3build-variables.lua b/l3build-variables.lua
index 98ce7fd..f24b11a 100644
--- a/l3build-variables.lua
+++ b/l3build-variables.lua
@@ -159,6 +159,7 @@ end
 -- Other required settings
 asciiengines = asciiengines or {"pdftex"}
 checkruns    = checkruns    or 1
+ctanzip      = ctanzip      or ctanpkg .. "-ctan"
 epoch        = epoch        or 1463734800
 if flatten == nil then
   flatten = true
diff --git a/l3build.dtx b/l3build.dtx
index 257f6af..9dc4ebb 100644
--- a/l3build.dtx
+++ b/l3build.dtx
@@ -152,6 +152,7 @@
 \luavarseparator
 \luavarset{asciiengines}{\{"pdftex"\}}{Engines which should log as sure ASCII}
 \luavarset{checkruns}   {1}           {Number of runs to complete for a test before comparing the log}
+\luavarset{ctanzip}{ctanpkg ... "-ctan"}{Name of the zip file created for upload to CTAN}
 \luavarset{epoch}       {1463734800}  {Epoch (Unix date) to set for test runs}
 \luavarset{flatten}     {true}        {Switch to flatten any source structure when sending to CTAN}
 \luavarset{maxprintline}{79}          {Length of line to use in log files}