[latex3-commits] [l3svn] branch master updated: l3build: Change -v to -v (breaking change)

[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.

The following commit(s) were added to refs/heads/master by this push:
       new  de2b169   l3build: Change -v to -v (breaking change)
de2b169 is described below

commit de2b169057aee5efa87c63012bf70ae63d003f4c
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Wed Jun 22 13:48:53 2016 +0100

    l3build: Change -v to -v (breaking change)
    
    The -v option is always the version of a tool itself:
    choose a different name! (-r = --release).
---
 build.lua           |    8 ++++----
 l3build/l3build.dtx |    4 ++--
 l3build/l3build.lua |   18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build.lua b/build.lua
index 090c3e5..d48c27d 100644
--- a/build.lua
+++ b/build.lua
@@ -37,9 +37,9 @@ function main (target)
       if optengines then
         engines = " --engine=" .. table.concat(optengines, ",")
       end
-      local version = ""
-      if optversion then
-        version = " --version=" .. optversion[1]
+      local release = ""
+      if optrelease then
+        release = " --release=" .. optversion[1]
       end
       errorlevel = run(
         i,
@@ -50,7 +50,7 @@ function main (target)
           .. engines
           .. (optpdf and " -p" or "")
           .. (optquiet and " -q" or "")
-          .. version
+          .. release
       )
       if errorlevel ~= 0 then
         break
diff --git a/l3build/l3build.dtx b/l3build/l3build.dtx
index 3cf665b..4a705f1 100644
--- a/l3build/l3build.dtx
+++ b/l3build/l3build.dtx
@@ -325,7 +325,7 @@
 % \item \texttt{--pdf} (\texttt{-p}) Test PDF file against a reference
 %   version rather than using a log comparison
 % \item \texttt{--quiet} (\texttt{-q}) Suppresses output from unpacking
-% \item \texttt{--version} (\texttt{-v}) Version string to use when setting
+% \item \texttt{--release} (\texttt{-r}) Release string to use when setting
 %   version data
 % \end{itemize}
 %
@@ -489,7 +489,7 @@
 % \begin{buildcmd}{setversion}
 % Modifies the content of files specified by |versionfiles| to allow
 % automatic updating of the file date and version. The latter are
-% specified using the |-d| and |-v| command line options and if not
+% specified using the |-d| and |-r| command line options and if not
 % given will default to the current date in ISO format (YYYY-MM-DD) and |-1|,
 % respectively. As detailed below, the standard set up has no search pattern
 % defined for this target and so no action will be taken \emph{unless}
diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index dcf8b7e..65ea283 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -182,7 +182,7 @@ function argparse()
       help                = "help"   ,
       pdf                 = "pdf" ,
       quiet               = "quiet"  ,
-      version             = "version"
+      release             = "release"
     }
   local short_options =
     {
@@ -192,7 +192,7 @@ function argparse()
       H = "halt"   ,
       p = "pdf"  ,
       q = "quiet"  ,
-      v = "version"
+      r = "release"
     }
   local option_args =
     {
@@ -202,7 +202,7 @@ function argparse()
       help    = false,
       pdf     = false,
       quiet   = false,
-      version = true
+      release = true
     }
   -- arg[1] is a special case: must be a command or "-h"/"--help"
   -- Deal with this by assuming help and storing only apparently-valid
@@ -312,7 +312,7 @@ opthalt    = userargs["halt"]
 opthelp    = userargs["help"]
 optpdf     = userargs["pdf"]
 optquiet   = userargs["quiet"]
-optversion = userargs["version"]
+optrelease = userargs["release"]
 
 -- Convert a file glob into a pattern for use by e.g. string.gub
 -- Based on https://github.com/davidm/lua-glob-pattern
@@ -609,9 +609,9 @@ function allmodules(target)
     if optengines then
       engines = " --engine=" .. table.concat(optengines, ",")
     end
-    local version = ""
-    if optversion then
-      version = " --version=" .. optversion[1]
+    local release = ""
+    if optrelease then
+      release = " --release=" .. release[1]
     end
     local errorlevel = run(
       i,
@@ -621,7 +621,7 @@ function allmodules(target)
         .. engines
         .. (optpdf and " -p" or "")
         .. (optquiet and " -q" or "")
-        .. version
+        .. release
     )
     if errorlevel ~= 0 then
       return errorlevel
@@ -1515,7 +1515,7 @@ function help()
   print("   --halt-on-error|-H  Stops running tests after the first failure")
   print("   --pdf|-p            Check/save PDF files")
   print("   --quiet|-q          Suppresses TeX output when unpacking")
-  print("   --version|-v        Sets the version to insert into sources")
+  print("   --release|-r        Sets the release to insert into sources")
   print("")
   print("See l3build.pdf for further details.")
 end

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