Reorder dependencies to include lua

2 files changed, 55 insertions, 5 deletions

diff --git a/init b/init
index 8aa8d04..26b3428 100755
--- a/init
+++ b/init
@@ -12,8 +12,51 @@ cp /root/libz.a .
 cp /root/libbz2.a .
 cd ..
 mkdir bin
+cd bin
 cp /root/*.exe .
 
+mkdir -p windows-deps-cicd/lib
+
 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
+make -f binary/Makefile.windows BUILD_WINDOWS_DEPS_DIR=
+LUAROCKS_CROSS_COMPILING=1 make binary LUA_DIR=binary/build-windows-deps-cicd/bin CC=gcc NM=nm BINARY_PLATFORM=windows
+# all_in_one generates a series of files:
+# dir .. "/luarocks/core/hardcoded.lua"
+#
+# SYSTEM = "windows"
+# PROCESSOR = "x86" | "i686"
+# FORCE_CONFIG = true
+# IS_BINARY = true
+#
+# ---------------------
+# Ok this file is actually pretty involved
+# I think the strategy is to modify all_in_one to not call main(), and instead
+# call generate() directly. This will output, among other things, luarocks.exe.c,
+# (and compile it), but we can re-compile with different cflags if we want.
+# We probably also need a bunch of precompiled windows .a to get it to compile.
+# TARGET_DIR .. "/" .. program_name .. ".exe.c"
+#
+# [[static const char* progname = "<program_name>";]]
+# <c_preamble>
+# [[static void load_main(lua_State* L) {]]
+# <bin2c src/bin/luarocks>
+# [[if(luaL_loadbuffer(L, code, sizeof(code), "<program_name>") != LUA_OK) {]]
+# [[    fatal(lua_tostring(L, -1));]]
+# [[}]]
+# [[}]]
+#
+# ----------------------
+# Lets modify all_in_one: delete the last line that calls main() and replace it
+# with:
+cfg.init()
+cfg.variables.LUA_INCDIR_OK = true
+cfg.variables.LUA_LIBDIR_OK = true
+fs.init()
+generate(MAIN_PROGRAM, "src", {EXCLUDE, "^bin/?"})
+
+# Make the output directory
+mkdir build-binary
+# Then call it like:
+LUAROCKS_CROSS_COMPILING=1 lua5.4 binary/all_in_one
diff --git a/meta.lua b/meta.lua
index be3565e..60f7f2d 100644
--- a/meta.lua
+++ b/meta.lua
@@ -1,5 +1,10 @@
 local lua_versions = {
-        ["51"] = {"liblua.a", "lua.exe", "lua51.dll"},
+        ["51"] = {
+                link = "https://www.lua.org/ftp/lua-5.1.5.tar.gz",
+                slib = "liblua.a",
+                bin = "lua.exe",
+                dlib = "lua51.dll"
+        },
         --[[
         ["52"] = {"liblua.a", "lua.exe", "lua52.dll"},
         ["53"] = {"liblua.a", "lua.exe", "lua53.dll"},
@@ -33,15 +38,17 @@ for version_k, version_v, opti_k, opti_v, debug_k, debug_v, comp_k, comp_v in ca
                 image="image-" .. comp_v,
                 requires = {
                         {"git", "luarocks"},
+                        {"http", version_v.link},
+                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v.slib},
+                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v.bin},
+                        {"cicd", "lua" .. version_k .. "-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":" .. version_v.dlib},
+                        {"cicd", "bzip2-" .. opti_k .. "-" .. debug_k .. "-" .. comp_v .. ":libbz2.a"},
                         {"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[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 = {
                         ["luarocks.exe"] = true,
+                        ["luarocks-admin.exe"] = true,
                 },
                 env = {
                         CFLAGS=" " .. opti_v .. " " .. debug_v,