aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-09-17 14:26:07 -0500
committerAlexander M Pickering <alex@cogarr.net>2024-09-17 14:26:07 -0500
commit7f5bf2e4d66d2308b71bb112b4fdfcc5cce6e79d (patch)
treefac9a34fe444472d3f5f548c2aae0c7c6b03e6e8
parent06896aac9404137ccd15740911ed20128e340268 (diff)
downloadluarocks-packaging-7f5bf2e4d66d2308b71bb112b4fdfcc5cce6e79d.tar.gz
luarocks-packaging-7f5bf2e4d66d2308b71bb112b4fdfcc5cce6e79d.tar.bz2
luarocks-packaging-7f5bf2e4d66d2308b71bb112b4fdfcc5cce6e79d.zip
Copy more artifacts for building luarocks
-rwxr-xr-xinit12
-rw-r--r--meta.lua16
2 files changed, 18 insertions, 10 deletions
diff --git a/init b/init
index 5cfddbf..9059a86 100755
--- a/init
+++ b/init
@@ -4,12 +4,16 @@ if [ -e libluajit.a ]; then
4 mv libluajit.a liblua.a 4 mv libluajit.a liblua.a
5fi 5fi
6cd luarocks/binary 6cd luarocks/binary
7mkdir build-windows-deps-cicd 7mkdir build-windows-deps-cicd/lib
8cd build-windows-deps-cicd 8cd build-windows-deps-cicd/lib
9cp /root/liblua.a . 9cp /root/liblua.a .
10cp /root/libssl.a . 10cp /root/libssl.a .
11cp /root/libz.a . 11cp /root/libz.a .
12cp /root/libbz2.a . 12cp /root/libbz2.a .
13
14cd .. 13cd ..
15make -f Makefile.windows WINDOWS_DEPS_DIR=windows-deps-cicd 14mkdir bin
15cp /root/*.exe .
16
17cd ../../..
18LUA_BINDIR=binary/build-windows-deps-cicd/bin
19./configure --disable-incdir-check --with-lua=binary/build-windows-deps-cicd/bin --with-lua-lib=binary/build-windows-deps/lib
diff --git a/meta.lua b/meta.lua
index d369b7f..be3565e 100644
--- a/meta.lua
+++ b/meta.lua
@@ -1,9 +1,11 @@
1local lua_versions = { 1local lua_versions = {
2 ["51"] = "liblua.a", 2 ["51"] = {"liblua.a", "lua.exe", "lua51.dll"},
3 ["52"] = "liblua.a", 3 --[[
4 ["53"] = "liblua.a", 4 ["52"] = {"liblua.a", "lua.exe", "lua52.dll"},
5 ["54"] = "liblua.a", 5 ["53"] = {"liblua.a", "lua.exe", "lua53.dll"},
6 ["jit"] = "libluajit.a", 6 ["54"] = {"liblua.a", "lua.exe", "lua54.dll"},
7 ["jit"] = {"libluajit.a", "luajit.exe", "lua51.dll"},
8 ]]
7} 9}
8local optimizations = { 10local optimizations = {
9 tiny = "-Oz", 11 tiny = "-Oz",
@@ -33,7 +35,9 @@ for version_k, version_v, opti_k, opti_v, debug_k, debug_v, comp_k, comp_v in ca
33 {"git", "luarocks"}, 35 {"git", "luarocks"},
34 {"cicd", "libressl-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libssl.a"}, 36 {"cicd", "libressl-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libssl.a"},
35 {"cicd", "libz-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libz.a"}, 37 {"cicd", "libz-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libz.a"},
36 {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v}, 38 {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v[1]},
39 {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v[2]},
40 {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v[3]},
37 {"cicd", "bzip2-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libbz2.a"}, 41 {"cicd", "bzip2-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libbz2.a"},
38 }, 42 },
39 produces = { 43 produces = {