1 files changed, 7 insertions, 20 deletions

diff --git a/meta.lua b/meta.lua
index 218ee05..7234147 100644
--- a/meta.lua
+++ b/meta.lua
@@ -24,34 +24,21 @@ local debug = {
 local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]}
 
 local builds = {}
-for _,image,lua_ver,link in cartesian(compilers,lua_versions) do
-        builds["image-luafilesystem-" .. image .. "-lua" .. lua_ver] = {
-                image = "image-" .. image,
-                requires = {
-                        {"http",link}
-                },
-                produces = {},
-                export = true,
-                entrypoint = "prepare",
-                env = {
-                        rockver = lua_ver:gsub("(%d)(%d)$","%1.%2")
-                }
-        }
-end
 for version, link, name, optimization, rel, flag, _, image in cartesian(lua_versions, optimizations, debug, compilers) do
-        local name = "luafilesystem-" .. version .. "-" .. name .. "-" .. rel .. "-" .. image
-        builds[name] = {
-                image = "image-luafilesystem-" .. image .. "-lua" .. version,
+        builds["luafilesystem-" .. version .. "-" .. name .. "-" .. rel .. "-" .. image] = {
+                image = "image-luarocks-" .. version.. "-" .. image,
                 requires = {
                         {"git", "luafilesystem"},
-                        {"cicd","image-luafilesystem-" .. image .. "-lua" .. version},
+                        {"cicd","image-luarocks-" .. version .. "-" .. image},
+                        {"cicd","lua" .. version .. "-" .. optimization .. "-" .. rel .. "-" .. image .. ":lua" .. version .. ".dll"}
                 },
                 produces = {
-                        "luafilesystem-git-1.win32-" .. image .. ".rock"
+                        "luafilesystem-scm-1.mingw32-x86_64.rock"
                 },
                 env = {
                         CFLAGS = optimization .. " " .. flag,
-                        rockver = version:gsub("(%d)(%d)$","%1.%2")
+                        rockver = version:gsub("(%d)(%d)$","%1.%2"),
+                        version = version
                 },
         }
 end