From c561bd6308a308e605432697091ee25736e54e6c Mon Sep 17 00:00:00 2001 From: Robert McLay Date: Sun, 2 Jun 2024 10:42:04 -0500 Subject: [PATCH] moving to TAG_VERSION 8.7.38 --- .versionDate | 2 +- docs/source/conf.py | 3 ++- settarg/Version.lua | 14 ++++++++++---- src/Version.lua | 14 ++++++++++---- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.versionDate b/.versionDate index e1ab94964..47f892de8 100644 --- a/.versionDate +++ b/.versionDate @@ -1 +1 @@ -2024-03-19 16:11 -06:00 +2024-06-02 10:42 -05:00 diff --git a/docs/source/conf.py b/docs/source/conf.py index d576c1775..828d73596 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -57,7 +57,7 @@ # The short X.Y version. version = '8.7' # The full version, including alpha/beta/rc tags. -release = '8.7.37' +release = '8.7.38' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -391,5 +391,6 @@ + diff --git a/settarg/Version.lua b/settarg/Version.lua index 5f4bbf1d7..e3a3891f4 100644 --- a/settarg/Version.lua +++ b/settarg/Version.lua @@ -9,20 +9,26 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.37" end +function M.tag() return "8.7.38" end function M.git() - local s = "8.7.37" + local s = "8.7.38" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-03-17 13:11 -06:00" end +function M.date() return "2024-06-02 10:42 -05:00" end function M.name() local a = {} a[#a+1] = M.tag() a[#a+1] = M.git() a[#a+1] = M.branchStr() a[#a+1] = M.date() - return table.concat(a," ") + local b = {} + for i = 1,#a do + if (a[i] ~= "") then + b[#b+1] = a[i] + end + end + return table.concat(b," ") end return M diff --git a/src/Version.lua b/src/Version.lua index 5f4bbf1d7..e3a3891f4 100644 --- a/src/Version.lua +++ b/src/Version.lua @@ -9,20 +9,26 @@ function M.branchStr() end return s == "" and s or "[branch: "..s.."]" end -function M.tag() return "8.7.37" end +function M.tag() return "8.7.38" end function M.git() - local s = "8.7.37" + local s = "8.7.38" if (s == "@" .. "git@") then s = "" end if (s == M.tag() ) then s = "" end return s == "" and s or "("..s..")" end -function M.date() return "2024-03-17 13:11 -06:00" end +function M.date() return "2024-06-02 10:42 -05:00" end function M.name() local a = {} a[#a+1] = M.tag() a[#a+1] = M.git() a[#a+1] = M.branchStr() a[#a+1] = M.date() - return table.concat(a," ") + local b = {} + for i = 1,#a do + if (a[i] ~= "") then + b[#b+1] = a[i] + end + end + return table.concat(b," ") end return M