Copy more artifacts for building luarocks

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
         mv libluajit.a liblua.a
 fi
 cd luarocks/binary
-mkdir build-windows-deps-cicd
-cd build-windows-deps-cicd
+mkdir build-windows-deps-cicd/lib
+cd build-windows-deps-cicd/lib
 cp /root/liblua.a .
 cp /root/libssl.a .
 cp /root/libz.a .
 cp /root/libbz2.a .
-
 cd ..
-make -f Makefile.windows WINDOWS_DEPS_DIR=windows-deps-cicd
+mkdir bin
+cp /root/*.exe .
+
+cd ../../..
+LUA_BINDIR=binary/build-windows-deps-cicd/bin
+./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 @@
 local lua_versions = {
-        ["51"] = "liblua.a",
-        ["52"] = "liblua.a",
-        ["53"] = "liblua.a",
-        ["54"] = "liblua.a",
-        ["jit"] = "libluajit.a",
+        ["51"] = {"liblua.a", "lua.exe", "lua51.dll"},
+        --[[
+        ["52"] = {"liblua.a", "lua.exe", "lua52.dll"},
+        ["53"] = {"liblua.a", "lua.exe", "lua53.dll"},
+        ["54"] = {"liblua.a", "lua.exe", "lua54.dll"},
+        ["jit"] = {"libluajit.a", "luajit.exe", "lua51.dll"},
+        ]]
 }
 local optimizations = {
         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
                         {"git", "luarocks"},
                         {"cicd", "libressl-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libssl.a"},
                         {"cicd", "libz-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libz.a"},
-                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v},
+                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v[1]},
+                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v[2]},
+                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v[3]},
                         {"cicd", "bzip2-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libbz2.a"},
                 },
                 produces = {