From 2b5e5d9b0b35ec88b7dca9b183361dc18bc7d3a6 Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Fri, 23 Aug 2024 14:40:32 -0500 Subject: Try using luarocks deploy script --- init | 2 +- meta.lua | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/init b/init index 8d55897..1eac090 100755 --- a/init +++ b/init @@ -9,7 +9,7 @@ cd /root if [ -z $(echo $CFLAGS | grep -o -E -- '( |^)-g( |$)') ]; then # Release build, delete docs/ and tests/ zip -d $obj docs/ docs/* tests/ tests/* - # And pack the library + # And pack the library with upx unzip $obj lib/* upx lib/* zip -r -u $obj lib diff --git a/meta.lua b/meta.lua index d2f5f56..7fd381f 100644 --- a/meta.lua +++ b/meta.lua @@ -1,30 +1,27 @@ local lua_versions = { - ["51"] = "https://www.lua.org/ftp/lua-5.1.5.tar.gz", - --[[ - ["52"] = "https://www.lua.org/ftp/lua-5.2.4.tar.gz", - ["53"] = "https://www.lua.org/ftp/lua-5.3.6.tar.gz", - ["54"] = "https://www.lua.org/ftp/lua-5.4.7.tar.gz", - ]] + ["51"] = true, + ["52"] = true, + ["53"] = true, + ["54"] = true, } local optimizations = { - --[[ + tiny = "-Oz", + --[[ size = "-Os", zero = "-O0", one = "-O1", two = "-O2", - ]] + ]] three = "-O3", } local debug = { - --[[ release = "", - ]] debug = "-g", } local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]} local builds = {} -for version, link, name, optimization, rel, flag, _, image in cartesian(lua_versions, optimizations, debug, compilers) do +for version, _, name, optimization, rel, flag, _, image in cartesian(lua_versions, optimizations, debug, compilers) do builds["luafilesystem-" .. version .. "-" .. name .. "-" .. rel .. "-" .. image] = { image = "image-luarocks-" .. version.. "-" .. image, requires = { @@ -33,7 +30,7 @@ for version, link, name, optimization, rel, flag, _, image in cartesian(lua_vers {"cicd","lua" .. version .. "-" .. name .. "-" .. rel .. "-" .. image .. ":lua" .. version .. ".dll"}, }, produces = { - ["luafilesystem-scm-1.mingw32-x86_64.rock"] = image .. "/" .. rel .. "/" .. name .. "/" .. version + ["luafilesystem-scm-1.mingw32-x86_64.rock"] = {"luarocks.sh", "luafilesystem", image, version, name, rel}, }, env = { CFLAGS = optimization .. " " .. flag, -- cgit v1.2.3-55-g6feb